Provide root path as directory

oblivioncth · Nov 12, 2023 · c903a9e · c903a9e
1 parent 9c0def9
commit c903a9e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/lib/include/fp/fp-install.h b/lib/include/fp/fp-install.h
@@ -186,7 +186,7 @@ enum class Edition {Ultimate, Infinity, Core};
     Daemon outfittedDaemon() const;
 
     // Data access
-    QString fullPath() const;
+    QDir dir() const;
     QDir entryLogosDirectory() const;
     QDir entryScreenshotsDirectory() const;
     QDir extrasDirectory() const;

diff --git a/lib/src/fp-install.cpp b/lib/src/fp-install.cpp
@@ -270,7 +270,7 @@ const Services& Install::services() const { return mServices; }
 const Execs& Install::execs() const { return mExecs; }
 Daemon Install::outfittedDaemon() const { return mDaemon; }
 
-QString Install::fullPath() const { return mRootDirectory.absolutePath(); }
+QDir Install::dir() const { return mRootDirectory; }
 QDir Install::entryLogosDirectory() const { return mEntryLogosDirectory; }
 QDir Install::entryScreenshotsDirectory() const { return mEntryScreenshotsDirectory; }
 QDir Install::extrasDirectory() const { return mExtrasDirectory; }

diff --git a/lib/src/fp-toolkit.cpp b/lib/src/fp-toolkit.cpp
@@ -28,7 +28,7 @@ Toolkit::Toolkit(const Install& install, const Key&) :
         mEntryRemoteLogoTemplate += IMAGE_COMPRESSED_URL_SUFFIX;
         mEntryRemoteScreenshotTemplate += IMAGE_COMPRESSED_URL_SUFFIX;
     }
-    mDatapackLocalDir = mInstall.fullPath() + '/' + mInstall.preferences().dataPacksFolderPath;
+    mDatapackLocalDir = mInstall.mRootDirectory.absoluteFilePath(mInstall.preferences().dataPacksFolderPath);
     Q_ASSERT(mInstall.preferences().gameDataSources.contains(mInstall.MAIN_DATAPACK_SOURCE));
     mDatapackRemoteBase = mInstall.preferences().gameDataSources.value(mInstall.MAIN_DATAPACK_SOURCE).arguments.value(0);
     if(mDatapackRemoteBase.back() == '/')
@@ -152,7 +152,7 @@ bool Toolkit::resolveExecSwaps(QString& appPath, const QString& platform) const
 bool Toolkit::resolveTrueAppPath(QString& appPath, const QString& platform, QHash<QString, QString> overrides, bool absolute) const
 {
     // If appPath is absolute, convert it to relative temporarily
-    QString fpPath = mInstall.fullPath();
+    QString fpPath = mInstall.mRootDirectory.absolutePath();
     bool isFpAbsolute = appPath.startsWith(fpPath);
     if(isFpAbsolute)
     {