-rw-r--r-- | noncore/settings/backup/backuprestore.cpp | 127 | ||||
-rw-r--r-- | noncore/settings/backup/backuprestore.h | 6 | ||||
-rw-r--r-- | noncore/settings/backup/backuprestorebase.ui | 129 |
3 files changed, 202 insertions, 60 deletions
diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp index 2eccdfe..3889744 100644 --- a/noncore/settings/backup/backuprestore.cpp +++ b/noncore/settings/backup/backuprestore.cpp @@ -1,111 +1,94 @@ #include "backuprestore.h" #include "errordialog.h" + /* OPIE */ #include <opie2/odebug.h> #include <opie2/ostorageinfo.h> -#include <qpe/qpeapplication.h> using namespace Opie::Core; +#include <qpe/qpeapplication.h> +#include <qpe/resource.h> +#include <qpe/config.h> + /* QT */ #include <qapplication.h> #include <qmultilineedit.h> #include <qdir.h> #include <qfile.h> #include <qfileinfo.h> #include <qlistview.h> #include <qpushbutton.h> #include <qheader.h> -#include <qpe/resource.h> -#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 <qlineedit.h> /* STD */ #include <errno.h> #include <stdlib.h> #include <unistd.h> #include <sys/stat.h> #include <dirent.h> #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, WFlags fl) : BackupAndRestoreBase(parent, name, fl) { backupList->header()->hide(); restoreList->header()->hide(); - connect(backupButton, SIGNAL(clicked()), - this, SLOT(backup())); - 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())); + locationList->header()->hide(); + connect( backupButton, SIGNAL( clicked() ), this, SLOT( backup() ) ); + 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( addLocationButton, SIGNAL( clicked() ), this, SLOT( addLocation() ) ); + connect( removeLocationButton, SIGNAL( clicked() ), this, SLOT( removeLocation() ) ); + connect( saveLocationsButton, SIGNAL( clicked() ), this, SLOT( saveLocations() ) ); //add directorys for backing up applicationSettings = new QListViewItem(backupList, "Application Settings", "", "Settings/"); selectItem(applicationSettings); applicationSettings = new QListViewItem(backupList, "Application Data", "", "Applications/"); selectItem(applicationSettings); documents= new QListViewItem(backupList, "Documents", "", "Documents/"); selectItem(documents); scanForApplicationSettings(); - - Opie::Core::OStorageInfo storage; - - backupLocations.insert( "Documents", QDir::homeDirPath() + "/Documents" ); - if ( storage.hasCf() ) - { - backupLocations.insert( "CF", storage.cfPath() ); - odebug << "Cf Path: " + storage.cfPath() << oendl; - } - if ( storage.hasSd() ) - { - backupLocations.insert( "SD", storage.sdPath() ); - odebug << " Sd Path: " + storage.sdPath() << oendl; - } - if ( storage.hasMmc() ) - { - backupLocations.insert( "MMC", storage.mmcPath() ); - odebug << "Mmc Path: " + storage.mmcPath() << oendl; - } + refreshBackupLocations(); + refreshLocations(); Config config("BackupAndRestore"); //read last locations config.setGroup("LastLocation"); QString lastStoreLocation = config.readEntry( "LastStoreLocation", "" ); QString lastRestoreLocation = config.readEntry( "LastRestoreLocation", "" ); int locationIndex = 0; QMap<QString, QString>::Iterator it; for( it = backupLocations.begin(); it != backupLocations.end(); ++it ) { storeToLocation->insertItem(it.key()); restoreSource->insertItem(it.key()); //check for last locations if ( it.key() == lastStoreLocation ) storeToLocation->setCurrentItem( locationIndex ); if ( it.key() == lastRestoreLocation ) restoreSource->setCurrentItem( locationIndex ); locationIndex++; } // Read the list of items to ignore. QList<QString> dontBackupList; @@ -139,161 +122,187 @@ BackupAndRestore::~BackupAndRestore() { QList<QListViewItem> list; getAllItems(backupList->firstChild(), list); Config config("BackupAndRestore"); config.setGroup("DontBackup"); config.clearGroup(); int count = 0; for(uint i = 0; i < list.count(); i++) { 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 ); } +void BackupAndRestore::refreshBackupLocations() +{ + backupLocations.clear(); + // Add cards + Opie::Core::OStorageInfo storage; + backupLocations.insert( "Documents", QDir::homeDirPath() + "/Documents" ); + if ( storage.hasCf() ) + { + backupLocations.insert( "CF", storage.cfPath() ); + odebug << "Cf Path: " + storage.cfPath() << oendl; + } + if ( storage.hasSd() ) + { + backupLocations.insert( "SD", storage.sdPath() ); + odebug << " Sd Path: " + storage.sdPath() << oendl; + } + if ( storage.hasMmc() ) + { + backupLocations.insert( "MMC", storage.mmcPath() ); + odebug << "Mmc Path: " + storage.mmcPath() << oendl; + } + + // Add own locations from locationList + // todo implementation +} + QList<QListViewItem> BackupAndRestore::getAllItems(QListViewItem *item, QList<QListViewItem> &list) { while(item) { if(item->childCount() > 0) getAllItems(item->firstChild(), list); list.append(item); item = item->nextSibling(); } return list; } /** * Selects and unselects the item by setting the HEADER_BACKUP to B or !. * and changing the icon to match * @param currentItem the item to swich the selection choice. */ void BackupAndRestore::selectItem(QListViewItem *currentItem) { if(!currentItem) return; if(currentItem->text(HEADER_BACKUP) == "B") { currentItem->setPixmap(HEADER_NAME, Resource::loadPixmap("backup/null")); currentItem->setText(HEADER_BACKUP, ""); } else { currentItem->setPixmap(HEADER_NAME, Resource::loadPixmap("backup/check")); currentItem->setText(HEADER_BACKUP, "B"); } } void BackupAndRestore::scanForApplicationSettings() { QDir d( QDir::homeDirPath() + "/" + QString( applicationSettings->text(BACKUP_LOCATION) ) ); d.setFilter( QDir::Dirs | QDir::Files | QDir::NoSymLinks ); const QFileInfoList *list = d.entryInfoList(); QFileInfoListIterator it( *list ); QFileInfo *fi; while ( (fi=it.current()) ) { - //odebug << (d.path()+"/"+fi->fileName()).latin1() << oendl; + //odebug << (d.path()+"/"+fi->fileName()).latin1() << oendl; if ( ( fi->fileName() != "." ) && ( fi->fileName() != ".." ) ) { QListViewItem *newItem = new QListViewItem(applicationSettings, fi->fileName()); selectItem(newItem); } ++it; } } /** * The "Backup" button has been pressed. Get a list of all of the files that * should be backed up. If there are no files, emit and error and exit. * Determine the file name to store the backup in. Backup the file(s) using * tar and gzip --best. Report failure or success */ void BackupAndRestore::backup() { QString backupFiles; if(getBackupFiles(backupFiles, NULL) == 0) { QMessageBox::critical(this, "Message", "No items selected.",QString("Ok") ); return; } 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.. - odebug << "Storing file: " << outputFile.latin1() << "" << oendl; + odebug << "Storing file: " << outputFile.latin1() << "" << oendl; outputFile += EXTENSION; QString commandLine = QString( "cd %1 && (tar -X %1 -cz %2 Applications/backup/exclude -f %3 ) 2> %4" ).arg( QDir::homeDirPath() ) .arg( getExcludeFile() ) .arg( backupFiles ) .arg( outputFile.latin1() ) .arg( tempFileName.latin1() ); - odebug << commandLine << oendl; + odebug << commandLine << oendl; 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: - owarn << "Details pressed !" << oendl; + owarn << "Details pressed !" << oendl; 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" ); } QPEApplication::execDialog( pErrDialog ); delete pErrDialog; break; } setCaption(tr("Backup and Restore.. Failed !!")); return; @@ -338,191 +347,223 @@ int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent backupFiles += currentItem->text(BACKUP_LOCATION); else backupFiles += currentHome + currentItem->text(HEADER_NAME); backupFiles += " "; count++; } else { count += getBackupFiles(backupFiles, currentItem); } } currentItem = currentItem->nextSibling(); } return count; } void BackupAndRestore::sourceDirChanged(int selection) { restoreList->clear(); rescanFolder(backupLocations[restoreSource->text(selection)]); } void BackupAndRestore::fileListUpdate() { - owarn << "void BackupAndRestore::fileListUpdate()" << oendl; + owarn << "void BackupAndRestore::fileListUpdate()" << oendl; 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) { - //odebug << QString("rescanFolder: ") + directory.latin1() << oendl; + //odebug << QString("rescanFolder: ") + directory.latin1() << oendl; QDir d(directory); if(!d.exists()) return; d.setFilter( QDir::Files | QDir::Hidden | QDir::Dirs); const QFileInfoList *list = d.entryInfoList(); QFileInfoListIterator it( *list ); QFileInfo *file; while ( (file=it.current()) ) { // for each file... // If it is a dir and not .. or . then add it as a tab and go down. if(file->isDir()) { if(file->fileName() != ".." && file->fileName() != ".") { rescanFolder(directory + "/" + file->fileName()); } } else { // If it is a backup file add to list. if(file->fileName().contains(EXTENSION)) (void)new QListViewItem(restoreList, file->fileName()); } ++it; } } /** * 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); - odebug << restoreFile << oendl; + odebug << restoreFile << oendl; //check if backup file come from opie 1.0.x QString commandLine = QString( "tar -tzf %1 | grep Applications/backup/exclude" ).arg( restoreFile.latin1() ); int r = system( commandLine ); QString startDir; if( r != 0 ) //Applications/backup/exclude not found - old backup file { startDir = QString( "/" ); } else { startDir = QDir::homeDirPath(); } //unpack backup file commandLine = QString( "cd %1 && tar -zxf %2 2> %3" ).arg( startDir ) .arg( restoreFile.latin1() ) .arg( tempFileName.latin1() ); - odebug << commandLine << oendl; + odebug << commandLine << oendl; r = system( commandLine ); //error handling 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: - owarn << "Details pressed !" << oendl; + owarn << "Details pressed !" << oendl; 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" ) ); } 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. + * 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; } +void BackupAndRestore::refreshLocations() +{ + locationList->clear(); + //todo: implement add locations + odebug << "not implemented yet" << oendl; +} + +void BackupAndRestore::addLocation() +{ + if ( ( !locationEdit->text().isEmpty() ) && + ( QDir( locationEdit->text() ).exists() ) ) + { + (void) new QListViewItem( locationList, locationEdit->text() ); + locationEdit->setText( "" ); + } +} + +void BackupAndRestore::removeLocation() +{ + if ( locationList->selectedItem() ) + { + delete( locationList->selectedItem() ); + } +} + +void BackupAndRestore::saveLocation() +{ + //todo: implement + odebug << "not implemented yet" << oendl; +} + + // backuprestore.cpp diff --git a/noncore/settings/backup/backuprestore.h b/noncore/settings/backup/backuprestore.h index 0d88f8d..527b3cf 100644 --- a/noncore/settings/backup/backuprestore.h +++ b/noncore/settings/backup/backuprestore.h @@ -7,41 +7,47 @@ #include <qlist.h> 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(); + void addLocation(); + void removeLocation(); + void saveLocation(); + private: void scanForApplicationSettings(); int getBackupFiles(QString &backupFiles, QListViewItem *parent); QString getExcludeFile(); QMap<QString, QString> backupLocations; QList<QListViewItem> getAllItems(QListViewItem *item, QList<QListViewItem> &list); + void refreshBackupLocations(); + void refreshLocations(); QListViewItem *systemSettings; QListViewItem *applicationSettings; QListViewItem *documents; }; #endif // backuprestore.h diff --git a/noncore/settings/backup/backuprestorebase.ui b/noncore/settings/backup/backuprestorebase.ui index a52b42d..b4624bb 100644 --- a/noncore/settings/backup/backuprestorebase.ui +++ b/noncore/settings/backup/backuprestorebase.ui @@ -1,84 +1,90 @@ <!DOCTYPE UI><UI> <class>BackupAndRestoreBase</class> <widget> <class>QWidget</class> <property stdset="1"> <name>name</name> <cstring>BackupAndRestoreBase</cstring> </property> <property stdset="1"> <name>geometry</name> <rect> <x>0</x> <y>0</y> - <width>231</width> - <height>275</height> + <width>290</width> + <height>243</height> </rect> </property> <property stdset="1"> <name>caption</name> <string>Backup And Restore</string> </property> <property> <name>layoutMargin</name> </property> + <property> + <name>layoutSpacing</name> + </property> <vbox> <property stdset="1"> <name>margin</name> <number>0</number> </property> <property stdset="1"> <name>spacing</name> - <number>6</number> + <number>0</number> </property> <widget> <class>QTabWidget</class> <property stdset="1"> <name>name</name> <cstring>tabWidget</cstring> </property> <property> <name>layoutMargin</name> </property> + <property> + <name>layoutSpacing</name> + </property> <widget> <class>QWidget</class> <property stdset="1"> <name>name</name> <cstring>Widget2</cstring> </property> <attribute> <name>title</name> <string>Backup</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> + <number>4</number> </property> <widget row="0" column="0" > <class>QLabel</class> <property stdset="1"> <name>name</name> <cstring>TextLabel1</cstring> </property> <property stdset="1"> <name>text</name> <string>Save To</string> </property> </widget> <widget row="0" column="1" > <class>QComboBox</class> <property stdset="1"> <name>name</name> <cstring>storeToLocation</cstring> </property> </widget> <widget row="2" column="0" rowspan="1" colspan="2" > <class>QPushButton</class> <property stdset="1"> <name>name</name> <cstring>backupButton</cstring> @@ -111,104 +117,193 @@ <property stdset="1"> <name>allColumnsShowFocus</name> <bool>true</bool> </property> <property stdset="1"> <name>rootIsDecorated</name> <bool>true</bool> </property> </widget> </grid> </widget> <widget> <class>QWidget</class> <property stdset="1"> <name>name</name> <cstring>Widget3</cstring> </property> <attribute> <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> + <number>4</number> </property> <widget row="0" column="1" > <class>QComboBox</class> <property stdset="1"> <name>name</name> <cstring>restoreSource</cstring> </property> </widget> <widget row="2" 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>&Restore</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> + <widget row="1" column="0" rowspan="1" colspan="2" > <class>QListView</class> <column> <property> <name>text</name> <string>Column 1</string> </property> <property> <name>clickable</name> <bool>true</bool> </property> <property> <name>resizeable</name> <bool>true</bool> </property> </column> <property stdset="1"> <name>name</name> <cstring>restoreList</cstring> </property> <property stdset="1"> <name>minimumSize</name> <size> <width>0</width> <height>100</height> </size> </property> </widget> - <widget row="3" column="0" rowspan="1" colspan="2" > + </grid> + </widget> + <widget> + <class>QWidget</class> + <property stdset="1"> + <name>name</name> + <cstring>tab</cstring> + </property> + <attribute> + <name>title</name> + <string>Locations</string> + </attribute> + <grid> + <property stdset="1"> + <name>margin</name> + <number>4</number> + </property> + <property stdset="1"> + <name>spacing</name> + <number>4</number> + </property> + <widget row="0" column="0" rowspan="1" colspan="3" > + <class>QLineEdit</class> + <property stdset="1"> + <name>name</name> + <cstring>locationEdit</cstring> + </property> + </widget> + <widget row="0" column="3" > + <class>QToolButton</class> + <property stdset="1"> + <name>name</name> + <cstring>locationSelectBtn</cstring> + </property> + <property stdset="1"> + <name>maximumSize</name> + <size> + <width>20</width> + <height>30</height> + </size> + </property> + <property stdset="1"> + <name>text</name> + <string>...</string> + </property> + </widget> + <widget row="1" column="0" rowspan="1" colspan="4" > + <class>QListView</class> + <column> + <property> + <name>text</name> + <string>Locations</string> + </property> + <property> + <name>clickable</name> + <bool>true</bool> + </property> + <property> + <name>resizeable</name> + <bool>true</bool> + </property> + </column> + <property stdset="1"> + <name>name</name> + <cstring>locationList</cstring> + </property> + </widget> + <widget row="2" column="0" > <class>QPushButton</class> <property stdset="1"> <name>name</name> - <cstring>restoreButton</cstring> + <cstring>addLocationButton</cstring> </property> <property stdset="1"> <name>text</name> - <string>&Restore</string> + <string>Add</string> </property> </widget> - <widget row="0" column="0" > - <class>QLabel</class> + <widget row="2" column="1" > + <class>QPushButton</class> <property stdset="1"> <name>name</name> - <cstring>TextLabel1_2</cstring> + <cstring>removeLocationButton</cstring> </property> <property stdset="1"> <name>text</name> - <string>Select Source</string> + <string>Remove</string> </property> </widget> - <widget row="1" column="0" rowspan="1" colspan="2" > + <widget row="2" column="2" rowspan="1" colspan="2" > <class>QPushButton</class> <property stdset="1"> <name>name</name> - <cstring>updateList</cstring> + <cstring>saveLocationsButton</cstring> </property> <property stdset="1"> <name>text</name> - <string>Update Filelist</string> + <string>Save</string> </property> </widget> </grid> </widget> </widget> </vbox> </widget> </UI> |