From 1b6439215fa0bb6ac1e191c2ffc992e815a53199 Mon Sep 17 00:00:00 2001
From: Christian Mollekopf <chrigi_1@fastmail.fm>
Date: Fri, 8 Jul 2016 09:47:28 +0200
Subject: Separate config from data and define centrally

---
 common/configstore.cpp    |  4 ++--
 common/definitions.cpp    | 14 ++++++++++++--
 common/definitions.h      |  2 ++
 common/log.cpp            |  6 +++---
 common/resourceconfig.cpp |  4 ++--
 5 files changed, 21 insertions(+), 9 deletions(-)

(limited to 'common')

diff --git a/common/configstore.cpp b/common/configstore.cpp
index c8809ea..9a68662 100644
--- a/common/configstore.cpp
+++ b/common/configstore.cpp
@@ -20,15 +20,15 @@
 
 #include <QSettings>
 #include <QSharedPointer>
-#include <QStandardPaths>
 #include <QFile>
 #include <log.h>
+#include <definitions.h>
 
 SINK_DEBUG_AREA("configstore")
 
 static QSharedPointer<QSettings> getConfig(const QByteArray &identifier)
 {
-    return QSharedPointer<QSettings>::create(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/sink/" + identifier + ".ini", QSettings::IniFormat);
+    return QSharedPointer<QSettings>::create(Sink::configLocation() + "/" + identifier + ".ini", QSettings::IniFormat);
 }
 
 ConfigStore::ConfigStore(const QByteArray &identifier)
diff --git a/common/definitions.cpp b/common/definitions.cpp
index 362faf7..3fc4700 100644
--- a/common/definitions.cpp
+++ b/common/definitions.cpp
@@ -25,12 +25,22 @@
 
 QString Sink::storageLocation()
 {
-    return QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/sink/storage";
+    return dataLocation() + "/storage";
+}
+
+QString Sink::dataLocation()
+{
+    return QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/sink";
+}
+
+QString Sink::configLocation()
+{
+    return QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + "/sink";
 }
 
 QString Sink::temporaryFileLocation()
 {
-    auto path = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/sink/temporaryFiles";
+    auto path = dataLocation() + "/temporaryFiles";
     //FIXME create in a singleton on startup?
     QDir dir;
     dir.mkpath(path);
diff --git a/common/definitions.h b/common/definitions.h
index 1008235..e8cd45e 100644
--- a/common/definitions.h
+++ b/common/definitions.h
@@ -26,6 +26,8 @@
 
 namespace Sink {
 QString SINK_EXPORT storageLocation();
+QString SINK_EXPORT dataLocation();
+QString SINK_EXPORT configLocation();
 QString SINK_EXPORT temporaryFileLocation();
 QString SINK_EXPORT resourceStorageLocation(const QByteArray &resourceInstanceIdentifier);
 }
diff --git a/common/log.cpp b/common/log.cpp
index a3df04c..099c043 100644
--- a/common/log.cpp
+++ b/common/log.cpp
@@ -4,19 +4,19 @@
 #include <QIODevice>
 #include <QCoreApplication>
 #include <QSettings>
-#include <QStandardPaths>
 #include <QSharedPointer>
 #include <QMutex>
 #include <QMutexLocker>
 #include <iostream>
 #include <unistd.h>
 #include <memory>
+#include <definitions.h>
 
 using namespace Sink::Log;
 
 static QSharedPointer<QSettings> config()
 {
-    return QSharedPointer<QSettings>::create(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/sink/log.ini", QSettings::IniFormat);
+    return QSharedPointer<QSettings>::create(Sink::configLocation() + "/log.ini", QSettings::IniFormat);
 }
 
 static QByteArray sPrimaryComponent;
@@ -223,7 +223,7 @@ static QByteArray getProgramName()
 
 static QSharedPointer<QSettings> debugAreasConfig()
 {
-    return QSharedPointer<QSettings>::create(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/sink/debugAreas.ini", QSettings::IniFormat);
+    return QSharedPointer<QSettings>::create(Sink::dataLocation() + "/debugAreas.ini", QSettings::IniFormat);
 }
 
 class DebugAreaCollector {
diff --git a/common/resourceconfig.cpp b/common/resourceconfig.cpp
index a4e5fc5..39f9ddb 100644
--- a/common/resourceconfig.cpp
+++ b/common/resourceconfig.cpp
@@ -20,13 +20,13 @@
 
 #include <QSettings>
 #include <QSharedPointer>
-#include <QStandardPaths>
 #include <QFile>
 #include <log.h>
+#include <definitions.h>
 
 static QSharedPointer<QSettings> getConfig(const QByteArray &identifier)
 {
-    return QSharedPointer<QSettings>::create(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/sink/" + identifier + ".ini", QSettings::IniFormat);
+    return QSharedPointer<QSettings>::create(Sink::configLocation() +"/" + identifier + ".ini", QSettings::IniFormat);
 }
 
 QByteArray ResourceConfig::newIdentifier(const QByteArray &type)
-- 
cgit v1.2.3