2 files changed, 125 insertions, 83 deletions

diff --git a/noncore/settings/backup/backuprestore.cpp b/noncore/settings/backup/backuprestore.cpp
index 19e7cf9..7d0daf7 100644
--- a/noncore/settings/backup/backuprestore.cpp
+++ b/noncore/settings/backup/backuprestore.cpp
@@ -39,12 +39,13 @@ const QString tempFileName = "/tmp/backup.err";
 
 
 BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name,  WFlags fl)
-        : BackupAndRestoreBase(parent, name,  fl){
+        : BackupAndRestoreBase(parent, name,  fl)
+{
   this->showMaximized();
   backupList->header()->hide();
   restoreList->header()->hide();
   connect(backupButton, SIGNAL(clicked()),
-          this, SLOT(backupPressed()));
+            this, SLOT(backup()));
   connect(restoreButton, SIGNAL(clicked()),
           this, SLOT(restore()));
   connect(backupList, SIGNAL(clicked( QListViewItem * )),
@@ -54,62 +55,55 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name,  WFlags f
   connect(updateList, SIGNAL(clicked()),
           this, SLOT( fileListUpdate()));
 
-  applicationSettings = new QListViewItem(backupList, "Application Settings", "",
-                                          QDir::homeDirPath() + "/Settings/");
+    //add directorys for backing up
+    applicationSettings = new QListViewItem(backupList, "Application Settings", "", "Settings/");
   selectItem(applicationSettings);
-  applicationSettings = new QListViewItem(backupList, "Application Data", "",
-                                          QDir::homeDirPath() + "/Applications/");
+    applicationSettings = new QListViewItem(backupList, "Application Data", "", "Applications/");
   selectItem(applicationSettings);
-  documents= new QListViewItem(backupList, "Documents", "",
-                               QDir::homeDirPath() + "/Documents/");
+    documents= new QListViewItem(backupList, "Documents", "", "Documents/");
   selectItem(documents);
 
   scanForApplicationSettings();
 
-  Config config("BackupAndRestore");
-  config.setGroup("General");
-  int totalLocations = config.readNumEntry("totalLocations",0);
-
-//todo make less static here and use Storage class to get infos
-  if(totalLocations == 0){
-    QString home = QDir::homeDirPath();
-    home += "/Documents";
-    backupLocations.insert("Documents", home);
-    if (StorageInfo::hasCf()) {
+    backupLocations.insert( "Documents", QDir::homeDirPath() + "/Documents" );
+    if (StorageInfo::hasCf())
+    {
       backupLocations.insert("CF", "/mnt/cf");
     }
-    if (StorageInfo::hasSd || StorageInfo::hasMmc) {
+    if (StorageInfo::hasSd || StorageInfo::hasMmc)
+    {
       backupLocations.insert("SD", "/mnt/card");
     }
-  }
-  else{
-    for(int i = 0; i < totalLocations; i++){
-      backupLocations.insert(config.readEntry(QString("backupLocationName_%1").arg(i)),
-                             config.readEntry(QString("backupLocation_%1").arg(i)));
-    }
-  }
+
   QMap<QString, QString>::Iterator it;
-  for( it = backupLocations.begin(); it != backupLocations.end(); ++it ){
+    for( it = backupLocations.begin(); it != backupLocations.end(); ++it )
+    {
     storeToLocation->insertItem(it.key());
     restoreSource->insertItem(it.key());
   }
 
   // Read the list of items to ignore.
+    Config config("BackupAndRestore");
+
   QList<QString> dontBackupList;
   dontBackupList.setAutoDelete(true);
   config.setGroup("DontBackup");
   int total = config.readNumEntry("Total", 0);
-  for(int i = 0; i < total; i++){
+    for(int i = 0; i < total; i++)
+    {
     dontBackupList.append(new QString(config.readEntry(QString("%1").arg(i), "")));
   }
 
   QList<QListViewItem> list;
   getAllItems(backupList->firstChild(), list);
 
-  for(uint i = 0; i < list.count(); i++){
+    for(uint i = 0; i < list.count(); i++)
+    {
     QString text = list.at(i)->text(HEADER_NAME);
-    for(uint i2 = 0;  i2 < dontBackupList.count(); i2++){
-      if(*dontBackupList.at(i2) == text){
+        for(uint i2 = 0;  i2 < dontBackupList.count(); i2++)
+        {
+            if(*dontBackupList.at(i2) == text)
+            {
         selectItem(list.at(i));
         break;
       }
@@ -117,7 +111,8 @@ BackupAndRestore::BackupAndRestore( QWidget* parent, const char* name,  WFlags f
   }
 }
 
-BackupAndRestore::~BackupAndRestore(){
+BackupAndRestore::~BackupAndRestore()
+{
   QList<QListViewItem> list;
   getAllItems(backupList->firstChild(), list);
 
@@ -126,8 +121,10 @@ BackupAndRestore::~BackupAndRestore(){
   config.clearGroup();
 
   int count = 0;
-  for(uint i = 0; i < list.count(); i++){
-    if(list.at(i)->text(HEADER_BACKUP) == ""){
+    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++;
     }
@@ -139,8 +136,10 @@ BackupAndRestore::~BackupAndRestore(){
           QFile::remove( tempFileName );
 }
 
-QList<QListViewItem> BackupAndRestore::getAllItems(QListViewItem *item, QList<QListViewItem> &list){
-  while(item){
+QList<QListViewItem> BackupAndRestore::getAllItems(QListViewItem *item, QList<QListViewItem> &list)
+{
+    while(item)
+    {
     if(item->childCount() > 0)
       getAllItems(item->firstChild(), list);
     list.append(item);
@@ -154,29 +153,35 @@ QList<QListViewItem> BackupAndRestore::getAllItems(QListViewItem *item, QList<QL
  * and changing the icon to match
  * @param currentItem the item to swich the selection choice.
  */
-void BackupAndRestore::selectItem(QListViewItem *currentItem){
+void BackupAndRestore::selectItem(QListViewItem *currentItem)
+{
   if(!currentItem)
     return;
 
-  if(currentItem->text(HEADER_BACKUP) == "B"){
+    if(currentItem->text(HEADER_BACKUP) == "B")
+    {
     currentItem->setPixmap(HEADER_NAME, Resource::loadPixmap("backup/null"));
     currentItem->setText(HEADER_BACKUP, "");
   }
-  else{
+    else
+    {
     currentItem->setPixmap(HEADER_NAME, Resource::loadPixmap("backup/check"));
     currentItem->setText(HEADER_BACKUP, "B");
   }
 }
 
-void BackupAndRestore::scanForApplicationSettings(){
-  QDir d(applicationSettings->text(BACKUP_LOCATION));
+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()) ) {
-    // qDebug((d.path()+fi->fileName()).latin1());
-          if ( ( fi->fileName() != "." ) && ( fi->fileName() != ".." ) ) {
+    while ( (fi=it.current()) )
+    {
+        //qDebug((d.path()+"/"+fi->fileName()).latin1());
+        if ( ( fi->fileName() != "." ) && ( fi->fileName() != ".." ) )
+        {
                QListViewItem *newItem = new QListViewItem(applicationSettings, fi->fileName());
                selectItem(newItem);
           }
@@ -190,9 +195,11 @@ void BackupAndRestore::scanForApplicationSettings(){
  * Determine the file name to store the backup in.  Backup the file(s) using
  * tar and gzip  --best.  Report failure or success
  */
-void BackupAndRestore::backupPressed(){
+void BackupAndRestore::backup()
+{
   QString backupFiles;
-  if(getBackupFiles(backupFiles, NULL) == 0){
+    if(getBackupFiles(backupFiles, NULL) == 0)
+    {
     QMessageBox::critical(this, "Message",
                           "No items selected.",QString("Ok") );
     return;
@@ -209,7 +216,8 @@ void BackupAndRestore::backupPressed(){
 
   QString t = outputFile;
   int c = 1;
-  while(QFile::exists(outputFile + EXTENSION)){
+    while(QFile::exists(outputFile + EXTENSION))
+    {
     outputFile = t + QString("%1").arg(c);
     c++;
   }
@@ -220,38 +228,42 @@ void BackupAndRestore::backupPressed(){
   qDebug( "Storing file: %s", outputFile.latin1() );
   outputFile += EXTENSION;
 
-  qWarning( QString("(tar -c %1 | gzip > %2 ) 2> %3")
+    QString commandLine = QString( "(tar -C %1 -c %2 | gzip > %3 ) 2> %4" ).arg( QDir::homeDirPath() )
             .arg( backupFiles )
             .arg( outputFile.latin1() )
-            .arg( tempFileName.latin1() ) );
+                                                                           .arg( tempFileName.latin1() );
 
+    qDebug( commandLine );
 
-  int r = system( QString("(tar -c %1 | gzip > %2 ) 2> %3")
-                  .arg( backupFiles )
-                  .arg( outputFile.latin1() )
-                  .arg( tempFileName.latin1() ) );
+    int r = system( commandLine );
 
-   if(r != 0){
+    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" ) ) ) ){
+                                      + 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) ) {
+            if ( errorFile.open(IO_ReadOnly) )
+            {
                      QTextStream t( &errorFile );
                      QString s;
-                     while ( !t.eof() ) {        // until end of file...
+                while ( !t.eof() )
+                {        // until end of file...
                              s += t.readLine();       // line of text excluding '\n'
                      }
                      errorFile.close();
 
                      pErrDialog->m_textarea->setText( s );
-             }else{
+            }
+            else
+            {
                      pErrDialog->m_textarea->setText( "Unable to open File: /tmp/backup.er" );
              }
              pErrDialog->showMaximized();
@@ -262,7 +274,8 @@ void BackupAndRestore::backupPressed(){
      setCaption(tr("Backup and Restore.. Failed !!"));
      return;
    }
-   else{
+    else
+    {
      QMessageBox::information(this, tr( "Message" ), tr( "Backup Successfull." ), QString(tr( "Ok" ) ) );
 
    }
@@ -272,20 +285,25 @@ void BackupAndRestore::backupPressed(){
 /***
  * Get a list of all of the files to backup.
  */
-int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent){
+int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent)
+{
   QListViewItem * currentItem;
   QString currentHome;
   if(!parent)
     currentItem = backupList->firstChild();
-  else{
+    else
+    {
     currentItem = parent->firstChild();
     currentHome = parent->text(BACKUP_LOCATION);
   }
 
   uint count = 0;
-  while( currentItem != 0 ){
-    if(currentItem->text(HEADER_BACKUP) == "B" ){
-      if(currentItem->childCount() == 0 ){
+    while( currentItem != 0 )
+    {
+        if(currentItem->text(HEADER_BACKUP) == "B" )
+        {
+            if(currentItem->childCount() == 0 )
+            {
         if(parent == NULL)
     backupFiles += currentItem->text(BACKUP_LOCATION);
   else
@@ -293,7 +311,8 @@ int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent
   backupFiles += " ";
   count++;
       }
-      else{
+            else
+            {
         count += getBackupFiles(backupFiles, currentItem);
       }
     }
@@ -302,7 +321,8 @@ int BackupAndRestore::getBackupFiles(QString &backupFiles, QListViewItem *parent
   return count;
 }
 
-void BackupAndRestore::sourceDirChanged(int selection){
+void BackupAndRestore::sourceDirChanged(int selection)
+{
   restoreList->clear();
   rescanFolder(backupLocations[restoreSource->text(selection)]);
 }
@@ -319,7 +339,8 @@ void BackupAndRestore::fileListUpdate()
  * but will not follow symlinks.
  * @param directory - the directory to look in.
  */
-void BackupAndRestore::rescanFolder(QString directory){
+void BackupAndRestore::rescanFolder(QString directory)
+{
   //qDebug(QString("rescanFolder: ") + directory.latin1());
   QDir d(directory);
   if(!d.exists())
@@ -329,14 +350,18 @@ void BackupAndRestore::rescanFolder(QString directory){
   const QFileInfoList *list = d.entryInfoList();
   QFileInfoListIterator it( *list );
   QFileInfo *file;
-  while ( (file=it.current()) ) {  // for each 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() != ".") {
+        if(file->isDir())
+        {
+            if(file->fileName() != ".." && file->fileName() != ".")
+            {
   rescanFolder(directory + "/" + file->fileName());
       }
     }
-    else{
+        else
+        {
       // If it is a backup file add to list.
       if(file->fileName().contains(EXTENSION))
         (void)new QListViewItem(restoreList, file->fileName());
@@ -349,9 +374,11 @@ void BackupAndRestore::rescanFolder(QString directory){
  * Restore a backup file.
  * Report errors or success
  */
-void BackupAndRestore::restore(){
+void BackupAndRestore::restore()
+{
   QListViewItem *restoreItem = restoreList->currentItem();
-  if(!restoreItem){
+    if(!restoreItem)
+    {
     QMessageBox::critical(this, tr( "Message" ),
                           tr( "Please select something to restore." ),QString( tr( "Ok") ) );
     return;
@@ -362,27 +389,40 @@ void BackupAndRestore::restore(){
 
   restoreFile += "/" + restoreItem->text(0);
 
-  int r = system(QString("tar -C / -zxf %1 2> %3")
+    qDebug( restoreFile );
+
+    QString commandLine = QString( "tar -C %1 -zxf %2 2> %3" ).arg( QDir::homeDirPath() )
                  .arg( restoreFile.latin1() )
-                 .arg( tempFileName.latin1() ) );
-  if(r != 0){
+                                                              .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" ) ) ) ) {
+                                      + 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) ) {
+            if ( errorFile.open(IO_ReadOnly) )
+            {
                     QTextStream t( &errorFile );
                     QString s;
-                    while ( !t.eof() ) {        // until end of file...
+                while ( !t.eof() )
+                {        // until end of file...
                             s += t.readLine();       // line of text excluding '\n'
                     }
                     errorFile.close();
 
                     pErrDialog->m_textarea->setText( s );
-            }else{
+            }
+            else
+            {
                     pErrDialog->m_textarea->setText( tr( "Unable to open File: %1" ).arg( "/tmp/backup.er" ) );
             }
             pErrDialog->showMaximized();
@@ -396,7 +436,8 @@ void BackupAndRestore::restore(){
 
     }
   }
-  else{
+    else
+    {
     QMessageBox::critical(this, tr( "Message" ),
                           tr( "Restore Successfull." ), QString( tr( "Ok") ) );
   }
diff --git a/noncore/settings/backup/backuprestore.h b/noncore/settings/backup/backuprestore.h
index 4bdc758..fdc2bf2 100644
--- a/noncore/settings/backup/backuprestore.h
+++ b/noncore/settings/backup/backuprestore.h
@@ -8,7 +8,8 @@
 
 class QListViewItem;
 
-class BackupAndRestore : public BackupAndRestoreBase {
+class BackupAndRestore : public BackupAndRestoreBase
+{
 
 Q_OBJECT
 
@@ -20,7 +21,7 @@ public:
   static QString appName() { return QString::fromLatin1("backup"); }
 
 private slots:
-  void backupPressed();
+    void backup();
   void restore();
   void selectItem(QListViewItem *currentItem);
   void sourceDirChanged(int);