Minor fix for renaming

Author: starkgate

main.cpp

@@ -307,18 +307,21 @@ void MainWindow::run_copy_thread(MainWindow *w) {
     while(!w->copy_queue.isEmpty()) {
         file = w->copy_queue.dequeue();
 
+        QFileInfo new_file = QFileInfo(file.second);
 
-        if(QFile(file.second).exists()) {
-            qDebug("Destination already exists, renaming");
-            int i = 1;
-            while(QFile(file.second + "_" + i).exists()) { i++; }
+        if(new_file.exists()) {
+            qDebug("File exists, renaming...");
+            QString new_file_name = QDir(new_file.absolutePath()).filePath(new_file.baseName());
 
-            qDebug("Copying %s to %s", file.first.toStdString().c_str(), (file.second + "_" + i).toStdString().c_str());
-            QFile::copy(file.first, file.second + "_" + i);
-        } else {
-            qDebug("Copying %s to %s", file.first.toStdString().c_str(), file.second.toStdString().c_str());
-            QFile::copy(file.first, file.second);
+            int i = 1;
+            while(new_file.exists()) {
+                new_file = QFileInfo(QString("%1_%2.%3").arg(new_file_name, QString::number(i), new_file.suffix()));
+                i++;
+            }
         }
+
+        qDebug("Copying %s to %s", file.first.toStdString().c_str(), new_file.filePath().toStdString().c_str());
+        QFile::copy(file.first, new_file.filePath());
     }
     w->ui->button_go->setEnabled(true);
 }

version.json

@@ -1,4 +1,4 @@
 {
     "database-version": 10,
-    "main-version": 7
+    "main-version": 8
 }