[Fix] Library not showing and Corrupted config dialog (#1411)

* [Fix] Library going to Unreal Market on Login * fix: error dialogs * other: version * fix: login check * chore: skip auto-update on macOS * fix: wineprefix error on windows * chore: deal with old categorry epic * fix: library logic and login event
Heroic-Games-Launcher · May 30, 2022 · 5bd2fdc · 5bd2fdc
1 parent 658ea7b
commit 5bd2fdc
Show file tree

Hide file tree

Showing 16 changed files with 113 additions and 121 deletions.
diff --git a/electron/config.ts b/electron/config.ts
@@ -62,7 +62,8 @@ abstract class GlobalConfig {
       } catch (error) {
         logError(
           `Config file is corrupted, please check ${heroicConfigPath}`,
-          LogPrefix.Backend
+          LogPrefix.Backend,
+          false
         )
         version = 'v0'
       }
@@ -94,7 +95,8 @@ abstract class GlobalConfig {
       default:
         logError(
           `Invalid config version '${version}' requested.`,
-          LogPrefix.GlobalConfig
+          LogPrefix.GlobalConfig,
+          false
         )
         break
     }
@@ -110,7 +112,8 @@ abstract class GlobalConfig {
       // Upgrade failed.
       logError(
         `Failed to upgrade outdated ${version} config.`,
-        LogPrefix.GlobalConfig
+        LogPrefix.GlobalConfig,
+        false
       )
     }
   }
@@ -340,7 +343,7 @@ abstract class GlobalConfig {
    * Writes to file after that.
    * DO NOT call `flush()` afterward.
    *
-   * @returns true if upgrade successful, false if upgrade fails or no upgrade needed.
+   * @returns true if upgrade successful if upgrade fails or no upgrade needed.
    */
   public abstract upgrade(): boolean
 
@@ -419,29 +422,21 @@ class GlobalConfigV0 extends GlobalConfig {
       return this.getFactoryDefaults()
     }
 
-    try {
-      let settings = JSON.parse(readFileSync(heroicConfigPath, 'utf-8'))
-      const defaultSettings = settings.defaultSettings as AppSettings
+    let settings = JSON.parse(readFileSync(heroicConfigPath, 'utf-8'))
+    const defaultSettings = settings.defaultSettings as AppSettings
 
-      // fix relative paths
-      const winePrefix = defaultSettings.winePrefix.replace('~', userHome)
+    // fix relative paths
+    const winePrefix = !isWindows
+      ? defaultSettings?.winePrefix?.replace('~', userHome)
+      : ''
 
-      settings = {
-        ...(await this.getFactoryDefaults()),
-        ...settings.defaultSettings,
-        winePrefix
-      } as AppSettings
-      return settings
-    } catch (error) {
-      logError(
-        `Config file is corrupted, please check ${heroicConfigPath}`,
-        LogPrefix.Backend
-      )
-      const settings = {
-        ...(await this.getFactoryDefaults())
-      }
-      return settings
-    }
+    settings = {
+      ...(await this.getFactoryDefaults()),
+      ...settings.defaultSettings,
+      winePrefix
+    } as AppSettings
+
+    return settings
   }
 
   public async getCustomWinePaths(): Promise<Set<WineInstallation>> {

diff --git a/electron/game_config.ts b/electron/game_config.ts
@@ -127,7 +127,7 @@ abstract class GameConfig {
    * Writes to file after that.
    * DO NOT call `flush()` afterward.
    *
-   * @returns true if upgrade successful, false if upgrade fails or no upgrade needed.
+   * @returns true if upgrade successful if upgrade fails or no upgrade needed.
    */
   public abstract upgrade(): boolean
 
@@ -198,28 +198,20 @@ class GameConfigV0 extends GameConfig {
     if (!existsSync(this.path)) {
       return { ...GlobalConfig.get().config } as GameSettings
     }
-    try {
-      const settings = JSON.parse(readFileSync(this.path, 'utf-8'))
-      // Take defaults, then overwrite if explicitly set values exist.
-      // The settings defined work as overrides.
+    const settings = JSON.parse(readFileSync(this.path, 'utf-8'))
+    // Take defaults, then overwrite if explicitly set values exist.
+    // The settings defined work as overrides.
 
-      // fix relative paths
-      const { winePrefix } = settings[this.appName] as GameSettings
+    // fix relative paths
+    const { winePrefix } = (settings[this.appName] as GameSettings) || {}
 
-      return {
-        ...GlobalConfig.get().config,
-        ...settings[this.appName],
-        winePrefix: winePrefix.replace('~', userHome)
-      } as GameSettings
-    } catch (error) {
-      logError(
-        `Config file is corrupted, please check ${this.path}`,
-        LogPrefix.Backend
-      )
-      return {
-        ...GlobalConfig.get().config
-      }
-    }
+    return {
+      ...GlobalConfig.get().config,
+      ...settings[this.appName],
+      winePrefix: winePrefix
+        ? winePrefix.replace('~', userHome)
+        : `${userHome}/.wine`
+    } as GameSettings
   }
 
   public async resetToDefaults() {

diff --git a/electron/launcher.ts b/electron/launcher.ts
@@ -550,7 +550,8 @@ async function runLegendaryOrGogdlCommand(
       errorHandler({
         error: `${stdout.join().concat(stderr.join())}`,
         logPath: options?.logFile,
-        runner: runner.name
+        runner: runner.name,
+        appName
       })
 
       if (signal) {
@@ -577,14 +578,14 @@ async function runLegendaryOrGogdlCommand(
         appName
       })
 
-      const dontShowDialog =
-        `${error}`.includes('signal') &&
-        `${error}`.includes('appears to be deleted')
+      const showDialog =
+        !`${error}`.includes('signal') &&
+        !`${error}`.includes('appears to be deleted')
 
       logError(
         ['Error running', runner.name, 'command', `"${safeCommand}": ${error}`],
         runner.logPrefix,
-        dontShowDialog
+        showDialog
       )
       return { stdout: '', stderr: `${error}`, fullCommand: safeCommand, error }
     })

diff --git a/electron/legendary/library.ts b/electron/legendary/library.ts
@@ -532,7 +532,7 @@ export class LegendaryLibrary {
       this.library.set(app_name, null)
       return app_name
     } catch (error) {
-      logError(`Metadata for ${fileName} corrupted`, LogPrefix.Legendary, false)
+      logError(`Metadata for ${fileName} corrupted`, LogPrefix.Legendary)
       return 'error'
     }
   }

diff --git a/electron/logger/logger.ts b/electron/logger/logger.ts
@@ -103,7 +103,7 @@ export function logDebug(
 export function logError(
   text: string[] | string,
   prefix: LogPrefix = LogPrefix.General,
-  showDialog = true,
+  showDialog = false,
   skipLogToFile = false
 ) {
   const extendText = `${getTimeStamp()} ERROR:   ${getPrefixString(

diff --git a/electron/main.ts b/electron/main.ts
@@ -83,7 +83,8 @@ import {
   weblateUrl,
   wikiLink,
   fontsStore,
-  heroicConfigPath
+  heroicConfigPath,
+  isMac
 } from './constants'
 import { handleProtocol } from './protocol'
 import { logError, logInfo, LogPrefix, logWarning } from './logger/logger'
@@ -192,7 +193,9 @@ async function createWindow(): Promise<BrowserWindow> {
   } else {
     Menu.setApplicationMenu(null)
     mainWindow.loadURL(`file://${path.join(__dirname, '../build/index.html')}`)
-    autoUpdater.checkForUpdates()
+    if (!isMac) {
+      autoUpdater.checkForUpdates()
+    }
     return mainWindow
   }
 }

diff --git a/electron/utils.ts b/electron/utils.ts
@@ -298,11 +298,7 @@ async function errorHandler(
   const noSpaceMsg = 'Not enough available disk space'
   const plat = r === 'legendary' ? 'Legendary (Epic Games)' : r
   const deletedFolderMsg = 'appears to be deleted'
-  const otherErrorMessages = [
-    'No saved credentials',
-    'in get_user_entitlements',
-    'No credentials'
-  ]
+  const otherErrorMessages = ['No saved credentials', 'No credentials']
 
   if (!window) {
     window = BrowserWindow.getFocusedWindow()
@@ -312,7 +308,7 @@ async function errorHandler(
     execAsync(`tail "${logPath}" | grep 'disk space'`)
       .then(({ stdout }) => {
         if (stdout.includes(noSpaceMsg)) {
-          logError(noSpaceMsg, LogPrefix.Backend, false)
+          logError(noSpaceMsg, LogPrefix.Backend)
           return showErrorBoxModal(
             window,
             i18next.t('box.error.diskspace.title', 'No Space'),

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "heroic",
-  "version": "2.3.4",
+  "version": "2.3.5",
   "private": true,
   "main": "public/main.js",
   "homepage": "./",

diff --git a/src/components/UI/Header/index.tsx b/src/components/UI/Header/index.tsx
@@ -41,7 +41,9 @@ export default function Header({ list }: ComponentProps) {
 
   const numberOfGames = useMemo(() => {
     const dlcCount =
-      category === 'epic' ? list.filter((lib) => lib.install.is_dlc).length : 0
+      category === 'legendary'
+        ? list.filter((lib) => lib.install.is_dlc).length
+        : 0
 
     return list.length - dlcCount
   }, [list, category])

diff --git a/src/components/UI/Sidebar/components/SidebarLinks/index.tsx b/src/components/UI/Sidebar/components/SidebarLinks/index.tsx
@@ -14,7 +14,7 @@ import { useTranslation } from 'react-i18next'
 import { NavLink, useLocation } from 'react-router-dom'
 import { getAppSettings } from 'src/helpers'
 import ContextProvider from 'src/state/ContextProvider'
-import { Runner } from 'src/types'
+import { Category, Runner } from 'src/types'
 import './index.css'
 
 interface LocationState {
@@ -60,7 +60,7 @@ export default function SidebarLinks() {
   const loggedIn = epic.username || gog.username
 
   const toggleCategory = useCallback(
-    (newCategory: string) => {
+    (newCategory: Category) => {
       if (category !== newCategory) {
         handleCategory(newCategory)
         handleFilter(newCategory === 'unreal' ? 'unreal' : 'all')
@@ -112,9 +112,9 @@ export default function SidebarLinks() {
           {epic.username && (
             <a
               href="#"
-              onClick={() => toggleCategory('epic')}
+              onClick={() => toggleCategory('legendary')}
               className={cx('Sidebar__item SidebarLinks__subItem', {
-                ['active']: category === 'epic'
+                ['active']: category === 'legendary'
               })}
             >
               {t('Epic Games', 'Epic Games')}
@@ -218,7 +218,7 @@ export default function SidebarLinks() {
               to={`/settings/${appName}/wine`}
               state={{ ...state, runner: state?.runner }}
               className={cx('Sidebar__item SidebarLinks__subItem', {
-                ['active']: category === 'wine'
+                ['active']: type === 'wine'
               })}
             >
               Wine

diff --git a/src/screens/Library/constants.ts b/src/screens/Library/constants.ts
@@ -5,7 +5,7 @@ export function getLibraryTitle(
   filter: string,
   t: TFunction<'translation'>
 ) {
-  if (category === 'epic' || category === 'gog') {
+  if (category === 'legendary' || category === 'gog') {
     return t('title.allGames', 'All Games')
   }
 

diff --git a/src/screens/Library/index.tsx b/src/screens/Library/index.tsx
@@ -106,7 +106,7 @@ export default function Library(): JSX.Element {
           sortDescending={sortDescending}
           toggleSortDescending={() => handleSortDescending()}
           sortInstalled={sortInstalled}
-          library={category === 'epic' ? 'legendary' : 'gog'}
+          library={category === 'legendary' ? 'legendary' : 'gog'}
           toggleSortinstalled={() => handleSortInstalled()}
         />
       </div>
@@ -160,7 +160,7 @@ export default function Library(): JSX.Element {
       return []
     }
 
-    if (category === 'epic' && platform === 'linux') {
+    if (category === 'legendary' && platform === 'linux') {
       return library.filter((game) => game?.is_game)
     }
 
@@ -195,14 +195,20 @@ export default function Library(): JSX.Element {
   // select library
   const libraryToShow = useMemo(() => {
     let library: GameInfo[] = []
-    if (epic.username && category === 'epic') {
+    const isEpic =
+      epic.username && (category === 'legendary' || category === 'unreal')
+    const isGog = gog.username && category === 'gog'
+
+    if (isEpic) {
       library = epic.library
-    } else if (gog.username && category === 'gog') {
+    } else if (isGog) {
       library = gog.library
-    } else if (!epic.username && category === 'epic') {
+    } else if (!isEpic) {
       if (gog.username) {
         library = gog.library
       }
+    } else {
+      library = epic.library
     }
 
     // filter

diff --git a/src/screens/WebView/index.tsx b/src/screens/WebView/index.tsx
@@ -95,41 +95,33 @@ export default function WebView() {
           }
         } else {
           webview.addEventListener('did-navigate', () => {
-            if (
-              webview.getURL() === 'https://www.epicgames.com/id/api/redirect'
-            ) {
-              webview.addEventListener(
-                'found-in-page',
-                async (res) => {
-                  const data = res as Event & { result: { matches: number } }
-
-                  if (!data.result.matches) {
-                    return
-                  }
-                  webview.focus()
-                  webview.selectAll()
-                  webview.copy()
-
-                  if (!clipboard.readText().match('sid')) {
-                    return
-                  }
-                  const { sid }: SID = JSON.parse(clipboard.readText())
-                  try {
-                    setLoading({
-                      refresh: true,
-                      message: t('status.logging', 'Logging In...')
-                    })
-                    await epic.login(sid)
-                    handleSuccessfulLogin()
-                  } catch (error) {
-                    console.error(error)
-                    ipcRenderer.send('logError', error)
-                  }
-                },
-                { once: true }
-              )
-              webview.findInPage('sid')
-            }
+            webview.findInPage('sid')
+            webview.addEventListener('found-in-page', async (res) => {
+              const data = res as Event & { result: { matches: number } }
+
+              if (!data.result.matches) {
+                return
+              }
+              webview.focus()
+              webview.selectAll()
+              webview.copy()
+
+              if (!clipboard.readText().match('sid')) {
+                return
+              }
+              const { sid }: SID = JSON.parse(clipboard.readText())
+              try {
+                setLoading({
+                  refresh: true,
+                  message: t('status.logging', 'Logging In...')
+                })
+                await epic.login(sid)
+                handleSuccessfulLogin()
+              } catch (error) {
+                console.error(error)
+                ipcRenderer.send('logError', error)
+              }
+            })
           })
         }
       }