summaryrefslogtreecommitdiff
authorar <ar>2003-12-15 22:21:34 (UTC)
committer ar <ar>2003-12-15 22:21:34 (UTC)
commit32d48372f7b5ec9e4586ea74cc444838b157248e (patch) (side-by-side diff)
treea73c24014ce8a9ef2bbbe30d01a880b8a87ed482
parent0d9ef683fbd3822723e350b09d4c700316889ba6 (diff)
downloadopie-32d48372f7b5ec9e4586ea74cc444838b157248e.zip
opie-32d48372f7b5ec9e4586ea74cc444838b157248e.tar.gz
opie-32d48372f7b5ec9e4586ea74cc444838b157248e.tar.bz2
- backup and restore relative to users homedir
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/settings/backup/backuprestore.cpp203
-rw-r--r--noncore/settings/backup/backuprestore.h5
2 files changed, 125 insertions, 83 deletions
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index 19e7cf9..7d0daf7 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -41,3 +41,4 @@ const QString tempFileName = "/tmp/backup.err";
BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags fl)
- : BackupAndRestoreBase(parent, name, fl){
+ : BackupAndRestoreBase(parent, name, fl)
+{
this->showMaximized();
@@ -46,3 +47,3 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags f
connect(backupButton, SIGNAL(clicked()),
- this, SLOT(backupPressed()));
+ this, SLOT(backup()));
connect(restoreButton, SIGNAL(clicked()),
@@ -56,10 +57,8 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags f
- applicationSettings = new QListViewItem(backupList, "Application Settings", "",
- QDir::homeDirPath() + "/Settings/");
+ //add directorys for backing up
+ applicationSettings = new QListViewItem(backupList, "Application Settings", "", "Settings/");
selectItem(applicationSettings);
- applicationSettings = new QListViewItem(backupList, "Application Data", "",
- QDir::homeDirPath() + "/Applications/");
+ applicationSettings = new QListViewItem(backupList, "Application Data", "", "Applications/");
selectItem(applicationSettings);
- documents= new QListViewItem(backupList, "Documents", "",
- QDir::homeDirPath() + "/Documents/");
+ documents= new QListViewItem(backupList, "Documents", "", "Documents/");
selectItem(documents);
@@ -68,26 +67,15 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags f
- Config config("BackupAndRestore");
- config.setGroup("General");
- int totalLocations = config.readNumEntry("totalLocations",0);
-
-//todo make less static here and use Storage class to get infos
- if(totalLocations == 0){
- QString home = QDir::homeDirPath();
- home += "/Documents";
- backupLocations.insert("Documents", home);
- if (StorageInfo::hasCf()) {
+ backupLocations.insert( "Documents", QDir::homeDirPath() + "/Documents" );
+ if (StorageInfo::hasCf())
+ {
backupLocations.insert("CF", "/mnt/cf");
}
- if (StorageInfo::hasSd || StorageInfo::hasMmc) {
+ if (StorageInfo::hasSd || StorageInfo::hasMmc)
+ {
backupLocations.insert("SD", "/mnt/card");
}
- }
- else{
- for(int i = 0; i < totalLocations; i++){
- backupLocations.insert(config.readEntry(QString("backupLocationName_%1").arg(i)),
- config.readEntry(QString("backupLocation_%1").arg(i)));
- }
- }
+
QMap<QString, QString>::Iterator it;
- for( it = backupLocations.begin(); it != backupLocations.end(); ++it ){
+ for( it = backupLocations.begin(); it != backupLocations.end(); ++it )
+ {
storeToLocation->insertItem(it.key());
@@ -97,2 +85,4 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags f
// Read the list of items to ignore.
+ Config config("BackupAndRestore");
+
QList<QString> dontBackupList;
@@ -101,3 +91,4 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags f
int total = config.readNumEntry("Total", 0);
- for(int i = 0; i < total; i++){
+ for(int i = 0; i < total; i++)
+ {
dontBackupList.append(new QString(config.readEntry(QString("%1").arg(i), "")));
@@ -108,6 +99,9 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags f
- for(uint i = 0; i < list.count(); i++){
+ for(uint i = 0; i < list.count(); i++)
+ {
QString text = list.at(i)->text(HEADER_NAME);
- for(uint i2 = 0; i2 < dontBackupList.count(); i2++){
- if(*dontBackupList.at(i2) == text){
+ for(uint i2 = 0; i2 < dontBackupList.count(); i2++)
+ {
+ if(*dontBackupList.at(i2) == text)
+ {
selectItem(list.at(i));
@@ -119,3 +113,4 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name, WFlags f
-BackupAndRestore::~BackupAndRestore(){
+BackupAndRestore::~BackupAndRestore()
+{
QList<QListViewItem> list;
@@ -128,4 +123,6 @@ BackupAndRestore::~BackupAndRestore(){
int count = 0;
- for(uint i = 0; i < list.count(); i++){
- if(list.at(i)->text(HEADER_BACKUP) == ""){
+ for(uint i = 0; i < list.count(); i++)
+ {
+ if(list.at(i)->text(HEADER_BACKUP) == "")
+ {
config.writeEntry(QString("%1").arg(count), list.at(i)->text(HEADER_NAME));
@@ -141,4 +138,6 @@ BackupAndRestore::~BackupAndRestore(){
-QList<QListViewItem> BackupAndRestore::getAllItems(QListViewItem *item, QList<QListViewItem> &list){
- while(item){
+QList<QListViewItem> BackupAndRestore::getAllItems(QListViewItem *item, QList<QListViewItem> &list)
+{
+ while(item)
+ {
if(item->childCount() > 0)
@@ -156,3 +155,4 @@ QList<QListViewItem> BackupAndRestore::getAllItems(QListViewItem *item, QList<QL
*/
-void BackupAndRestore::selectItem(QListViewItem *currentItem){
+void BackupAndRestore::selectItem(QListViewItem *currentItem)
+{
if(!currentItem)
@@ -160,3 +160,4 @@ void BackupAndRestore::selectItem(QListViewItem *currentItem){
- if(currentItem->text(HEADER_BACKUP) == "B"){
+ if(currentItem->text(HEADER_BACKUP) == "B")
+ {
currentItem->setPixmap(HEADER_NAME, Resource::loadPixmap("backup/null"));
@@ -164,3 +165,4 @@ void BackupAndRestore::selectItem(QListViewItem *currentItem){
}
- else{
+ else
+ {
currentItem->setPixmap(HEADER_NAME, Resource::loadPixmap("backup/check"));
@@ -170,4 +172,5 @@ void BackupAndRestore::selectItem(QListViewItem *currentItem){
-void BackupAndRestore::scanForApplicationSettings(){
- QDir d(applicationSettings->text(BACKUP_LOCATION));
+void BackupAndRestore::scanForApplicationSettings()
+{
+ QDir d( QDir::homeDirPath() + "/" + QString( applicationSettings->text(BACKUP_LOCATION) ) );
d.setFilter( QDir::Dirs | QDir::Files | QDir::NoSymLinks );
@@ -176,5 +179,7 @@ void BackupAndRestore::scanForApplicationSettings(){
QFileInfo *fi;
- while ( (fi=it.current()) ) {
- // qDebug((d.path()+fi->fileName()).latin1());
- if ( ( fi->fileName() != "." ) && ( fi->fileName() != ".." ) ) {
+ while ( (fi=it.current()) )
+ {
+ //qDebug((d.path()+"/"+fi->fileName()).latin1());
+ if ( ( fi->fileName() != "." ) && ( fi->fileName() != ".." ) )
+ {
QListViewItem *newItem = new QListViewItem(applicationSettings, fi->fileName());
@@ -192,5 +197,7 @@ void BackupAndRestore::scanForApplicationSettings(){
*/
-void BackupAndRestore::backupPressed(){
+void BackupAndRestore::backup()
+{
QString backupFiles;
- if(getBackupFiles(backupFiles, NULL) == 0){
+ if(getBackupFiles(backupFiles, NULL) == 0)
+ {
QMessageBox::critical(this, "Message",
@@ -211,3 +218,4 @@ void BackupAndRestore::backupPressed(){
int c = 1;
- while(QFile::exists(outputFile + EXTENSION)){
+ while(QFile::exists(outputFile + EXTENSION))
+ {
outputFile = t + QString("%1").arg(c);
@@ -222,14 +230,13 @@ void BackupAndRestore::backupPressed(){
- qWarning( QString("(tar -c %1 | gzip > %2 ) 2> %3")
+ QString commandLine = QString( "(tar -C %1 -c %2 | gzip > %3 ) 2> %4" ).arg( QDir::homeDirPath() )
.arg( backupFiles )
.arg( outputFile.latin1() )
- .arg( tempFileName.latin1() ) );
+ .arg( tempFileName.latin1() );
+ qDebug( commandLine );
- int r = system( QString("(tar -c %1 | gzip > %2 ) 2> %3")
- .arg( backupFiles )
- .arg( outputFile.latin1() )
- .arg( tempFileName.latin1() ) );
+ int r = system( commandLine );
- if(r != 0){
+ if(r != 0)
+ {
perror("Error: ");
@@ -238,3 +245,4 @@ void BackupAndRestore::backupPressed(){
switch( QMessageBox::critical(this, tr( "Message" ), tr( "Backup Failed!" ) + "\n"
- + errorMsg, QString( tr( "Ok" ) ), QString( tr( "Details" ) ) ) ){
+ + errorMsg, QString( tr( "Ok" ) ), QString( tr( "Details" ) ) ) )
+ {
@@ -244,6 +252,8 @@ void BackupAndRestore::backupPressed(){
QFile errorFile( tempFileName );
- if ( errorFile.open(IO_ReadOnly) ) {
+ if ( errorFile.open(IO_ReadOnly) )
+ {
QTextStream t( &errorFile );
QString s;
- while ( !t.eof() ) { // until end of file...
+ while ( !t.eof() )
+ { // until end of file...
s += t.readLine(); // line of text excluding '\n'
@@ -253,3 +263,5 @@ void BackupAndRestore::backupPressed(){
pErrDialog->m_textarea->setText( s );
- }else{
+ }
+ else
+ {
pErrDialog->m_textarea->setText( "Unable to open File: /tmp/backup.er" );
@@ -264,3 +276,4 @@ void BackupAndRestore::backupPressed(){
}
- else{
+ else
+ {
QMessageBox::information(this, tr( "Message" ), tr( "Backup Successfull." ), QString(tr( "Ok" ) ) );
@@ -274,3 +287,4 @@ void BackupAndRestore::backupPressed(){
*/
-int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent){
+int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent)
+{
QListViewItem * currentItem;
@@ -279,3 +293,4 @@ int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent
currentItem = backupList->firstChild();
- else{
+ else
+ {
currentItem = parent->firstChild();
@@ -285,5 +300,8 @@ int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent
uint count = 0;
- while( currentItem != 0 ){
- if(currentItem->text(HEADER_BACKUP) == "B" ){
- if(currentItem->childCount() == 0 ){
+ while( currentItem != 0 )
+ {
+ if(currentItem->text(HEADER_BACKUP) == "B" )
+ {
+ if(currentItem->childCount() == 0 )
+ {
if(parent == NULL)
@@ -295,3 +313,4 @@ int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent
}
- else{
+ else
+ {
count += getBackupFiles(backupFiles, currentItem);
@@ -304,3 +323,4 @@ int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent
-void BackupAndRestore::sourceDirChanged(int selection){
+void BackupAndRestore::sourceDirChanged(int selection)
+{
restoreList->clear();
@@ -321,3 +341,4 @@ void BackupAndRestore::fileListUpdate()
*/
-void BackupAndRestore::rescanFolder(QString directory){
+void BackupAndRestore::rescanFolder(QString directory)
+{
//qDebug(QString("rescanFolder: ") + directory.latin1());
@@ -331,6 +352,9 @@ void BackupAndRestore::rescanFolder(QString directory){
QFileInfo *file;
- while ( (file=it.current()) ) { // for each file...
+ while ( (file=it.current()) )
+ { // for each file...
// If it is a dir and not .. or . then add it as a tab and go down.
- if(file->isDir()){
- if(file->fileName() != ".." && file->fileName() != ".") {
+ if(file->isDir())
+ {
+ if(file->fileName() != ".." && file->fileName() != ".")
+ {
rescanFolder(directory + "/" + file->fileName());
@@ -338,3 +362,4 @@ void BackupAndRestore::rescanFolder(QString directory){
}
- else{
+ else
+ {
// If it is a backup file add to list.
@@ -351,5 +376,7 @@ void BackupAndRestore::rescanFolder(QString directory){
*/
-void BackupAndRestore::restore(){
+void BackupAndRestore::restore()
+{
QListViewItem *restoreItem = restoreList->currentItem();
- if(!restoreItem){
+ if(!restoreItem)
+ {
QMessageBox::critical(this, tr( "Message" ),
@@ -364,9 +391,18 @@ void BackupAndRestore::restore(){
- int r = system(QString("tar -C / -zxf %1 2> %3")
+ qDebug( restoreFile );
+
+ QString commandLine = QString( "tar -C %1 -zxf %2 2> %3" ).arg( QDir::homeDirPath() )
.arg( restoreFile.latin1() )
- .arg( tempFileName.latin1() ) );
- if(r != 0){
+ .arg( tempFileName.latin1() );
+
+ qDebug( commandLine );
+
+ int r = system( commandLine );
+
+ if(r != 0)
+ {
QString errorMsg= tr( "Error from System:\n" ) + (QString)strerror( errno );
switch( QMessageBox::critical(this, tr( "Message" ), tr( "Restore Failed." ) + "\n"
- + errorMsg, QString( tr( "Ok") ), QString( tr( "Details" ) ) ) ) {
+ + errorMsg, QString( tr( "Ok") ), QString( tr( "Details" ) ) ) )
+ {
case 1:
@@ -375,6 +411,8 @@ void BackupAndRestore::restore(){
QFile errorFile( tempFileName );
- if ( errorFile.open(IO_ReadOnly) ) {
+ if ( errorFile.open(IO_ReadOnly) )
+ {
QTextStream t( &errorFile );
QString s;
- while ( !t.eof() ) { // until end of file...
+ while ( !t.eof() )
+ { // until end of file...
s += t.readLine(); // line of text excluding '\n'
@@ -384,3 +422,5 @@ void BackupAndRestore::restore(){
pErrDialog->m_textarea->setText( s );
- }else{
+ }
+ else
+ {
pErrDialog->m_textarea->setText( tr( "Unable to open File: %1" ).arg( "/tmp/backup.er" ) );
@@ -398,3 +438,4 @@ void BackupAndRestore::restore(){
}
- else{
+ else
+ {
QMessageBox::critical(this, tr( "Message" ),
diff --git a/noncore/settings/backup/backuprestore.h b/noncore/settings/backup/backuprestore.h
index 4bdc758..fdc2bf2 100644
--- a/noncore/settings/backup/backuprestore.h
+++ b/noncore/settings/backup/backuprestore.h
@@ -10,3 +10,4 @@ class QListViewItem;
-class BackupAndRestore : public BackupAndRestoreBase {
+class BackupAndRestore : public BackupAndRestoreBase
+{
@@ -22,3 +23,3 @@ public:
private slots:
- void backupPressed();
+ void backup();
void restore();