[FIX] Issues with Epic Login and refresh Library

electron/constants.ts

@@ -35,12 +35,15 @@ function fixPathWithSpaces(path: string) {
   }
 
   // for windows, it depend of the build
-  return should_not_escape(...windows_version_regex.exec(version).splice(1))
+  const fixedPath = should_not_escape(
+    ...windows_version_regex.exec(version).splice(1)
+  )
     ? // on major version, no need to escape anymore
       // https://support.microsoft.com/en-us/help/4467268/url-encoded-unc-paths-not-url-decoded-in-windows-10-version-1803-later
       path
     : // on older version, replace space with symbol %20
       path.replace(/(\s+)/g, '%20')
+  return fixedPath
 }
 
 function getLegendaryBin() {
@@ -55,6 +58,9 @@ function getLegendaryBin() {
         isWindows ? 'legendary.exe' : 'legendary'
       )
     )}`
+  if (bin.includes(' ')) {
+    return `"${bin}"`
+  }
 
   logInfo(`Location: ${bin}`, LogPrefix.Legendary)
   return fixPathWithSpaces(bin)
@@ -71,6 +77,9 @@ function getGOGdlBin() {
         isWindows ? 'gogdl.exe' : 'gogdl'
       )
   )
+  if (bin.includes(' ')) {
+    return `"${bin}"`
+  }
   logInfo(`Location: ${bin}`, LogPrefix.Gog)
   return fixPathWithSpaces(bin)
 }

electron/legendary/library.ts

@@ -20,6 +20,7 @@ import { execAsync, isEpicServiceOffline, isOnline } from '../utils'
 import {
   fallBackImage,
   installed,
+  isWindows,
   legendaryBin,
   legendaryConfigPath,
   libraryPath
@@ -28,6 +29,7 @@ import { logError, logInfo, LogPrefix, logWarning } from '../logger/logger'
 import { spawn } from 'child_process'
 import Store from 'electron-store'
 import { GlobalConfig } from '../config'
+import path from 'path'
 
 const libraryStore = new Store({
   cwd: 'lib-cache',
@@ -96,9 +98,16 @@ class LegendaryLibrary {
 
     return new Promise((res, rej) => {
       const getUeAssets = showUnrealMarket ? '--include-ue' : ''
-      const child = spawn(legendaryBin, ['list', getUeAssets], { shell: true })
+      const legendaryPath = path.dirname(legendaryBin).replaceAll('"', '')
+      process.chdir(legendaryPath)
+      const child = spawn(
+        isWindows ? 'legendary.exe' : 'legendary',
+        ['list', getUeAssets],
+        { shell: isWindows }
+      )
       child.stderr.on('data', (data) => {
         if (`${data}`.includes('ERROR')) {
+          console.log(`${data}`)
           logError(`${data}`.trim(), LogPrefix.Legendary)
         } else {
           logInfo(`${data}`.trim(), LogPrefix.Legendary)
@@ -112,6 +121,8 @@ class LegendaryLibrary {
         this.loadAll()
       })
       .catch((err) => {
+        console.log(`${err}`)
+
         logError(err, LogPrefix.Legendary)
       })
   }

electron/legendary/user.ts

@@ -2,7 +2,7 @@ import { existsSync, readFileSync } from 'graceful-fs'
 
 import { UserInfo } from '../types'
 import { clearCache, execAsync } from '../utils'
-import { legendaryBin, userInfo } from '../constants'
+import { isWindows, legendaryBin, userInfo } from '../constants'
 import { logError, logInfo, LogPrefix } from '../logger/logger'
 import { spawn } from 'child_process'
 import { userInfo as user } from 'os'
@@ -18,7 +18,11 @@ export class LegendaryUser {
 
     const command = `auth --sid ${sid}`.split(' ')
     return new Promise((res) => {
-      const child = spawn(legendaryBin, command, { shell: true })
+      const legendaryPath = path.dirname(legendaryBin).replaceAll('"', '')
+      process.chdir(legendaryPath)
+      const child = spawn(isWindows ? 'legendary.exe' : 'legendary', command, {
+        shell: isWindows
+      })
       child.stderr.on('data', (data) => {
         if (`${data}`.includes('ERROR')) {
           logError(`${data}`, LogPrefix.Legendary)