From 51cb7e4cd9a7ec7f1bf864884928c61b9f2db3b0 Mon Sep 17 00:00:00 2001 From: eilers Date: Fri, 04 Jul 2003 15:18:38 +0000 Subject: Merged all changes of opie-backup into HEAD to be able to work on --- diff --git a/noncore/settings/backup/backup.pro b/noncore/settings/backup/backup.pro index 78842b9..cadb381 100644 --- a/noncore/settings/backup/backup.pro +++ b/noncore/settings/backup/backup.pro @@ -6,7 +6,7 @@ SOURCES = main.cpp backuprestore.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -INTERFACES = backuprestorebase.ui +INTERFACES = backuprestorebase.ui errordialog.ui TARGET = backup DESTDIR = $(OPIEDIR)/bin diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp index 59e15a2..4ff6be1 100644 --- a/noncore/settings/backup/backuprestore.cpp +++ b/noncore/settings/backup/backuprestore.cpp @@ -1,6 +1,7 @@ #include "backuprestore.h" //#include "output.h" +#include "errordialog.h" #include #include @@ -18,6 +19,8 @@ #include #include #include +#include +#include #include #include @@ -31,6 +34,9 @@ #define EXTENSION ".bck" +const QString tempFileName = "/tmp/backup.err"; + + BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) : BackupAndRestoreBase(parent, name){ this->showMaximized(); @@ -44,6 +50,8 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name) this, SLOT(selectItem(QListViewItem*))); connect(restoreSource, SIGNAL(activated( int )), this, SLOT(sourceDirChanged(int))); + connect(updateList, SIGNAL(clicked()), + this, SLOT( fileListUpdate())); applicationSettings = new QListViewItem(backupList, "Application Settings", "", QDir::homeDirPath() + "/Settings/"); @@ -127,6 +135,10 @@ BackupAndRestore::~BackupAndRestore(){ } } config.writeEntry("Total", count); + + // Remove Temp File + if ( QFile::exists( tempFileName ) ) + QFile::remove( tempFileName ); } QList BackupAndRestore::getAllItems(QListViewItem *item, QList &list){ @@ -191,8 +203,10 @@ void BackupAndRestore::backupPressed(){ setCaption(tr("Backup and Restore... working...")); QString outputFile = backupLocations[storeToLocation->currentText()]; - QDateTime time = QDateTime::currentDateTime(); - QString dateString = time.date().toString().replace(QRegExp(" "), ""); + 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; @@ -202,22 +216,56 @@ void BackupAndRestore::backupPressed(){ c++; } - qDebug(QString("system(\"tar -c %1 | gzip > %2\")").arg(backupFiles).arg(outputFile).latin1()); + // 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; - int r = system( QString("tar -c %1 | gzip > %2").arg(backupFiles).arg(outputFile).latin1() ); + qWarning( QString("(tar -c %1 | gzip > %2 ) 2> %3") + .arg( backupFiles ) + .arg( outputFile.latin1() ) + .arg( tempFileName.latin1() ) ); + int r = system( QString("(tar -c %1 | gzip > %2 ) 2> %3") + .arg( backupFiles ) + .arg( outputFile.latin1() ) + .arg( tempFileName.latin1() ) ); if(r != 0){ perror("Error: "); - QString errorMsg="Error\n"+(QString)strerror(errno); + 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" ) ) ) ){ - QMessageBox::critical(this, "Message", "Backup Failed.\n"+errorMsg, QString("Ok") ); + 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(); + + pErrDialog->m_textarea->setText( s ); + }else{ + pErrDialog->m_textarea->setText( "Unable to open File: /tmp/backup.er" ); + } + pErrDialog->showMaximized(); + pErrDialog->exec(); + delete pErrDialog; + break; + } + setCaption(tr("Backup and Restore.. Failed !!")); return; } else{ - QMessageBox::information(this, "Message", "Backup Successfull.",QString("Ok") ); + QMessageBox::information(this, tr( "Message" ), tr( "Backup Successfull." ), QString(tr( "Ok" ) ) ); } setCaption(tr("Backup and Restore")); @@ -261,6 +309,13 @@ void BackupAndRestore::sourceDirChanged(int selection){ rescanFolder(backupLocations[restoreSource->text(selection)]); } +void BackupAndRestore::fileListUpdate() +{ + qWarning("void BackupAndRestore::fileListUpdate()"); + restoreList->clear(); + rescanFolder( backupLocations[restoreSource->currentText()] ); +} + /** * Scans directory for any backup files. Will recursivly go down, * but will not follow symlinks. @@ -299,23 +354,55 @@ void BackupAndRestore::rescanFolder(QString directory){ void BackupAndRestore::restore(){ QListViewItem *restoreItem = restoreList->currentItem(); if(!restoreItem){ - QMessageBox::critical(this, "Message", - "Please select something to restore.",QString("Ok") ); + 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); - int r = system(QString("tar -C / -zxf %1").arg(restoreFile).latin1()); + int r = system(QString("tar -C / -zxf %1 2> %3") + .arg( restoreFile.latin1() ) + .arg( tempFileName.latin1() ) ); if(r != 0){ - QMessageBox::critical(this, "Message", - "Restore Failed.",QString("Ok") ); + 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(); + + pErrDialog->m_textarea->setText( s ); + }else{ + pErrDialog->m_textarea->setText( tr( "Unable to open File: %1" ).arg( "/tmp/backup.er" ) ); + } + pErrDialog->showMaximized(); + pErrDialog->exec(); + delete pErrDialog; + + setCaption(tr("Backup and Restore.. Failed !!")); + return; + + break; + + } } else{ - QMessageBox::critical(this, "Message", - "Restore Successfull.",QString("Ok") ); + QMessageBox::critical(this, tr( "Message" ), + tr( "Restore Successfull." ), QString( tr( "Ok") ) ); } + setCaption(tr("Backup and Restore")); } // backuprestore.cpp diff --git a/noncore/settings/backup/backuprestore.h b/noncore/settings/backup/backuprestore.h index b0cf4cd..8c733e3 100644 --- a/noncore/settings/backup/backuprestore.h +++ b/noncore/settings/backup/backuprestore.h @@ -13,6 +13,7 @@ class BackupAndRestore : public BackupAndRestoreBase { Q_OBJECT public: + BackupAndRestore( QWidget* parent = 0, const char* name = 0); ~BackupAndRestore(); @@ -23,6 +24,7 @@ private slots: void selectItem(QListViewItem *currentItem); void sourceDirChanged(int); void rescanFolder(QString directory); + void fileListUpdate(); private: void scanForApplicationSettings(); diff --git a/noncore/settings/backup/backuprestorebase.ui b/noncore/settings/backup/backuprestorebase.ui index 92e37ee..05dc8a9 100644 --- a/noncore/settings/backup/backuprestorebase.ui +++ b/noncore/settings/backup/backuprestorebase.ui @@ -11,8 +11,8 @@ 0 0 - 234 - 216 + 235 + 275 @@ -37,6 +37,9 @@ name tabWidget + + layoutMargin + QWidget @@ -150,7 +153,7 @@ margin - 11 + 4 spacing @@ -163,18 +166,7 @@ restoreSource - - QLabel - - name - TextLabel1_2 - - - text - Select Source - - - + QListView @@ -202,7 +194,7 @@ - + QPushButton name @@ -213,6 +205,28 @@ &Restore + + QPushButton + + name + updateList + + + text + Update Filelist + + + + QLabel + + name + TextLabel1_2 + + + text + Select Source + + diff --git a/noncore/settings/backup/errordialog.ui b/noncore/settings/backup/errordialog.ui new file mode 100644 index 0000000..b68b3c2 --- a/dev/null +++ b/noncore/settings/backup/errordialog.ui @@ -0,0 +1,154 @@ + +ErrorDialog + + QDialog + + name + ErrorDialog + + + geometry + + 0 + 0 + 153 + 223 + + + + caption + Error Info + + + sizeGripEnabled + true + + + layoutMargin + + + layoutSpacing + + + + margin + 2 + + + spacing + 2 + + + QGroupBox + + name + GroupBox1 + + + midLineWidth + 2 + + + title + Error Message: + + + layoutMargin + + + + margin + 4 + + + spacing + 6 + + + QMultiLineEdit + + name + m_textarea + + + wordWrap + WidgetWidth + + + + + + QFrame + + name + Frame3 + + + sizePolicy + + 3 + 4 + + + + frameShape + StyledPanel + + + frameShadow + Sunken + + + layoutMargin + + + layoutSpacing + + + + margin + 2 + + + spacing + 2 + + + QPushButton + + name + m_buttonOk + + + sizePolicy + + 4 + 4 + + + + text + &OK + + + autoDefault + true + + + default + true + + + + + + + + + m_buttonOk + clicked() + ErrorDialog + accept() + + + diff --git a/noncore/settings/backup/opie-backup.control b/noncore/settings/backup/opie-backup.control index 3f2be85..ebe2ff1 100644 --- a/noncore/settings/backup/opie-backup.control +++ b/noncore/settings/backup/opie-backup.control @@ -4,6 +4,6 @@ Priority: optional Version: $QPE_VERSION-$SUB_VERSION Depends: task-opie-minimal Architecture: arm -Maintainer: Benjamin Meyer +Maintainer: Stefan Eilers Section: opie/Settings Description: Backup and Restore utility. -- cgit v0.9.0.2