Moved Settings and FileSystem classes impl to .cpp files

src/Legacy/Legacy.pro

@@ -38,7 +38,9 @@ SOURCES += \
     models/patch/textspatch.cpp \
     models/patch/graphicspatch.cpp \
     models/patchlist.cpp \
-    legacyapplication.cpp
+    legacyapplication.cpp \
+    models/settings.cpp \
+    models/filesystem.cpp
 
 HEADERS += \
     models/downloader.h \

src/Legacy/models/filesystem.cpp

@@ -0,0 +1,98 @@
+#ifndef FILESYSTEM_H
+#define FILESYSTEM_H
+
+#include <QObject>
+#include <QFile>
+#include <QDir>
+#include <QFileInfo>
+#include <QCryptographicHash>
+#include <QDebug>
+#include <QSettings>
+
+#include "filesystem.h"
+
+namespace FileSystem {
+    bool fileExists(QString path) {
+        QFileInfo check_file(path);
+        return check_file.exists() && check_file.isFile();
+    }
+
+    bool folderExists(QString path) {
+        return QDir(path).exists();
+    }
+
+    bool createFilePath(QString file_path) { // Creates all necessary directories for file
+        QDir dir;
+        return dir.mkpath(QFileInfo(file_path).absoluteDir().absolutePath());
+    }
+
+    QString fileHash(const QString &fileName, QCryptographicHash::Algorithm hashAlgorithm = QCryptographicHash::Md5) {
+        QFile file(fileName);
+        if (file.open(QIODevice::ReadOnly)) {
+            QCryptographicHash hash(hashAlgorithm);
+            hash.addData(&file);
+            QByteArray hashData = hash.result();
+            return hashData.toHex();
+        }
+        return QByteArray();
+    }
+
+
+    void clearFolder(QDir &dir) {
+        //Получаем список файлов
+        QStringList lstFiles = dir.entryList(QDir::Files);
+
+        //Удаляем файлы
+        foreach (QString entry, lstFiles){
+            QString entryAbsPath = dir.absolutePath() + "/" + entry;
+            //QFile::setPermissions(entryAbsPath, QFile::ReadOwner | QFile::WriteOwner);
+            qDebug() << dir.absolutePath();
+            QFile::remove(entryAbsPath);
+        }
+    }
+
+
+    QStringList recognizeRegistryLotroPath() {
+        QStringList paths;
+
+        #ifdef _WIN32
+            // Windows 8, 10
+            QSettings n("HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\12bbe590-c890-11d9-9669-0800200c9a66_is1", QSettings::NativeFormat);
+            foreach (QString key, n.allKeys()) {
+                qDebug() << key;
+                if(key.contains("InstallLocation") || key.contains("installlocation")){
+                    QString folder = n.value(key).toString()
+                            .replace("\\", "/")
+                            .replace("/TurbineLauncher.exe", "")
+                            .replace("/LotroLauncher.exe", "")
+                            .replace("\"", "");
+
+                    if(fileExists(folder + "/LotroLauncher.exe"))
+                        paths.append(folder);
+                }
+            }
+
+
+            // Windows 7
+            QSettings m("HKEY_CLASSES_ROOT\\Local Settings\\Software\\Microsoft\\Windows\\Shell\\MuiCache", QSettings::NativeFormat);
+            foreach (QString key, m.allKeys()) {
+              if((key.contains("TurbineLauncher.exe") || key.contains("LotroLauncher.exe")) && fileExists(key)){
+                  QString folder = n.value(key).toString()
+                          .replace("\\", "/")
+                          .replace("/TurbineLauncher.exe", "")
+                          .replace("/LotroLauncher.exe", "")
+                          .replace("\"", "");
+
+                  if(fileExists(folder + "/LotroLauncher.exe"))
+                      paths.append(folder);
+              }
+            }
+        #else
+            // Реализация под Linux
+        #endif
+
+        return paths;
+    }
+}
+
+#endif // FILESYSTEM_H

src/Legacy/models/filesystem.h

@@ -10,87 +10,17 @@
 #include <QSettings>
 
 namespace FileSystem {
-    static bool fileExists(QString path) {
-        QFileInfo check_file(path);
-        return check_file.exists() && check_file.isFile();
-    }
+    extern bool fileExists(QString path);
 
-    static bool folderExists(QString path) {
-        return QDir(path).exists();
-    }
+    extern bool folderExists(QString path);
 
-    static bool createFilePath(QString file_path) { // Creates all necessary directories for file
-        QDir dir;
-        return dir.mkpath(QFileInfo(file_path).absoluteDir().absolutePath());
-    }
+    extern bool createFilePath(QString file_path);
 
-    static QString fileHash(const QString &fileName, QCryptographicHash::Algorithm hashAlgorithm = QCryptographicHash::Md5) {
-        QFile file(fileName);
-        if (file.open(QIODevice::ReadOnly)) {
-            QCryptographicHash hash(hashAlgorithm);
-            hash.addData(&file);
-            QByteArray hashData = hash.result();
-            return hashData.toHex();
-        }
-        return QByteArray();
-    }
+    extern QString fileHash(const QString &fileName, QCryptographicHash::Algorithm hashAlgorithm = QCryptographicHash::Md5);
 
+    extern void clearFolder(QDir &dir);
 
-    static void clearFolder(QDir &dir) {
-        //Получаем список файлов
-        QStringList lstFiles = dir.entryList(QDir::Files);
-
-        //Удаляем файлы
-        foreach (QString entry, lstFiles){
-            QString entryAbsPath = dir.absolutePath() + "/" + entry;
-            //QFile::setPermissions(entryAbsPath, QFile::ReadOwner | QFile::WriteOwner);
-            qDebug() << dir.absolutePath();
-            QFile::remove(entryAbsPath);
-        }
-    }
-
-
-    static QStringList recognizeRegistryLotroPath() {
-        QStringList paths;
-
-        #ifdef _WIN32
-            // Windows 8, 10
-            QSettings n("HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\12bbe590-c890-11d9-9669-0800200c9a66_is1", QSettings::NativeFormat);
-            foreach (QString key, n.allKeys()) {
-                qDebug() << key;
-                if(key.contains("InstallLocation") || key.contains("installlocation")){
-                    QString folder = n.value(key).toString()
-                            .replace("\\", "/")
-                            .replace("/TurbineLauncher.exe", "")
-                            .replace("/LotroLauncher.exe", "")
-                            .replace("\"", "");
-
-                    if(fileExists(folder + "/LotroLauncher.exe"))
-                        paths.append(folder);
-                }
-            }
-
-
-            // Windows 7
-            QSettings m("HKEY_CLASSES_ROOT\\Local Settings\\Software\\Microsoft\\Windows\\Shell\\MuiCache", QSettings::NativeFormat);
-            foreach (QString key, m.allKeys()) {
-              if((key.contains("TurbineLauncher.exe") || key.contains("LotroLauncher.exe")) && fileExists(key)){
-                  QString folder = n.value(key).toString()
-                          .replace("\\", "/")
-                          .replace("/TurbineLauncher.exe", "")
-                          .replace("/LotroLauncher.exe", "")
-                          .replace("\"", "");
-
-                  if(fileExists(folder + "/LotroLauncher.exe"))
-                      paths.append(folder);
-              }
-            }
-        #else
-            // Реализация под Linux
-        #endif
-
-        return paths;
-    }
+    extern QStringList recognizeRegistryLotroPath();
 }
 
 #endif // FILESYSTEM_H

src/Legacy/models/settings.cpp

@@ -0,0 +1,26 @@
+#include <QSettings>
+
+#include "settings.h"
+
+
+namespace Settings {
+
+void setDefaultSettings()
+{
+    QSettings settings;
+    foreach (QString key, defaults.keys()) {
+        settings.setValue(key, defaults[key]);
+    }
+}
+
+QVariant getValue(QString key) {
+    QSettings settings;
+    return settings.value(key, defaults[key]);
+}
+
+void setValue(QString key, QVariant value) {
+    QSettings settings;
+    settings.setValue(key, value);
+}
+
+}

src/Legacy/models/settings.h

@@ -8,7 +8,7 @@ namespace Settings
 
 static QMap<QString, QVariant> defaults = {
     // General info
-    {"General/UI_scale", "100"},
+    {"General/UI_scale", 100},
     {"General/CurrentInitStage", "0"},
     {"General/MicroUpdates", false},
     {"General/PatchDownloadDir", "data"},
@@ -16,11 +16,15 @@ static QMap<QString, QVariant> defaults = {
     // Lotro Manager
     {"Lotro/game_path", "none"},
     {"Lotro/original_locale", "English"},
-    {"Lotro/skip_raw_download", "True"},
-    {"Lotro/no_splash_screen", "True"},
+    {"Lotro/skip_raw_download", true},
+    {"Lotro/no_splash_screen", false},
 
-    // Databases download settings
+    // Backup
+    {"Backup/installed", false},
+    {"Backup/path", "/backup/"},
+    {"Backup/creation_time", "none"},
 
+    // Databases download settings
     {"DatabaseDownload/text", false},          // TextsPatch
     {"DatabaseDownload/font", false},          // TextsPatch
     {"DatabaseDownload/image", false},         // GraphicsPatch
@@ -40,7 +44,6 @@ static QMap<QString, QVariant> defaults = {
     {"DatabaseUpdated/video", false},          // VideosPatch
 
     // Localisation components
-    {"Components/fonts", false},               // TextsPatch
     {"Components/texts_main", false},          // TextsPatch
     {"Components/texts_items", false},         // TextsPatch
     {"Components/texts_emotes", false},        // TextsPatch
@@ -49,6 +52,7 @@ static QMap<QString, QVariant> defaults = {
     {"Components/textures", false},            // ImagesPatch
     {"Components/sounds", false},              // SoundsPatch
     {"Components/videos", false},              // VideosPatch
+    {"Components/micropatch", false},          // PatchList
 
     // Network
     {"Network/site_url", "http://translate.lotros.ru/"},
@@ -63,25 +67,11 @@ static QMap<QString, QVariant> defaults = {
     {"Network/patch_updates_url", "http://translate.lotros.ru/groupware/check_updates"}
 };
 
-static void setDefaultSettings()
-{
-    QSettings settings;
-    foreach (QString key, defaults.keys()) {
-        settings.setValue(key, defaults[key]);
-    }
-}
-
-static QVariant getValue(QString key) {
-    QSettings settings;
-    return settings.value(key, defaults[key]);
-}
-
-static void setValue(QString key, QVariant value) {
-    QSettings settings;
-    settings.setValue(key, value);
-}
+    void setDefaultSettings();
 
+    QVariant getValue(QString key);
 
+    void setValue(QString key, QVariant value);
 }
 
 #endif // SETTINGS_H