Cache installed wine version on prefix

Heroic-Games-Launcher · Sep 24, 2024 · 2423427 · 2423427
1 parent aefe212
commit 2423427
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 19 deletions.
diff --git a/src/backend/launcher.ts b/src/backend/launcher.ts
@@ -69,7 +69,7 @@ import { showDialogBoxModalAuto } from './dialog/dialog'
 import { legendarySetup } from './storeManagers/legendary/setup'
 import { gameManagerMap } from 'backend/storeManagers'
 import * as VDF from '@node-steam/vdf'
-import { readFileSync } from 'fs'
+import { readFileSync, writeFileSync } from 'fs'
 import { LegendaryCommand } from './storeManagers/legendary/commands'
 import { commandToArgsArray } from './storeManagers/legendary/library'
 import { searchForExecutableOnPath } from './utils/os/path'
@@ -826,13 +826,16 @@ export async function verifyWinePrefix(
 
   return command
     .then((result) => {
-      // This is kinda hacky
-      const wasUpdated = result.stderr.includes(
-        wineVersion.type === 'proton'
-          ? 'Proton: Upgrading prefix from'
-          : 'has been updated'
-      )
-      return { res: result, updated: wasUpdated }
+      const currentWinePath = join(winePrefix, 'current_wine')
+      if (
+        !existsSync(currentWinePath) ||
+        readFileSync(currentWinePath, 'utf-8') != wineVersion.bin
+      ) {
+        writeFileSync(currentWinePath, wineVersion.bin, 'utf-8')
+        return { res: result, updated: true }
+      } else {
+        return { res: result, updated: false }
+      }
     })
     .catch((error) => {
       logError(['Unable to create Wineprefix: ', error], LogPrefix.Backend)

diff --git a/src/backend/utils/systeminfo/osInfo/linux.ts b/src/backend/utils/systeminfo/osInfo/linux.ts
@@ -41,13 +41,13 @@ async function osInfo_linux(): Promise<{ name: string; version?: string }> {
   const osName = nameMatch
     ? stripQuotes(nameMatch)
     : prettyNameMatch
-    ? stripQuotes(prettyNameMatch)
-    : 'Linux'
+      ? stripQuotes(prettyNameMatch)
+      : 'Linux'
   const osVersion = versionMatch
     ? stripQuotes(versionMatch)
     : versionId && versionCodename
-    ? `${versionId} ${versionCodename}`
-    : undefined
+      ? `${versionId} ${versionCodename}`
+      : undefined
   if (osVersion) return { name: osName, version: osVersion }
   return { name: osName }
 }

diff --git a/src/frontend/screens/DownloadManager/components/ProgressHeader/index.tsx b/src/frontend/screens/DownloadManager/components/ProgressHeader/index.tsx
@@ -43,7 +43,7 @@ export default function ProgressHeader(props: {
       download:
         progress.downSpeed && progress.downSpeed > 0
           ? progress.downSpeed
-          : avgSpeed.at(-1)?.download ?? 0,
+          : (avgSpeed.at(-1)?.download ?? 0),
       disk: progress.diskSpeed ?? 0
     })
 
@@ -126,7 +126,7 @@ export default function ProgressHeader(props: {
                 title={t('download-manager.ETA', 'Estimated Time')}
               >
                 {props.state === 'running'
-                  ? progress.eta ?? '00.00.00'
+                  ? (progress.eta ?? '00.00.00')
                   : 'Paused'}
               </Typography>
             </Box>

diff --git a/src/frontend/screens/Game/GamePage/index.tsx b/src/frontend/screens/Game/GamePage/index.tsx
@@ -193,8 +193,8 @@ export default React.memo(function GamePage(): JSX.Element | null {
           (is_linux_native && isLinux
             ? 'linux'
             : is_mac_native && isMac
-            ? 'Mac'
-            : 'Windows')
+              ? 'Mac'
+              : 'Windows')
 
         if (
           runner !== 'sideload' &&

diff --git a/src/frontend/screens/Library/components/InstallModal/index.tsx b/src/frontend/screens/Library/components/InstallModal/index.tsx
@@ -100,9 +100,8 @@ export default React.memo(function InstallModal({
     return 'Windows'
   }
 
-  const [platformToInstall, setPlatformToInstall] = useState<InstallPlatform>(
-    getDefaultplatform()
-  )
+  const [platformToInstall, setPlatformToInstall] =
+    useState<InstallPlatform>(getDefaultplatform())
 
   const hasWine = platformToInstall === 'Windows' && !isWin