refactor(toxsave, profileimporter): Removed code duplication

src/persistence/toxsave.cpp

@@ -21,6 +21,7 @@
 #include "src/widget/gui.h"
 #include "src/core/core.h"
 #include "src/persistence/settings.h"
+#include "src/widget/tool/profileimporter.h"
 #include <QCoreApplication>
 #include <QFileInfo>
 
@@ -52,35 +53,6 @@ bool handleToxSave(const QString& path)
     while (!core->isReady())
         qApp->processEvents();
 
-    QFileInfo info(path);
+    ProfileImporter importer(GUI::getMainWidget());
-    if (!info.exists())
+    return importer.importProfile(path);
-        return false;
-
-    QString profile = info.completeBaseName();
-
-    if (info.suffix() != "tox")
-    {
-        GUI::showWarning(QObject::tr("Ignoring non-Tox file", "popup title"),
-                         QObject::tr("Warning: you've chosen a file that is not a Tox save file; ignoring.", "popup text"));
-        return false;
-    }
-
-    QString profilePath = Settings::getInstance().getSettingsDirPath() + profile + Core::TOX_EXT;
-
-    if (QFileInfo(profilePath).exists())
-    {
-        QString title = QObject::tr("Profile already exists", "import confirm title");
-        QString message = QObject::tr("A profile named \"%1\" already exists. Do you want to erase it?", "import confirm text").arg(profile);
-        bool erase = GUI::askQuestion(title, message);
-        if (!erase)
-            return false;
-
-        QFile(profilePath).remove();
-    }
-
-    QFile::copy(path, profilePath);
-    // no good way to update the ui from here... maybe we need a Widget:refreshUi() function...
-    // such a thing would simplify other code as well I believe
-    GUI::showInfo(QObject::tr("Profile imported"), QObject::tr("%1.tox was successfully imported").arg(profile));
-    return true;
 }

src/widget/tool/profileimporter.cpp

@@ -42,18 +42,29 @@ bool ProfileImporter::importProfile()
                                                 tr("Tox save file (*.tox)", "import dialog filter"),
                                                 0,
                                                 QFileDialog::DontUseNativeDialog);
+
+    importProfile(path);
+}
+
+bool ProfileImporter::importProfile(const QString &path)
+{
     if (path.isEmpty())
          return false;
 
     QFileInfo info(path);
+    if (!info.exists())
+    {
+        GUI::showWarning(tr("File doesn't exist"),
+                         tr("Profile doesn't exist"));
+        return false;
+    }
+
     QString profile = info.completeBaseName();
 
     if (info.suffix() != "tox")
     {
-        QMessageBox::warning(this,
+        GUI::showWarning(tr("Ignoring non-Tox file", "popup title"),
-                             tr("Ignoring non-Tox file", "popup title"),
+                         tr("Warning: You have chosen a file that is not a Tox save file; ignoring.", "popup text"));
-                             tr("Warning: You have chosen a file that is not a Tox save file; ignoring.", "popup text"),
-                             QMessageBox::Ok);
         return false; //ingore importing non-tox file
     }
 
@@ -61,8 +72,8 @@ bool ProfileImporter::importProfile()
 
     if (QFileInfo(profilePath).exists())
     {
-        QString title = QObject::tr("Profile already exists", "import confirm title");
+        QString title = tr("Profile already exists", "import confirm title");
-        QString message = QObject::tr("A profile named \"%1\" already exists. Do you want to erase it?", "import confirm text").arg(profile);
+        QString message = tr("A profile named \"%1\" already exists. Do you want to erase it?", "import confirm text").arg(profile);
         bool erase = GUI::askQuestion(title, message);
 
         if (!erase)
@@ -72,5 +83,9 @@ bool ProfileImporter::importProfile()
     }
 
     QFile::copy(path, profilePath);
+    // no good way to update the ui from here... maybe we need a Widget:refreshUi() function...
+    // such a thing would simplify other code as well I believe
+    GUI::showInfo(tr("Profile imported"),
+                  tr("%1.tox was successfully imported").arg(profile));
     return true; //import successfull
 }

src/widget/tool/profileimporter.h

@@ -28,6 +28,7 @@ class ProfileImporter : public QWidget
 
 public:
     explicit ProfileImporter(QWidget *parent = 0);
+    bool importProfile(const QString &path);
     bool importProfile();
 
 signals: