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
@@ -243,25 +243,25 @@ void BackupAndRestore::backup()
243 while(QFile::exists(outputFile + EXTENSION)) 243 while(QFile::exists(outputFile + EXTENSION))
244 { 244 {
245 outputFile = t + QString("%1").arg(c); 245 outputFile = t + QString("%1").arg(c);
246 c++; 246 c++;
247 } 247 }
248 248
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 );
262 262
263 int r = system( commandLine ); 263 int r = system( commandLine );
264 264
265 if(r != 0) 265 if(r != 0)
266 { 266 {
267 perror("Error: "); 267 perror("Error: ");
@@ -412,32 +412,50 @@ void BackupAndRestore::restore()
412 QMessageBox::critical(this, tr( "Message" ), 412 QMessageBox::critical(this, tr( "Message" ),
413 tr( "Please select something to restore." ),QString( tr( "Ok") ) ); 413 tr( "Please select something to restore." ),QString( tr( "Ok") ) );
414 return; 414 return;
415 } 415 }
416 setCaption(tr("Backup and Restore... working...")); 416 setCaption(tr("Backup and Restore... working..."));
417 417
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 {
438 case 1: 456 case 1:
439 qWarning("Details pressed !"); 457 qWarning("Details pressed !");
440 ErrorDialog* pErrDialog = new ErrorDialog( this, NULL, true ); 458 ErrorDialog* pErrDialog = new ErrorDialog( this, NULL, true );
441 QFile errorFile( tempFileName ); 459 QFile errorFile( tempFileName );
442 if ( errorFile.open(IO_ReadOnly) ) 460 if ( errorFile.open(IO_ReadOnly) )
443 { 461 {
@@ -469,25 +487,24 @@ void BackupAndRestore::restore()
469 { 487 {
470 QMessageBox::information(this, tr( "Message" ), tr( "Restore Successful." ), QString( tr( "Ok") ) ); 488 QMessageBox::information(this, tr( "Message" ), tr( "Restore Successful." ), QString( tr( "Ok") ) );
471 } 489 }
472 490
473 //write restore-location 491 //write restore-location
474 Config config( "BackupAndRestore" ); 492 Config config( "BackupAndRestore" );
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 */
488 505
489QString BackupAndRestore::getExcludeFile() 506QString BackupAndRestore::getExcludeFile()
490{ 507{
491 QString excludeFileName = Global::applicationFileName( "backup", "exclude" ); 508 QString excludeFileName = Global::applicationFileName( "backup", "exclude" );
492 if ( !QFile::exists( excludeFileName ) ) 509 if ( !QFile::exists( excludeFileName ) )
493 { 510 {