| -rw-r--r-- | noncore/settings/backup/backuprestore.cpp | 34 | ||||
| -rw-r--r-- | noncore/settings/backup/backuprestore.h | 1 |
2 files changed, 33 insertions, 2 deletions
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp index 6b83bc9..164055e 100644 --- a/noncore/settings/backup/backuprestore.cpp +++ b/noncore/settings/backup/backuprestore.cpp @@ -254,3 +254,4 @@ void BackupAndRestore::backup() - QString commandLine = QString( "(tar -C %1 -z --exclude=*.bck -c %2 > %3 ) 2> %4" ).arg( QDir::homeDirPath() ) + QString commandLine = QString( "cd %1 && (tar -X %1 -cz %2 -f %3 ) 2> %4" ).arg( QDir::homeDirPath() ) + .arg( getExcludeFile() ) .arg( backupFiles ) @@ -422,3 +423,3 @@ void BackupAndRestore::restore() - QString commandLine = QString( "tar -C %1 -zxf %2 2> %3" ).arg( QDir::homeDirPath() ) + QString commandLine = QString( "cd %1 && tar -zxf %2 2> %3" ).arg( QDir::homeDirPath() ) .arg( restoreFile.latin1() ) @@ -479,2 +480,31 @@ void BackupAndRestore::restore() + +/** + * Check for exclude in Applications/backup + * If it does not exist, the function will create the file with *.bck as content + * The exclude_files is read by tar and will provide to exclude special files out from backup. + * e.g. alle *.bck files (backup-files) will not be backed up by default + */ + +QString BackupAndRestore::getExcludeFile() +{ + QString excludeFileName = Global::applicationFileName( "backup", "exclude" ); + if ( !QFile::exists( excludeFileName ) ) + { + QFile excludeFile( excludeFileName); + if ( excludeFile.open( IO_WriteOnly ) == true ) + { + QTextStream writeStream( &excludeFile ); + writeStream << "*.bck" << "\n"; + excludeFile.close(); + } + else + { + return QString::null; + } + } + + return excludeFileName; +} + // backuprestore.cpp diff --git a/noncore/settings/backup/backuprestore.h b/noncore/settings/backup/backuprestore.h index fdc2bf2..0d88f8d 100644 --- a/noncore/settings/backup/backuprestore.h +++ b/noncore/settings/backup/backuprestore.h @@ -33,2 +33,3 @@ private: int getBackupFiles(QString &backupFiles, QListViewItem *parent); + QString getExcludeFile(); QMap<QString, QString> backupLocations; |