summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/backup/backup.pro2
-rw-r--r--noncore/settings/backup/backuprestore.cpp115
-rw-r--r--noncore/settings/backup/backuprestore.h2
-rw-r--r--noncore/settings/backup/backuprestorebase.ui46
-rw-r--r--noncore/settings/backup/errordialog.ui154
-rw-r--r--noncore/settings/backup/opie-backup.control2
6 files changed, 289 insertions, 32 deletions
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
@@ -3,13 +3,13 @@ TEMPLATE = app
CONFIG = qt warn_on release
HEADERS = backuprestore.h
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
TRANSLATIONS = ../../../i18n/de/backup.ts \
../../../i18n/nl/backup.ts \
../../../i18n/xx/backup.ts \
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,9 +1,10 @@
#include "backuprestore.h"
//#include "output.h"
+#include "errordialog.h"
#include <qapplication.h>
#include <qmultilineedit.h>
#include <qdir.h>
#include <qfile.h>
@@ -15,12 +16,14 @@
#include <qpe/config.h>
#include <qmessagebox.h>
#include <qcombobox.h>
#include <qlist.h>
#include <stdlib.h>
#include <qregexp.h>
+#include <qtextstream.h>
+#include <qtextview.h>
#include <errno.h>
#include <stdlib.h>
#include <unistd.h>
#include <sys/stat.h>
#include <dirent.h>
@@ -28,12 +31,15 @@
#define HEADER_NAME 0
#define HEADER_BACKUP 1
#define BACKUP_LOCATION 2
#define EXTENSION ".bck"
+const QString tempFileName = "/tmp/backup.err";
+
+
BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name)
: BackupAndRestoreBase(parent, name){
this->showMaximized();
backupList->header()->hide();
restoreList->header()->hide();
connect(backupButton, SIGNAL(clicked()),
@@ -41,12 +47,14 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name)
connect(restoreButton, SIGNAL(clicked()),
this, SLOT(restore()));
connect(backupList, SIGNAL(clicked( QListViewItem * )),
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/");
selectItem(applicationSettings);
applicationSettings = new QListViewItem(backupList, "Application Data", "",
QDir::homeDirPath() + "/Applications/");
@@ -124,12 +132,16 @@ BackupAndRestore::~BackupAndRestore(){
if(list.at(i)->text(HEADER_BACKUP) == ""){
config.writeEntry(QString("%1").arg(count), list.at(i)->text(HEADER_NAME));
count++;
}
}
config.writeEntry("Total", count);
+
+ // Remove Temp File
+ if ( QFile::exists( tempFileName ) )
+ QFile::remove( tempFileName );
}
QList<QListViewItem> BackupAndRestore::getAllItems(QListViewItem *item, QList<QListViewItem> &list){
while(item){
if(item->childCount() > 0)
getAllItems(item->firstChild(), list);
@@ -188,39 +200,75 @@ void BackupAndRestore::backupPressed(){
return;
}
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;
int c = 1;
while(QFile::exists(outputFile + EXTENSION)){
outputFile = t + QString("%1").arg(c);
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"));
}
/***
@@ -258,12 +306,19 @@ int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent
void BackupAndRestore::sourceDirChanged(int selection){
restoreList->clear();
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.
* @param directory - the directory to look in.
*/
void BackupAndRestore::rescanFolder(QString directory){
@@ -296,27 +351,59 @@ 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, "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
@@ -10,22 +10,24 @@ class QListViewItem;
class BackupAndRestore : public BackupAndRestoreBase {
Q_OBJECT
public:
+
BackupAndRestore( QWidget* parent = 0, const char* name = 0);
~BackupAndRestore();
private slots:
void backupPressed();
void restore();
void selectItem(QListViewItem *currentItem);
void sourceDirChanged(int);
void rescanFolder(QString directory);
+ void fileListUpdate();
private:
void scanForApplicationSettings();
int getBackupFiles(QString &backupFiles, QListViewItem *parent);
QMap<QString, QString> backupLocations;
QList<QListViewItem> getAllItems(QListViewItem *item, QList<QListViewItem> &list);
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
@@ -8,14 +8,14 @@
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
- <width>234</width>
- <height>216</height>
+ <width>235</width>
+ <height>275</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
<string>Backup And Restore</string>
</property>
@@ -34,12 +34,15 @@
<widget>
<class>QTabWidget</class>
<property stdset="1">
<name>name</name>
<cstring>tabWidget</cstring>
</property>
+ <property>
+ <name>layoutMargin</name>
+ </property>
<widget>
<class>QWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Widget2</cstring>
</property>
@@ -147,37 +150,26 @@
<name>title</name>
<string>Restore</string>
</attribute>
<grid>
<property stdset="1">
<name>margin</name>
- <number>11</number>
+ <number>4</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget row="0" column="1" >
<class>QComboBox</class>
<property stdset="1">
<name>name</name>
<cstring>restoreSource</cstring>
</property>
</widget>
- <widget row="0" column="0" >
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>TextLabel1_2</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Select Source</string>
- </property>
- </widget>
- <widget row="1" column="0" rowspan="1" colspan="2" >
+ <widget row="2" column="0" rowspan="1" colspan="2" >
<class>QListView</class>
<column>
<property>
<name>text</name>
<string>Column 1</string>
</property>
@@ -199,23 +191,45 @@
<size>
<width>0</width>
<height>100</height>
</size>
</property>
</widget>
- <widget row="2" column="0" rowspan="1" colspan="2" >
+ <widget row="3" column="0" rowspan="1" colspan="2" >
<class>QPushButton</class>
<property stdset="1">
<name>name</name>
<cstring>restoreButton</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>&amp;Restore</string>
</property>
</widget>
+ <widget row="1" column="0" rowspan="1" colspan="2" >
+ <class>QPushButton</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>updateList</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Update Filelist</string>
+ </property>
+ </widget>
+ <widget row="0" column="0" >
+ <class>QLabel</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>TextLabel1_2</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>Select Source</string>
+ </property>
+ </widget>
</grid>
</widget>
</widget>
</vbox>
</widget>
</UI>
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 @@
+<!DOCTYPE UI><UI>
+<class>ErrorDialog</class>
+<widget>
+ <class>QDialog</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>ErrorDialog</cstring>
+ </property>
+ <property stdset="1">
+ <name>geometry</name>
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>153</width>
+ <height>223</height>
+ </rect>
+ </property>
+ <property stdset="1">
+ <name>caption</name>
+ <string>Error Info</string>
+ </property>
+ <property stdset="1">
+ <name>sizeGripEnabled</name>
+ <bool>true</bool>
+ </property>
+ <property>
+ <name>layoutMargin</name>
+ </property>
+ <property>
+ <name>layoutSpacing</name>
+ </property>
+ <vbox>
+ <property stdset="1">
+ <name>margin</name>
+ <number>2</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>2</number>
+ </property>
+ <widget>
+ <class>QGroupBox</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>GroupBox1</cstring>
+ </property>
+ <property stdset="1">
+ <name>midLineWidth</name>
+ <number>2</number>
+ </property>
+ <property stdset="1">
+ <name>title</name>
+ <string>Error Message:</string>
+ </property>
+ <property>
+ <name>layoutMargin</name>
+ </property>
+ <grid>
+ <property stdset="1">
+ <name>margin</name>
+ <number>4</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>6</number>
+ </property>
+ <widget row="0" column="0" >
+ <class>QMultiLineEdit</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>m_textarea</cstring>
+ </property>
+ <property stdset="1">
+ <name>wordWrap</name>
+ <enum>WidgetWidth</enum>
+ </property>
+ </widget>
+ </grid>
+ </widget>
+ <widget>
+ <class>QFrame</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>Frame3</cstring>
+ </property>
+ <property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>3</hsizetype>
+ <vsizetype>4</vsizetype>
+ </sizepolicy>
+ </property>
+ <property stdset="1">
+ <name>frameShape</name>
+ <enum>StyledPanel</enum>
+ </property>
+ <property stdset="1">
+ <name>frameShadow</name>
+ <enum>Sunken</enum>
+ </property>
+ <property>
+ <name>layoutMargin</name>
+ </property>
+ <property>
+ <name>layoutSpacing</name>
+ </property>
+ <grid>
+ <property stdset="1">
+ <name>margin</name>
+ <number>2</number>
+ </property>
+ <property stdset="1">
+ <name>spacing</name>
+ <number>2</number>
+ </property>
+ <widget row="0" column="0" >
+ <class>QPushButton</class>
+ <property stdset="1">
+ <name>name</name>
+ <cstring>m_buttonOk</cstring>
+ </property>
+ <property stdset="1">
+ <name>sizePolicy</name>
+ <sizepolicy>
+ <hsizetype>4</hsizetype>
+ <vsizetype>4</vsizetype>
+ </sizepolicy>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>&amp;OK</string>
+ </property>
+ <property stdset="1">
+ <name>autoDefault</name>
+ <bool>true</bool>
+ </property>
+ <property stdset="1">
+ <name>default</name>
+ <bool>true</bool>
+ </property>
+ </widget>
+ </grid>
+ </widget>
+ </vbox>
+</widget>
+<connections>
+ <connection>
+ <sender>m_buttonOk</sender>
+ <signal>clicked()</signal>
+ <receiver>ErrorDialog</receiver>
+ <slot>accept()</slot>
+ </connection>
+</connections>
+</UI>
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
@@ -1,9 +1,9 @@
Package: opie-backup
Files: bin/backup pics/backup apps/Settings/backup.desktop
Priority: optional
Version: $QPE_VERSION-$SUB_VERSION
Depends: task-opie-minimal
Architecture: arm
-Maintainer: Benjamin Meyer <meyerb@sharpsec.com>
+Maintainer: Stefan Eilers <Eilers.Stefan@epost.de>
Section: opie/Settings
Description: Backup and Restore utility.