Delambda-ify SettingsFragment + add AssetManager class

Author: timschneeb

src/MainWindow.cpp

@@ -13,6 +13,7 @@
 #include "config/ConfigContainer.h"
 #include "config/ConfigIO.h"
 #include "config/DspConfig.h"
+#include "data/AssetManager.h"
 #include "data/EelParser.h"
 #include "data/model/VdcDatabaseModel.h"
 #include "data/PresetManager.h"
@@ -233,7 +234,6 @@ MainWindow::MainWindow(bool     statupInTray,
         DspConfig::instance().load();
 
         connect(_settingsFragment->fragment(), &SettingsFragment::launchSetupWizard,       this, &MainWindow::launchFirstRunSetup);
-        connect(_settingsFragment->fragment(), &SettingsFragment::requestEelScriptExtract, this, &MainWindow::extractDefaultEelScripts);
         connect(_settingsFragment->fragment(), &SettingsFragment::reopenSettings, _settingsFragment, &FragmentHost<SettingsFragment*>::slideOutIn);
         connect(_styleHelper, &StyleHelper::iconColorChanged, _settingsFragment->fragment(), &SettingsFragment::updateButtonStyle);
     }
@@ -298,7 +298,7 @@ MainWindow::MainWindow(bool     statupInTray,
     {
         if (AppConfig::instance().get<bool>(AppConfig::LiveprogAutoExtract))
         {
-            extractDefaultEelScripts(false, false);
+            AssetManager::instance().extractAll();
         }
     }
 
@@ -1093,63 +1093,6 @@ void MainWindow::onConvolverWaveformEdit()
     }
 }
 
-// Liveprog
-int MainWindow::extractDefaultEelScripts(bool allowOverride,
-                                         bool user)
-{
-    QDirIterator it(":/assets/liveprog", QDirIterator::NoIteratorFlags);
-    int          i = 0;
-
-    while (it.hasNext())
-    {
-        QFile   eel(it.next());
-        QString name    = QFileInfo(eel).fileName();
-        QString newpath = AppConfig::instance().getLiveprogPath() + "/" + name;
-
-        if (QFile(newpath).exists() && !allowOverride)
-        {
-            continue;
-        }
-
-        if(!QDir(AppConfig::instance().getLiveprogPath()).exists())
-        {
-            QDir().mkpath(AppConfig::instance().getLiveprogPath());
-        }
-
-        QFile file(newpath);
-
-        if (eel.open(QIODevice::ReadOnly | QIODevice::Text) &&
-                file.open(QIODevice::WriteOnly | QIODevice::Text))
-        {
-            QTextStream stream(&file);
-            stream << eel.readAll();
-            file.close();
-            eel.close();
-        }
-
-        i++;
-    }
-
-    if (i > 0)
-    {
-        Log::debug(QString("MainWindow::extractDefaultEelScripts: %1 default eel files extracted").arg(i));
-    }
-
-    if (user)
-    {
-        if (i > 0)
-        {
-            QMessageBox::information(this, "Extract scripts", QString("%1 script(s) have been restored").arg(i));
-        }
-        else
-        {
-            QMessageBox::information(this, "Extract scripts", QString("No scripts have been extracted"));
-        }
-    }
-
-    return i;
-}
-
 // EQ
 void MainWindow::setEq(const QVector<double> &data)
 {

src/MainWindow.h

@@ -70,7 +70,6 @@ public slots:
     void onResetRequested();
     void onRelinkRequested();
     void raiseWindow();
-    int  extractDefaultEelScripts(bool allowOverride, bool user);
     void launchFirstRunSetup();
 
 private slots:

src/config/AppConfig.h

@@ -126,13 +126,17 @@ class AppConfig :
     bool isAppBlocked(const QString& name) const;
 
 #define DEFINE_USER_PATH(name,key) \
-    QString get##name##Path() const \
+    QString get##name##Path(QString subdir = "") const \
     { \
         QString current = chopFirstLastChar(get<QString>(key)); \
         if (!QDir(current).exists()) \
         { \
             QDir().mkpath(current); \
         } \
+        if(!subdir.isEmpty()) \
+        { \
+            return QString("%1/%2").arg(current).arg(subdir); \
+        } \
         return current; \
     } \
     void set##name##Path(const QString& newVal) \

src/data/AssetManager.cpp

@@ -0,0 +1,78 @@
+#include "AssetManager.h"
+
+#include "config/AppConfig.h"
+
+#include <QDirIterator>
+#include <QTextStream>
+
+AssetManager::AssetManager(QObject *parent)
+    : QObject{parent}
+{
+
+}
+
+int AssetManager::extractGroup(AssetType type, bool allowOverride)
+{
+    QString internalPath;
+    QString externalPath;
+    switch(type)
+    {
+    case AssetManager::AT_IR:
+        internalPath = ":/assets/irs";
+        externalPath = AppConfig::instance().getIrsPath();
+        break;
+    case AssetManager::AT_VDC:
+        internalPath = ":/assets/vdc";
+        externalPath = AppConfig::instance().getVdcPath();
+        break;
+    case AssetManager::AT_LIVEPROG:
+        internalPath = ":/assets/liveprog";
+        externalPath = AppConfig::instance().getLiveprogPath();
+        break;
+    }
+
+    if(!QDir(externalPath).exists())
+    {
+        QDir().mkpath(externalPath);
+    }
+
+    QDirIterator it(internalPath, QDirIterator::NoIteratorFlags);
+    int i = 0;
+    while (it.hasNext())
+    {
+        QFile sourceFile(it.next());
+        QFile targetFile(externalPath + QDir::separator() + QFileInfo(sourceFile).fileName());
+
+        if (targetFile.exists() && !allowOverride)
+        {
+            continue;
+        }
+
+        if (sourceFile.open(QIODevice::ReadOnly | QIODevice::Text) &&
+                targetFile.open(QIODevice::WriteOnly | QIODevice::Text))
+        {
+            QTextStream stream(&targetFile);
+            stream << targetFile.readAll();
+            targetFile.close();
+        }
+
+        i++;
+    }
+
+    if (i > 0)
+    {
+        Log::debug(QString("AssetManager::extractGroup: %1 assets extracted (type %2)").arg(i).arg(type));
+    }
+
+    return i;
+}
+
+int AssetManager::extractAll(bool force)
+{
+    int i = 0;
+    i += extractGroup(AT_IR, true);
+    i += extractGroup(AT_VDC, true);
+    i += extractGroup(AT_LIVEPROG, force ? true : false);
+    return i;
+}
+

src/data/AssetManager.h

@@ -0,0 +1,33 @@
+#ifndef ASSETMANAGER_H
+#define ASSETMANAGER_H
+
+#include <QObject>
+
+class AssetManager : public QObject
+{
+    Q_OBJECT
+public:
+    static AssetManager &instance()
+    {
+        static AssetManager _instance;
+        return _instance;
+    }
+
+    enum AssetType
+    {
+        AT_IR,
+        AT_VDC,
+        AT_LIVEPROG
+    };
+
+    AssetManager(AssetManager const &) = delete;
+    AssetManager(QObject* parent = nullptr);
+
+    int extractGroup(AssetType type, bool allowOverride);
+
+public slots:
+    int extractAll(bool force = false);
+
+};
+
+#endif // ASSETMANAGER_H