fix several severe file handling bugs

1 files changed, 188 insertions, 174 deletions

diff --git a/noncore/apps/advancedfm/advancedfm.cpp b/noncore/apps/advancedfm/advancedfm.cpp
index 818a281..b169a79 100644
--- a/noncore/apps/advancedfm/advancedfm.cpp
+++ b/noncore/apps/advancedfm/advancedfm.cpp
@@ -1005,2 +1005,3 @@ QStringList AdvancedFm::getPath() {
         strList <<  it.current()->text(0);
+        qDebug(it.current()->text(0));
       }
@@ -1014,2 +1015,3 @@ QStringList AdvancedFm::getPath() {
         strList << it.current()->text(0);
+        qDebug(it.current()->text(0));
       }
@@ -1101,2 +1103,3 @@ void AdvancedFm::copy()
 {
+  qApp->processEvents();
   QStringList curFileList = getPath();
@@ -1108,3 +1111,7 @@ void AdvancedFm::copy()
         QString destFile = currentRemoteDir.canonicalPath()+"/"+(*it);
+        qDebug("Destination file is "+destFile);
+
         curFile = currentDir.canonicalPath()+"/"+(*it);
+        qDebug("CurrentFile file is " + curFile);
+
         QFile f(destFile);
@@ -1134,3 +1141,5 @@ void AdvancedFm::copy()
         QString destFile = currentDir.canonicalPath()+"/"+(*it);
+        qDebug("Destination file is "+destFile);
         curFile = currentRemoteDir.canonicalPath()+"/"+(*it);
+        qDebug("CurrentFile file is " + curFile);
 
@@ -1158,2 +1167,3 @@ void AdvancedFm::copy()
     }
+
   }
@@ -1161,79 +1171,85 @@ void AdvancedFm::copy()
 
-void AdvancedFm::copyAs()
-{
+void AdvancedFm::copyAs() {
+  qApp->processEvents();
+
   QStringList curFileList = getPath();
-  if( curFileList.count() > 0) {
-    QString curFile;
-    InputDialog *fileDlg;
-    fileDlg = new InputDialog(this,tr("Copy As"),TRUE, 0);
+  QString curFile;
+  InputDialog *fileDlg;
+  if (TabWidget->currentPageIndex() == 0) {
+    qDebug("tab 1");
+    for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+      QString destFile;
+      curFile = currentDir.canonicalPath()+"/"+(*it);
+      fileDlg = new InputDialog( this,tr("Copy "+curFile+" As"), TRUE, 0);
 
-    if (TabWidget->currentPageIndex() == 0) {
-      for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-        QString destFile;
-        curFile = currentDir.canonicalPath()+"/"+(*it);
-        fileDlg->setInputText((const QString &) destFile );
-        fileDlg->exec();
-        if( fileDlg->result() == 1 ) {
-          QString  filename = fileDlg->LineEdit1->text();
-          destFile = currentRemoteDir.canonicalPath()+"/"+(*it);
-
-          QFile f(destFile);
-          if( f.exists()) {
-            switch (QMessageBox::warning(this,tr("Delete"),
-                                         destFile+tr(" already exists\nDo you really want to delete it?"),
-                                         tr("Yes"),tr("No"),0,0,1) ) {
-            case 0: 
-              f.remove();
-              break;
-            case 1:
-              return;
-              break;
-            };
-          }
-          if(!copyFile(destFile, curFile) ) {
-            QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
-            qWarning("nothin doing");
-          }
+      fileDlg->setInputText((const QString &) destFile );
+      fileDlg->exec();
+
+      if( fileDlg->result() == 1 ) {
+        QString  filename = fileDlg->LineEdit1->text();
+        destFile = currentRemoteDir.canonicalPath()+"/"+filename;
+
+        QFile f(destFile);
+        if( f.exists()) {
+          switch (QMessageBox::warning(this,tr("Delete"),
+                                       destFile+tr(" already exists\nDo you really want to delete it?"),
+                                       tr("Yes"),tr("No"),0,0,1) ) {
+          case 0: 
+            f.remove();
+            break;
+          case 1:
+            return;
+            break;
+          };
+        }
+        if(!copyFile(destFile, curFile) ) {
+          QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
+          qWarning("nothin doing");
         }
       }
-      populateRemoteView();
-      TabWidget->setCurrentPage(1);
-    } else {
-      if (TabWidget->currentPageIndex() == 0) {
-        for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+      delete fileDlg;
 
-          curFile = currentDir.canonicalPath()+"/"+(*it);
-          QString destFile;
-          fileDlg->setInputText((const QString &) destFile);
-          fileDlg->exec();
-          if( fileDlg->result() == 1 ) {
-            QString  filename = fileDlg->LineEdit1->text();
-            destFile = currentDir.canonicalPath()+"/"+(*it);
-
-            QFile f(destFile);
-            if( f.exists()) {
-              switch ( QMessageBox::warning(this,tr("Delete"),
-                                            destFile+tr(" already exists\nDo you really want to delete it?"),
-                                            tr("Yes"),tr("No"),0,0,1) ) {
-              case 0: 
-                f.remove();
-                break;
-              case 1:
-                return;
-                break;
-              };
-            }
-            if(!copyFile(destFile, curFile) ) {
-              QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
-              qWarning("nothin doing");
-            }
-                        
-          }
+    }
+    populateRemoteView();
+    TabWidget->setCurrentPage(1);
+
+  } else {
+    for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+
+      curFile = currentRemoteDir.canonicalPath()+"/"+(*it);
+      fileDlg = new InputDialog( this,tr("Copy "+curFile+" As"), TRUE, 0);
+
+      QString destFile;
+      fileDlg->setInputText((const QString &) destFile);
+      fileDlg->exec();
+
+      if( fileDlg->result() == 1 ) {
+        QString  filename = fileDlg->LineEdit1->text();
+        destFile = currentDir.canonicalPath()+"/"+filename;
+
+        QFile f( destFile);
+        if( f.exists()) {
+          switch ( QMessageBox::warning(this,tr("Delete"),
+                                        destFile+tr(" already exists\nDo you really want to delete it?"),
+                                        tr("Yes"),tr("No"),0,0,1) ) {
+          case 0: 
+            f.remove();
+            break;
+          case 1:
+            return;
+            break;
+          };
         }
-        populateLocalView();
-        TabWidget->setCurrentPage(0);
+        if(!copyFile(destFile, curFile) ) {
+          QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
+          qWarning("nothin doing");
+        }
+                        
       }
+      delete fileDlg;
+
     }
+    populateLocalView();
+    TabWidget->setCurrentPage(0);
   }
-
 }
@@ -1241,83 +1257,85 @@ void AdvancedFm::copyAs()
 void AdvancedFm::copySameDir() {
+  qApp->processEvents();
   QStringList curFileList = getPath();
-  if( curFileList.count() > 0) {
-    QString curFile;
-    InputDialog *fileDlg;
+  QString curFile;
+  InputDialog *fileDlg;
 
-    if (TabWidget->currentPageIndex() == 0) {
-      for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-        QString destFile;
-        curFile = currentDir.canonicalPath()+"/"+(*it);
-        fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0);
-        fileDlg->setInputText((const QString &) destFile );
-        fileDlg->exec();
-        if( fileDlg->result() == 1 ) {
-          QString filename = fileDlg->LineEdit1->text();
-          destFile = currentDir.canonicalPath()+"/"+filename;
-
-          QFile f(destFile);
-          if( f.exists()) {
-            switch (QMessageBox::warning(this,tr("Delete"),
-                                         destFile+tr(" already exists\nDo you really want to delete it?"),
-                                         tr("Yes"),tr("No"),0,0,1) ) {
-            case 0:
-              qDebug("");
-              f.remove();
-              break;
-            case 1:
-              return;
-              break;
-            };
-          }
-          if(!copyFile(destFile, curFile) ) {
-            QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
-            qWarning("nothin doing");
-          }
-                    
-          qDebug("copy "+curFile+" as "+destFile);
+  if (TabWidget->currentPageIndex() == 0) {
+
+    for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+
+      QString destFile;
+      curFile = currentDir.canonicalPath()+"/"+(*it);
+
+      fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0);
+      fileDlg->setInputText((const QString &) destFile );
+      fileDlg->exec();
+
+      if( fileDlg->result() == 1 ) {
+
+        QString filename = fileDlg->LineEdit1->text();
+        destFile = currentDir.canonicalPath()+"/"+filename;
+
+        QFile f(destFile);
+        if( f.exists()) {
+          switch (QMessageBox::warning(this,tr("Delete"),
+                                       destFile+tr(" already exists\nDo you really want to delete it?"),
+                                       tr("Yes"),tr("No"),0,0,1) ) {
+          case 0:
+            qDebug("");
+            f.remove();
+            break;
+          case 1:
+            return;
+            break;
+          };
         }
-        delete fileDlg;
+        if(!copyFile(destFile, curFile) ) {
+          QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
+          qWarning("nothin doing");
+        }
+                    
+        qDebug("copy "+curFile+" as "+destFile);
       }
-      populateRemoteView();
-      TabWidget->setCurrentPage(1);
-    } else {
-      if (TabWidget->currentPageIndex() == 0) {
-        for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+      delete fileDlg;
+    }
+    populateLocalView();
 
-          curFile = currentRemoteDir.canonicalPath()+"/"+(*it);
-          fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0);
-          QString destFile;
-          fileDlg->setInputText((const QString &) destFile);
-          fileDlg->exec();
-          if( fileDlg->result() == 1 ) {
-            QString  filename = fileDlg->LineEdit1->text();
-            destFile = currentDir.canonicalPath()+"/"+filename;
-
-            QFile f(destFile);
-            if( f.exists()) {
-              switch ( QMessageBox::warning(this,tr("Delete"),
-                                            destFile+tr(" already exists\nDo you really want to delete it?"),
-                                            tr("Yes"),tr("No"),0,0,1) ) {
-              case 0: 
-                f.remove();
-                break;
-              case 1:
-                return;
-                break;
-              };
-            }
-            if(!copyFile(destFile, curFile) ) {
-              QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
-              qWarning("nothin doing");
-            }
-            qDebug("copy "+curFile+" as "+destFile);
-          }
-          delete fileDlg;
+  } else {
+    for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+
+      curFile = currentRemoteDir.canonicalPath()+"/"+(*it);
+
+      fileDlg = new InputDialog(this,tr("Copy ")+curFile+tr(" As"),TRUE, 0);
+      QString destFile;
+      fileDlg->setInputText((const QString &) destFile);
+      fileDlg->exec();
+      if( fileDlg->result() == 1 ) {
+        QString  filename = fileDlg->LineEdit1->text();
+
+        destFile = currentRemoteDir.canonicalPath()+"/"+filename;
+
+        QFile f(destFile);
+        if( f.exists()) {
+          switch ( QMessageBox::warning(this,tr("Delete"),
+                                        destFile+tr(" already exists\nDo you really want to delete it?"),
+                                        tr("Yes"),tr("No"),0,0,1) ) {
+          case 0: 
+            f.remove();
+            break;
+          case 1:
+            return;
+            break;
+          };
         }
-        populateLocalView();
-        TabWidget->setCurrentPage(0);
+        if(!copyFile(destFile, curFile) ) {
+          QMessageBox::message("AdvancedFm",tr("Could not copy\n")+curFile +tr("to\n")+destFile);
+          qWarning("nothin doing");
+        }
+        qDebug("copy "+curFile+" as "+destFile);
       }
+      delete fileDlg;
     }
+    populateRemoteView();
   }
-
 }
@@ -1325,2 +1343,3 @@ void AdvancedFm::copySameDir() {
 void AdvancedFm::move() {
+  qApp->processEvents();
 
@@ -1329,3 +1348,2 @@ void AdvancedFm::move() {
     QString curFile;
-    //    qDebug(curFile);
     QString destFile;
@@ -1333,4 +1351,7 @@ void AdvancedFm::move() {
     if (TabWidget->currentPageIndex() == 0) {
+
       for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
+
         QString destFile =  currentRemoteDir.canonicalPath();
+
         if(destFile.right(1).find("/",0,TRUE) == -1)
@@ -1339,19 +1360,13 @@ void AdvancedFm::move() {
         curFile = currentDir.canonicalPath();
+
         qDebug("Destination file is "+destFile);
+
         if(curFile.right(1).find("/",0,TRUE) == -1)
           curFile +="/";
+
         curFile+=(*it);
+        qDebug("CurrentFile file is " + curFile);
 
-        QFile f(destFile);
+        QFile f( curFile);
         if( f.exists()) {
-          switch (QMessageBox::warning(this,tr("Delete"),
-                                       destFile+tr(" already exists\nDo you really want to delete it?"),
-                                       tr("Yes"),tr("No"),0,0,1) ) {
-          case 0:
-            f.remove();
-            break;
-          case 1:
-            return;
-            break;
-          };
           if(!copyFile( destFile, curFile) ) {
@@ -1359,15 +1374,24 @@ void AdvancedFm::move() {
             return;
-          }
-          QFile::remove(curFile);
+          } else
+            QFile::remove(curFile);
         }
       }
+
       TabWidget->setCurrentPage(1);
-    } else {
+
+    } else { //view 2
+
       for ( QStringList::Iterator it = curFileList.begin(); it != curFileList.end(); ++it ) {
-        QString destFile = currentRemoteDir.canonicalPath();
+
+        QString destFile = currentDir.canonicalPath();
+
         if(destFile.right(1).find("/",0,TRUE) == -1)
           destFile+="/";
+
         destFile +=(*it);
+
         qDebug("Destination file is "+destFile);
-        curFile = currentDir.canonicalPath();
+
+        curFile = currentRemoteDir.canonicalPath();
+
         if(curFile.right(1).find("/",0,TRUE) == -1)
@@ -1375,21 +1399,12 @@ void AdvancedFm::move() {
         curFile+=(*it);
+        qDebug("CurrentFile file is " + curFile);
 
-        QFile f(destFile);
+        QFile f( curFile);
         if( f.exists()) {
-          switch (QMessageBox::warning(this,tr("Delete"),
-                                       destFile+tr(" already exists\nDo you really want to delete it?"),
-                                       tr("Yes"),tr("No"),0,0,1) ) {
-          case 0:
-            f.remove();
-            break;
-          case 1:
-            return;
-            break;
-          };
-          if(!copyFile(destFile, curFile) ) {
-            QMessageBox::message(tr("Note"),tr("Could not move\n")+curFile);
+          if(!copyFile( destFile, curFile) ) {
+            QMessageBox::message(tr("Note"),tr("Could not move\n") + curFile);
             return;
-          }
+          } else
+            QFile::remove( curFile);
         }
-        QFile::remove(curFile);
         TabWidget->setCurrentPage(0);
@@ -1402,4 +1417,3 @@ void AdvancedFm::move() {
 
-bool AdvancedFm::copyFile( const QString & dest, const QString & src )
-{
+bool AdvancedFm::copyFile( const QString & dest, const QString & src ) {
   char bf[ 50000 ];