summaryrefslogtreecommitdiff
authorar <ar>2004-03-17 23:00:44 (UTC)
committer ar <ar>2004-03-17 23:00:44 (UTC)
commit091236bff19166653278db76082d2735d6059000 (patch) (unidiff)
tree8c33d0a125779ea6702095fba3a608a6bd766e07
parent941e088d13f2193153a75fc81dcf9ea3cd8943d4 (diff)
downloadopie-091236bff19166653278db76082d2735d6059000.zip
opie-091236bff19166653278db76082d2735d6059000.tar.gz
opie-091236bff19166653278db76082d2735d6059000.tar.bz2
- read old backup files from opie 1.0.x
busybox tar don't feature --label so i abuse Application/backup/exclude file to identifie an backup as a new one. exclude will create by this backup application. see revision 1.28
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/backup/backuprestore.cpp29
1 files changed, 23 insertions, 6 deletions
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index 87b7966..58e5c71 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -249,13 +249,13 @@ void BackupAndRestore::backup()
249 // We execute tar and compressing its output with gzip.. 249 // We execute tar and compressing its output with gzip..
250 // The error output will be written into a temp-file which could be provided 250 // The error output will be written into a temp-file which could be provided
251 // for debugging.. 251 // for debugging..
252 qDebug( "Storing file: %s", outputFile.latin1() ); 252 qDebug( "Storing file: %s", outputFile.latin1() );
253 outputFile += EXTENSION; 253 outputFile += EXTENSION;
254 254
255 QString commandLine = QString( "cd %1 && (tar -X %1 -cz %2 -f %3 ) 2> %4" ).arg( QDir::homeDirPath() ) 255 QString commandLine = QString( "cd %1 && (tar -X %1 -cz %2 Applications/backup/exclude -f %3 ) 2> %4" ).arg( QDir::homeDirPath() )
256 .arg( getExcludeFile() ) 256 .arg( getExcludeFile() )
257 .arg( backupFiles ) 257 .arg( backupFiles )
258 .arg( outputFile.latin1() ) 258 .arg( outputFile.latin1() )
259 .arg( tempFileName.latin1() ); 259 .arg( tempFileName.latin1() );
260 260
261 qDebug( commandLine ); 261 qDebug( commandLine );
@@ -418,20 +418,38 @@ void BackupAndRestore::restore()
418 QString restoreFile = backupLocations[restoreSource->currentText()]; 418 QString restoreFile = backupLocations[restoreSource->currentText()];
419 419
420 restoreFile += "/" + restoreItem->text(0); 420 restoreFile += "/" + restoreItem->text(0);
421 421
422 qDebug( restoreFile ); 422 qDebug( restoreFile );
423 423
424 QString commandLine = QString( "cd %1 && tar -zxf %2 2> %3" ).arg( QDir::homeDirPath() ) 424 //check if backup file come from opie 1.0.x
425 .arg( restoreFile.latin1() )
426 .arg( tempFileName.latin1() );
427 425
428 qDebug( commandLine ); 426 QString commandLine = QString( "tar -tzf %1 | grep Applications/backup/exclude" ).arg( restoreFile.latin1() );
429 427
430 int r = system( commandLine ); 428 int r = system( commandLine );
431 429
430 QString startDir;
431
432 if( r != 0 ) //Applications/backup/exclude not found - old backup file
433 {
434 startDir = QString( "/" );
435 } else
436 {
437 startDir = QDir::homeDirPath();
438 }
439
440 //unpack backup file
441 commandLine = QString( "cd %1 && tar -zxf %2 2> %3" ).arg( startDir )
442 .arg( restoreFile.latin1() )
443 .arg( tempFileName.latin1() );
444
445 qDebug( commandLine );
446
447 r = system( commandLine );
448
449 //error handling
432 if(r != 0) 450 if(r != 0)
433 { 451 {
434 QString errorMsg= tr( "Error from System:\n" ) + (QString)strerror( errno ); 452 QString errorMsg= tr( "Error from System:\n" ) + (QString)strerror( errno );
435 switch( QMessageBox::critical(this, tr( "Message" ), tr( "Restore Failed." ) + "\n" 453 switch( QMessageBox::critical(this, tr( "Message" ), tr( "Restore Failed." ) + "\n"
436 + errorMsg, QString( tr( "Ok") ), QString( tr( "Details" ) ) ) ) 454 + errorMsg, QString( tr( "Ok") ), QString( tr( "Details" ) ) ) )
437 { 455 {
@@ -475,13 +493,12 @@ void BackupAndRestore::restore()
475 config.setGroup( "LastLocation" ); 493 config.setGroup( "LastLocation" );
476 config.writeEntry( "LastRestoreLocation", restoreSource->currentText() ); 494 config.writeEntry( "LastRestoreLocation", restoreSource->currentText() );
477 495
478 setCaption(tr("Backup and Restore")); 496 setCaption(tr("Backup and Restore"));
479} 497}
480 498
481
482/** 499/**
483 * Check for exclude in Applications/backup 500 * Check for exclude in Applications/backup
484 * If it does not exist, the function will create the file with *.bck as content 501 * If it does not exist, the function will create the file with *.bck as content
485 * The exclude_files is read by tar and will provide to exclude special files out from backup. 502 * The exclude_files is read by tar and will provide to exclude special files out from backup.
486 * e.g. alle *.bck files (backup-files) will not be backed up by default 503 * e.g. alle *.bck files (backup-files) will not be backed up by default
487 */ 504 */