Ensure config directory exists

hluk · Sep 20, 2023 · 1a288ba · 1a288ba
1 parent 50c9910
commit 1a288ba
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 18 deletions.
diff --git a/plugins/itemencrypted/itemencrypted.cpp b/plugins/itemencrypted/itemencrypted.cpp
@@ -139,6 +139,7 @@ class GpgExecutable {
             const bool needsSecring = version.major == 2 && version.minor == 0;
 
             const QString path = getConfigurationFilePath("");
+            ensureSettingsDirectoryExists();
             m_pubring = QDir::toNativeSeparators(path + ".pub");
             if (needsSecring)
                 m_secring = QDir::toNativeSeparators(path + ".sec");

diff --git a/src/app/clipboardserver.cpp b/src/app/clipboardserver.cpp
@@ -124,6 +124,8 @@ ClipboardServer::ClipboardServer(QApplication *app, const QString &sessionName)
 
     QApplication::setQuitOnLastWindowClosed(false);
 
+    ensureSettingsDirectoryExists();
+
     m_sharedData = std::make_shared<ClipboardBrowserShared>();
     m_sharedData->itemFactory = new ItemFactory(this);
     m_sharedData->notifications = new NotificationDaemon(this);

diff --git a/src/common/config.cpp b/src/common/config.cpp
@@ -157,6 +157,20 @@ QString getConfigurationFilePathHelper()
 
 } // namespace
 
+bool ensureSettingsDirectoryExists()
+{
+    QDir settingsDir( settingsDirectoryPath() );
+    if ( !settingsDir.mkpath(".") ) {
+        log( QStringLiteral("Failed to create the directory for settings: %1")
+             .arg(settingsDir.path()),
+             LogError );
+
+        return false;
+    }
+
+    return true;
+}
+
 const QString &getConfigurationFilePath()
 {
     static const QString path = getConfigurationFilePathHelper();

diff --git a/src/common/config.h b/src/common/config.h
@@ -9,6 +9,8 @@ class QString;
 class QVariant;
 class QWidget;
 
+bool ensureSettingsDirectoryExists();
+
 const QString &getConfigurationFilePath();
 
 QString getConfigurationFilePath(const char *suffix);

diff --git a/src/item/itemstore.cpp b/src/item/itemstore.cpp
@@ -22,20 +22,6 @@ QString itemFileName(const QString &id)
     return getConfigurationFilePath("_tab_") + part + QLatin1String(".dat");
 }
 
-bool createItemDirectory()
-{
-    QDir settingsDir( settingsDirectoryPath() );
-    if ( !settingsDir.mkpath(".") ) {
-        log( QString("Cannot create directory for settings %1!")
-             .arg(quoteString(settingsDir.path()) ),
-             LogError );
-
-        return false;
-    }
-
-    return true;
-}
-
 void printItemFileError(
         const QString &action, const QString &id, const QFileDevice &file)
 {
@@ -83,9 +69,6 @@ ItemSaverPtr createTab(
 
 ItemSaverPtr loadItems(const QString &tabName, QAbstractItemModel &model, ItemFactory *itemFactory, int maxItems)
 {
-    if ( !createItemDirectory() )
-        return nullptr;
-
     const QString tabFileName = itemFileName(tabName);
     if ( !QFile::exists(tabFileName) )
         return createTab(tabName, model, itemFactory, maxItems);
@@ -107,7 +90,7 @@ bool saveItems(const QString &tabName, const QAbstractItemModel &model, const It
 {
     const QString tabFileName = itemFileName(tabName);
 
-    if ( !createItemDirectory() )
+    if ( !ensureSettingsDirectoryExists() )
         return false;
 
     // Save tab data to a new temporary file.