Accouunt for deprecation of GameData.path() in DB

oblivioncth · Jun 28, 2024 · b558993 · b558993
1 parent 28f476b
commit b558993
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/include/fp/fp-toolkit.h b/lib/include/fp/fp-toolkit.h
@@ -64,6 +64,7 @@ class FP_FP_EXPORT Toolkit
  //-Class Functions-----------------------------------------------------------------------------------------------
 private:
     static QString standardImageSubPath(QUuid gameId);
+    static QString datapackFilename(const Fp::GameData& gameData);
 
 public:
     static Qx::Error appInvolvesSecurePlayer(bool& involvesBuffer, QFileInfo appInfo);

diff --git a/lib/src/fp-toolkit.cpp b/lib/src/fp-toolkit.cpp
@@ -43,6 +43,8 @@ QString Toolkit::standardImageSubPath(QUuid gameId)
     return gameIdString.left(2) + '/' + gameIdString.mid(2, 2) + '/' + gameIdString;
 }
 
+static QString datapackFilename(const Fp::GameData& gameData) { return gameData.gameId().toString(QUuid::WithoutBraces) + '-' + QString::number(gameData.dateAdded().toMSecsSinceEpoch()) + u".zip"_s; }
+
 //Public:
 Qx::Error Toolkit::appInvolvesSecurePlayer(bool& involvesBuffer, QFileInfo appInfo)
 {
@@ -185,9 +187,9 @@ bool Toolkit::resolveTrueAppPath(QString& appPath, const QString& platform, QHas
     return swapped;
 }
 
-QString Toolkit::datapackPath(const Fp::GameData& gameData) const { return mDatapackLocalDir.absoluteFilePath(gameData.path()); }
+QString Toolkit::datapackPath(const Fp::GameData& gameData) const { return mDatapackLocalDir.absoluteFilePath(datapackFilename(gameData)); }
 
-QUrl Toolkit::datapackUrl(const Fp::GameData& gameData) const { return mDatapackRemoteBase + '/' + gameData.path(); }
+QUrl Toolkit::datapackUrl(const Fp::GameData& gameData) const { return mDatapackRemoteBase + '/' + datapackFilename(gameData); }
 
 bool Toolkit::datapackIsPresent(const Fp::GameData& gameData) const
 {