Add portable mode, update version

Author: biscuitcakes

.github/workflows/build-win64-x86.yml

@@ -65,23 +65,23 @@ jobs:
 
       - name: Build zip
         working-directory: build
-        run: cpack -G ZIP && mv Firelight-0.9.7-win64.zip Firelight-0.9.7-win64-portable.zip
+        run: cpack -G ZIP && mv Firelight-0.9.8-win64.zip Firelight-0.9.8-win64-portable.zip
 
       - name: Build installer
         working-directory: build
-        run: cpack -G NSIS && mv Firelight-0.9.7-win64.exe Firelight-0.9.7-win64-installer.exe
+        run: cpack -G NSIS && mv Firelight-0.9.8-win64.exe Firelight-0.9.8-win64-installer.exe
 
-#      - name: Upload artifact
-#        uses: actions/upload-artifact@v4
-#        with:
-#          name: Firelight-0.9.7-win64-portable
-#          path: build/Firelight-0.9.7-win64-portable.zip
+      - name: Upload portable zip artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: Firelight-0.9.8-win64-portable
+          path: build/Firelight-0.9.8-win64-portable.zip
 
-      - name: Upload artifact
+      - name: Upload installer artifact
         uses: actions/upload-artifact@v4
         with:
-          name: Firelight-0.9.7-win64-installer
-          path: build/Firelight-0.9.7-win64-installer.exe
+          name: Firelight-0.9.8-win64-installer
+          path: build/Firelight-0.9.8-win64-installer.exe
 
         # - name: Prepare artifact
         #   run: |

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.23.5...3.31.6)
 project(firelight
-        VERSION 0.9.7
+        VERSION 0.9.8
         DESCRIPTION "A libretro-based emulation frontend that aims to be the easiest way to play your retro games, discover awesome mods for those games, and just have a dang good time."
         #    HOMEPAGE_URL ""
         LANGUAGES CXX
@@ -393,7 +393,7 @@ set(CPACK_PACKAGE_VENDOR "BiscuitCakes")
 set(CPACK_PACKAGE_VERSION_MAJOR 0)
 set(CPACK_PACKAGE_VERSION_MINOR 9)
 set(CPACK_PACKAGE_VERSION_PATCH 5)
-set(CPACK_PACKAGE_VERSION "0.9.7")
+set(CPACK_PACKAGE_VERSION "0.9.8")
 set(CPACK_PACKAGE_INSTALL_DIRECTORY "Firelight")
 set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.txt")
 set(CPACK_PACKAGE_EXECUTABLES "firelight;Firelight")
@@ -461,5 +461,6 @@ install(
         DESTINATION ${CMAKE_INSTALL_BINDIR}/system/
 )
 
+set(CPACK_INSTALL_SCRIPT "${CMAKE_SOURCE_DIR}/cpack_portable.cmake")
 
 include(CPack)

cpack_portable.cmake

@@ -0,0 +1,3 @@
+if (CPACK_GENERATOR STREQUAL "ZIP")
+    file(WRITE "${CPACK_TEMPORARY_INSTALL_DIRECTORY}/bin/portable.txt" "This is a portable build.")
+endif ()

src/app/rcheevos/ra_constants.h

@@ -6,6 +6,6 @@ namespace firelight::achievements {
 constexpr int UNSUPPORTED_EMULATOR_ACHIEVEMENT_ID = 101000001;
 const std::string RA_DOREQUEST_URL =
     "https://retroachievements.org/dorequest.php";
-const std::string USER_AGENT = "Firelight/0.9.7";
+const std::string USER_AGENT = "Firelight/0.9.8";
 const std::string OFFLINE_USER_AGENT = USER_AGENT + " [offline]";
 } // namespace firelight::achievements

src/main.cpp

@@ -68,21 +68,6 @@
 #include <saves/gui/save_files_item.hpp>
 #include <unistd.h>
 
-bool create_dirs(const std::initializer_list<std::filesystem::path> list) {
-  std::error_code error_code;
-  for (const auto &path : list) {
-    if (!exists(path)) {
-      spdlog::info("Directory not found, creating: {}", path.string());
-      if (!create_directories(path, error_code)) {
-        spdlog::error("Unable to create directory {}; Error code: {}",
-                      path.string(), error_code.message());
-        return false;
-      }
-    }
-  }
-  return true;
-}
-
 int main(int argc, char *argv[]) {
   // SDL_setenv("QT_QUICK_FLICKABLE_WHEEL_DECELERATION", "5000", true);
 
@@ -120,19 +105,33 @@ int main(int argc, char *argv[]) {
 
   std::signal(SIGINT, [](int signal) { QGuiApplication::quit(); });
 
-  // TODO: Check for portable mode marker file
-
-  auto defaultUserPathString =
-      QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation);
   auto docsPath =
       QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) +
       "/Firelight";
-  auto savesPath = docsPath + "/saves";
-  auto romsPath = docsPath + "/roms";
 
   auto defaultAppDataPathString =
       QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
 
+  QFileInfo info(QCoreApplication::applicationDirPath() + "/portable.txt");
+  if (info.exists()) {
+    spdlog::info("Found \"portable.txt\"; Enabling portable mode");
+    docsPath = QCoreApplication::applicationDirPath();
+    defaultAppDataPathString = docsPath + "/appdata";
+  }
+
+  auto savesPath = docsPath + "/saves";
+  auto romsPath = docsPath + "/roms";
+
+  QFileInfo savesDirInfo(savesPath);
+  if (!savesDirInfo.exists() && QDir().mkpath(savesPath)) {
+    spdlog::info("Created saves directory at {}", savesPath.toStdString());
+  }
+
+  QFileInfo romsDirInfo(romsPath);
+  if (!romsDirInfo.exists() && QDir().mkpath(romsPath)) {
+    spdlog::info("Created roms directory at {}", romsPath.toStdString());
+  }
+
   QSettings::setPath(QSettings::Format::IniFormat, QSettings::Scope::UserScope,
                      defaultAppDataPathString);