feat: introduce class SystemConfig

Author: DeepDiver1975

src/gui/newaccountwizard/urlpagecontroller.cpp

@@ -18,6 +18,7 @@
 #include "networkadapters/determineauthtypeadapter.h"
 #include "networkadapters/discoverwebfingerserviceadapter.h"
 #include "networkadapters/resolveurladapter.h"
+#include "systemconfig.h"
 #include "theme.h"
 
 #include <QLabel>
@@ -44,10 +45,8 @@ UrlPageController::UrlPageController(QWizardPage *page, AccessManager *accessMan
     QString serverUrl = Theme::instance()->overrideServerUrlV2();
     if (serverUrl.isEmpty()) {
         // respect global pre-configuration
-        // TODO: move to own class or make it part of ConfigFile?
-        const QSettings settings(QSettings::SystemScope, this);
-        allowServerUrlChange = settings.value("Setup/AllowServerUrlChange", true).toBool();
-        serverUrl = settings.value("Setup/ServerUrl", QString()).toString();
+        allowServerUrlChange = SystemConfig::allowServerUrlChange();
+        serverUrl = SystemConfig::serverUrl();
     }
 
     // no server url was given by any means, so the user has to provide one

src/libsync/CMakeLists.txt

@@ -52,6 +52,7 @@ set(libsync_SRCS
     abstractcorejob.cpp
 
     appprovider.cpp
+    systemconfig.cpp
 )
 
 if(WIN32)

src/libsync/systemconfig.cpp

@@ -0,0 +1,43 @@
+
+#include "common/asserts.h"
+#include "common/utility.h"
+#include "systemconfig.h"
+#include "theme.h"
+
+#include <QFile>
+#include <QSettings>
+#include <QOperatingSystemVersion>
+
+namespace OCC {
+
+namespace chrono = std::chrono;
+
+QVariant SystemConfig::value(QAnyStringView key, const QVariant &defaultValue)
+{
+    auto format = Utility::isWindows() ? QSettings::NativeFormat : QSettings::IniFormat;
+    QSettings system(configPath(QOperatingSystemVersion::currentType(), *Theme::instance()), format);
+
+    return system.value(key, defaultValue);
+}
+QString SystemConfig::configPath(const QOperatingSystemVersion::OSType& os, const Theme& theme)
+{
+    if (os == QOperatingSystemVersion::Windows) {
+        return QString("(HKEY_LOCAL_MACHINE\\Software\\%1\\%2)").arg(theme.vendor(), theme.appNameGUI());
+    }
+    if (os == QOperatingSystemVersion::MacOS) {
+        return QString("/Library/Preferences/%1.ini").arg(theme.orgDomainName());
+    }
+
+    return QString("/etc/%1/%1.ini").arg(theme.appName());
+}
+
+bool SystemConfig::allowServerUrlChange()
+{
+    return value("Setup/AllowServerUrlChange", true).toBool();
+}
+
+QString SystemConfig::serverUrl()
+{
+    return value("Setup/ServerUrl", QString()).toString();
+}
+}

src/libsync/systemconfig.h

@@ -0,0 +1,30 @@
+
+#pragma once
+
+#include "owncloudlib.h"
+#include "theme.h"
+
+#include <QOperatingSystemVersion>
+#include <QString>
+#include <QVariant>
+
+
+namespace OCC {
+
+/**
+ * @brief The SystemConfig class
+ * @ingroup libsync
+ */
+class OWNCLOUDSYNC_EXPORT SystemConfig
+{
+public:
+    // Access system configuration
+    static bool allowServerUrlChange();
+    static QString serverUrl();
+
+    // General purpose function
+    static QVariant value(QAnyStringView key, const QVariant &defaultValue);
+    static QString configPath(const QOperatingSystemVersion::OSType& os, const Theme& theme);
+
+};
+}

test/CMakeLists.txt

@@ -22,6 +22,7 @@ endif()
 owncloud_add_test(ExcludedFiles)
 
 owncloud_add_test(Utility)
+owncloud_add_test(SystemConfig ../src/libsync/owncloudtheme.cpp)
 
 owncloud_add_test(SyncEngine)
 owncloud_add_test(SyncMove)

test/testsystemconfig.cpp

@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include <QtTest>
+
+#include "testutils/testutils.h"
+
+#include "libsync/owncloudtheme.h"
+#include "libsync/systemconfig.h"
+
+class TestSystemConfig : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void testConfigPath()
+    {
+        auto t = OCC::ownCloudTheme();
+        QCOMPARE(OCC::SystemConfig::configPath(QOperatingSystemVersion::Windows, t), QString("(HKEY_LOCAL_MACHINE\\Software\\ownCloud\\Desktop)"));
+        QCOMPARE(OCC::SystemConfig::configPath(QOperatingSystemVersion::MacOS, t), QString("/Library/Preferences/com.owncloud.desktop.ini"));
+        QCOMPARE(OCC::SystemConfig::configPath(QOperatingSystemVersion::Unknown, t), QString("/etc/owncloud/owncloud.ini"));
+    }
+};
+
+QTEST_GUILESS_MAIN(TestSystemConfig)
+#include "testsystemconfig.moc"