summaryrefslogtreecommitdiff
authorar <ar>2004-03-06 22:30:09 (UTC)
committer ar <ar>2004-03-06 22:30:09 (UTC)
commit5bc69a9731634c55b9a01b9de6909201f422893b (patch) (side-by-side diff)
tree94eb378dfc4da7f9ecb2052ca0ffffdb8721ff8f
parentb5466f18b49d5f99237fdd6b39e0f61609557698 (diff)
downloadopie-5bc69a9731634c55b9a01b9de6909201f422893b.zip
opie-5bc69a9731634c55b9a01b9de6909201f422893b.tar.gz
opie-5bc69a9731634c55b9a01b9de6909201f422893b.tar.bz2
fix to work together with busybox tar
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/backup/backuprestore.cpp44
-rw-r--r--noncore/settings/backup/backuprestore.h1
2 files changed, 38 insertions, 7 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
@@ -231,52 +231,53 @@ void BackupAndRestore::backup()
setCaption(tr("Backup and Restore... working..."));
QString outputFile = backupLocations[storeToLocation->currentText()];
QDateTime datetime = QDateTime::currentDateTime();
QString dateString = QString::number( datetime.date().year() ) + QString::number( datetime.date().month() ).rightJustify(2, '0') +
QString::number( datetime.date().day() ).rightJustify(2, '0');
outputFile += "/" + dateString;
QString t = outputFile;
int c = 1;
while(QFile::exists(outputFile + EXTENSION))
{
outputFile = t + QString("%1").arg(c);
c++;
}
// We execute tar and compressing its output with gzip..
// The error output will be written into a temp-file which could be provided
// for debugging..
qDebug( "Storing file: %s", outputFile.latin1() );
outputFile += EXTENSION;
- QString commandLine = QString( "(tar -C %1 -z --exclude=*.bck -c %2 > %3 ) 2> %4" ).arg( QDir::homeDirPath() )
- .arg( backupFiles )
- .arg( outputFile.latin1() )
- .arg( tempFileName.latin1() );
+ QString commandLine = QString( "cd %1 && (tar -X %1 -cz %2 -f %3 ) 2> %4" ).arg( QDir::homeDirPath() )
+ .arg( getExcludeFile() )
+ .arg( backupFiles )
+ .arg( outputFile.latin1() )
+ .arg( tempFileName.latin1() );
qDebug( commandLine );
int r = system( commandLine );
if(r != 0)
{
perror("Error: ");
QString errorMsg= tr( "Error from System:\n" ) + (QString)strerror( errno );
switch( QMessageBox::critical(this, tr( "Message" ), tr( "Backup Failed!" ) + "\n"
+ errorMsg, QString( tr( "Ok" ) ), QString( tr( "Details" ) ) ) )
{
case 1:
qWarning("Details pressed !");
ErrorDialog* pErrDialog = new ErrorDialog( this, NULL, true );
QFile errorFile( tempFileName );
if ( errorFile.open(IO_ReadOnly) )
{
QTextStream t( &errorFile );
QString s;
while ( !t.eof() )
{ // until end of file...
@@ -399,51 +400,51 @@ void BackupAndRestore::rescanFolder(QString directory)
}
}
/**
* Restore a backup file.
* Report errors or success
*/
void BackupAndRestore::restore()
{
QListViewItem *restoreItem = restoreList->currentItem();
if(!restoreItem)
{
QMessageBox::critical(this, tr( "Message" ),
tr( "Please select something to restore." ),QString( tr( "Ok") ) );
return;
}
setCaption(tr("Backup and Restore... working..."));
QString restoreFile = backupLocations[restoreSource->currentText()];
restoreFile += "/" + restoreItem->text(0);
qDebug( restoreFile );
- QString commandLine = QString( "tar -C %1 -zxf %2 2> %3" ).arg( QDir::homeDirPath() )
- .arg( restoreFile.latin1() )
- .arg( tempFileName.latin1() );
+ QString commandLine = QString( "cd %1 && tar -zxf %2 2> %3" ).arg( QDir::homeDirPath() )
+ .arg( restoreFile.latin1() )
+ .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" ) ) ) )
{
case 1:
qWarning("Details pressed !");
ErrorDialog* pErrDialog = new ErrorDialog( this, NULL, true );
QFile errorFile( tempFileName );
if ( errorFile.open(IO_ReadOnly) )
{
QTextStream t( &errorFile );
QString s;
while ( !t.eof() )
{ // until end of file...
s += t.readLine(); // line of text excluding '\n'
}
errorFile.close();
@@ -456,26 +457,55 @@ void BackupAndRestore::restore()
}
QPEApplication::execDialog( pErrDialog );
delete pErrDialog;
setCaption(tr("Backup and Restore.. Failed !!"));
return;
break;
}
}
else
{
QMessageBox::information(this, tr( "Message" ), tr( "Restore Successful." ), QString( tr( "Ok") ) );
}
//write restore-location
Config config( "BackupAndRestore" );
config.setGroup( "LastLocation" );
config.writeEntry( "LastRestoreLocation", restoreSource->currentText() );
setCaption(tr("Backup and 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
@@ -10,37 +10,38 @@ class QListViewItem;
class BackupAndRestore : public BackupAndRestoreBase
{
Q_OBJECT
public:
BackupAndRestore( QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
~BackupAndRestore();
static QString appName() { return QString::fromLatin1("backup"); }
private slots:
void backup();
void restore();
void selectItem(QListViewItem *currentItem);
void sourceDirChanged(int);
void rescanFolder(QString directory);
void fileListUpdate();
private:
void scanForApplicationSettings();
int getBackupFiles(QString &backupFiles, QListViewItem *parent);
+ QString getExcludeFile();
QMap<QString, QString> backupLocations;
QList<QListViewItem> getAllItems(QListViewItem *item, QList<QListViewItem> &list);
QListViewItem *systemSettings;
QListViewItem *applicationSettings;
QListViewItem *documents;
};
#endif
// backuprestore.h