More Windows & CI fixes

.github/workflows/main.yml

@@ -209,6 +209,7 @@ jobs:
       - name: Save Prefix
         id: cache-prefix-save
         uses: actions/cache/save@v4
+        if: steps.cache-prefix-restore.outputs.cache-hit != 'true'
         with:
           path: ${{ steps.strings.outputs.prefix-dir }}
           key: ${{ steps.cache-prefix-restore.outputs.cache-primary-key }}
@@ -250,12 +251,13 @@ jobs:
           Copy-Item -Path ${{ steps.strings.outputs.prefix-dir }}/bin/KirigamiDelegates.dll -Destination ${{ steps.strings.outputs.build-output-dir }}/bin/bin
           Copy-Item -Path ${{ steps.strings.outputs.prefix-dir }}/bin/KirigamiPlatform.dll -Destination ${{ steps.strings.outputs.build-output-dir }}/bin/bin
 
-          Copy-Item -Path ${{ steps.strings.outputs.prefix-dir }}/lib/qml/* -Destination ${{ steps.strings.outputs.build-output-dir }}/qml/ -Recurse
+          Copy-Item -Force -Recurse -Path ${{ steps.strings.outputs.prefix-dir }}\lib\qml\* -Destination ${{ steps.strings.outputs.build-output-dir }}/bin/qml/
 
       - name: Remove extra files
         if: runner.os == 'Windows'
         run: |
           Remove-Item -Path ${{ steps.strings.outputs.build-output-dir }}/bin/bin/opengl32sw.dll
+          Remove-Item -Path ${{ steps.strings.outputs.build-output-dir }}/bin/Release -Force -Recurse
 
       - name: Archive artifacts
         uses: actions/upload-artifact@v4

launcher/include/launchercore.h

@@ -111,7 +111,8 @@ class LauncherCore : public QObject
     [[nodiscard]] bool isLoadingFinished() const;
     [[nodiscard]] bool isSteam() const;
     [[nodiscard]] bool isSteamDeck() const;
-    [[nodiscard]] bool isWindows() const;
+    [[nodiscard]] static bool isWindows();
+    [[nodiscard]] static bool needsCompatibilityTool();
     [[nodiscard]] Q_INVOKABLE bool isPatching() const;
 
     [[nodiscard]] QNetworkAccessManager *mgr();

launcher/src/assetupdater.cpp

@@ -31,20 +31,23 @@ QCoro::Task<bool> AssetUpdater::update()
     qInfo(ASTRA_LOG) << "Checking for compatibility tool updates...";
 
     m_dataDir = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation);
-    const QDir compatibilityToolDir = m_dataDir.absoluteFilePath(QStringLiteral("tool"));
-    m_wineDir = compatibilityToolDir.absoluteFilePath(QStringLiteral("wine"));
-    m_dxvkDir = compatibilityToolDir.absoluteFilePath(QStringLiteral("dxvk"));
 
-    Utility::createPathIfNeeded(m_wineDir);
-    Utility::createPathIfNeeded(m_dxvkDir);
+    if (LauncherCore::needsCompatibilityTool()) {
+        const QDir compatibilityToolDir = m_dataDir.absoluteFilePath(QStringLiteral("tool"));
+        m_wineDir = compatibilityToolDir.absoluteFilePath(QStringLiteral("wine"));
+        m_dxvkDir = compatibilityToolDir.absoluteFilePath(QStringLiteral("dxvk"));
 
-    if (m_profile.wineType() == Profile::WineType::BuiltIn && !co_await checkRemoteCompatibilityToolVersion()) {
-        co_return false;
-    }
+        Utility::createPathIfNeeded(m_wineDir);
+        Utility::createPathIfNeeded(m_dxvkDir);
 
-    // TODO: should DXVK be tied to this setting...?
-    if (m_profile.wineType() == Profile::WineType::BuiltIn && !co_await checkRemoteDxvkVersion()) {
-        co_return false;
+        if (m_profile.wineType() == Profile::WineType::BuiltIn && !co_await checkRemoteCompatibilityToolVersion()) {
+            co_return false;
+        }
+
+        // TODO: should DXVK be tied to this setting...?
+        if (m_profile.wineType() == Profile::WineType::BuiltIn && !co_await checkRemoteDxvkVersion()) {
+            co_return false;
+        }
     }
 
     if (!m_profile.dalamudEnabled()) {

launcher/src/benchmarkinstaller.cpp

@@ -69,8 +69,8 @@ void BenchmarkInstaller::installGame()
 
     KZip archive(m_localInstallerPath);
     if (!archive.open(QIODevice::ReadOnly)) {
-        qCritical(ASTRA_LOG) << "Failed to extract benchmark files";
-        Q_EMIT error(i18n("Failed to extract benchmark files."));
+        qCritical(ASTRA_LOG) << "Failed to extract benchmark files:" << archive.errorString();
+        Q_EMIT error(i18n("Failed to extract benchmark files:\n\n%1", archive.errorString()));
         return;
     }
 

launcher/src/gamerunner.cpp

@@ -177,7 +177,8 @@ QString GameRunner::getGameArgs(const Profile &profile, const std::optional<Logi
     }
 
     // FIXME: this should belong somewhere else...
-    Utility::createPathIfNeeded(profile.winePrefixPath());
+    if (LauncherCore::needsCompatibilityTool())
+        Utility::createPathIfNeeded(profile.winePrefixPath());
 
     if (auth) {
         if (!auth->lobbyhost.isEmpty()) {

launcher/src/launchercore.cpp

@@ -302,7 +302,7 @@ bool LauncherCore::isSteamDeck() const
     }
 }
 
-bool LauncherCore::isWindows() const
+bool LauncherCore::isWindows()
 {
 #if defined(Q_OS_WIN)
     return true;
@@ -311,6 +311,11 @@ bool LauncherCore::isWindows() const
 #endif
 }
 
+bool LauncherCore::needsCompatibilityTool()
+{
+    return !isWindows();
+}
+
 bool LauncherCore::isPatching() const
 {
     return m_isPatching;

launcher/src/profilemanager.cpp

@@ -66,21 +66,9 @@ void ProfileManager::deleteProfile(Profile *profile)
 
 QString ProfileManager::getDefaultGamePath(const QString &uuid)
 {
-#if defined(Q_OS_WIN)
-    return QStringLiteral("C:\\Program Files (x86)\\SquareEnix\\FINAL FANTASY XIV - A Realm Reborn");
-#endif
-
-#if defined(Q_OS_MAC)
-    return QDir::homePath() +
-        QStringLiteral("/Library/Application Support/FINAL FANTASY XIV ONLINE/Bottles/published_Final_Fantasy/drive_c/Program "
-        "Files (x86)/SquareEnix/FINAL FANTASY XIV - A Realm Reborn");
-#endif
-
-#if defined(Q_OS_LINUX)
     const QDir appData = QStandardPaths::standardLocations(QStandardPaths::StandardLocation::AppDataLocation)[0];
     const QDir gameDir = appData.absoluteFilePath(QStringLiteral("game"));
     return gameDir.absoluteFilePath(uuid);
-#endif
 }
 
 QString ProfileManager::getDefaultWinePrefixPath(const QString &uuid)