Use data directory in portable mode

kiwix · Aug 23, 2024 · 99abf1f · 99abf1f
1 parent 92163b5
commit 99abf1f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/src/kiwixapp.cpp b/src/kiwixapp.cpp
@@ -151,6 +151,10 @@ void KiwixApp::newTab()
 QString KiwixApp::findLibraryDirectory()
 {
     auto currentDataDir = QString::fromStdString(kiwix::removeLastPathElement(kiwix::getExecutablePath()));
+    auto portableFile = QFileInfo(currentDataDir, ".portable");
+    if (portableFile.exists())
+        return currentDataDir + "/data";
+
     // Check for library.xml in the same directory as the executable.
     auto libraryFile = QFileInfo(currentDataDir, "library.xml");
     if (libraryFile.exists())

diff --git a/src/settingsmanager.cpp b/src/settingsmanager.cpp
@@ -9,6 +9,11 @@
 
 QString getDataDirectory()
 {
+    auto currentDataDir = QString::fromStdString(kiwix::removeLastPathElement(kiwix::getExecutablePath()));
+    auto portableFile = QFileInfo(currentDataDir, ".portable");
+    if (portableFile.exists())
+        return currentDataDir + "/data";
+
     QString dataDir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
 
     if (!dataDir.isEmpty() && QDir().mkpath(dataDir))