[Linux/MacOS] Split Enviroment Variable and Wrapper Option

electron/config.ts

@@ -461,7 +461,8 @@ class GlobalConfigV0 extends GlobalConfig {
       maxWorkers: 0,
       minimizeOnLaunch: false,
       nvidiaPrime: false,
-      otherOptions: '',
+      enviromentOptions: [],
+      wrapperOptions: [],
       showUnrealMarket: false,
       showFps: false,
       useGameMode: false,

electron/game_config.ts

@@ -221,7 +221,8 @@ class GameConfigV0 extends GameConfig {
       launcherArgs,
       nvidiaPrime,
       offlineMode,
-      otherOptions,
+      enviromentOptions,
+      wrapperOptions,
       savesPath,
       showFps,
       showMangohud,
@@ -246,7 +247,8 @@ class GameConfigV0 extends GameConfig {
       launcherArgs,
       nvidiaPrime,
       offlineMode,
-      otherOptions,
+      enviromentOptions: enviromentOptions,
+      wrapperOptions,
       savesPath,
       showFps,
       showMangohud,

electron/launcher.ts

@@ -34,8 +34,12 @@ import { DXVK } from './tools'
 import setup from './gog/setup'
 import { GOGGame } from 'gog/games'
 import { LegendaryGame } from 'legendary/games'
-import { CallRunnerOptions, GameInfo, Runner } from './types'
 import {
+  CallRunnerOptions,
+  GameInfo,
+  Runner,
+  EnviromentVariable,
+  WrapperVariable,
   ExecResult,
   GameSettings,
   LaunchPreperationResult,
@@ -240,18 +244,11 @@ function setupEnvVars(gameSettings: GameSettings) {
   if (gameSettings.audioFix) {
     ret.PULSE_LATENCY_MSEC = '60'
   }
-  if (gameSettings.otherOptions) {
-    gameSettings.otherOptions
-      .split(' ')
-      .filter((val) => val.indexOf('=') !== -1)
-      .forEach((envKeyAndVar) => {
-        const keyAndValueSplit = envKeyAndVar.split('=')
-        const key = keyAndValueSplit.shift()
-        const value = keyAndValueSplit.join('=')
-        ret[key] = value
-      })
+  if (gameSettings.enviromentOptions) {
+    gameSettings.enviromentOptions.forEach((envEntry: EnviromentVariable) => {
+      ret[envEntry.key] = quoteIfNecessary(envEntry.value)
+    })
   }
-
   return ret
 }
 
@@ -298,7 +295,9 @@ function setupWineEnvVars(gameSettings: GameSettings, gameId = '0') {
     ret.PROTON_LOG_DIR = flatPakHome
 
     // Only set WINEDEBUG if PROTON_LOG is set since Proton will also log if just WINEDEBUG is set
-    if (gameSettings.otherOptions.includes('PROTON_LOG=')) {
+    if (
+      gameSettings.enviromentOptions.find((env) => env.key === 'PROTON_LOG')
+    ) {
       // Stop Proton from overriding WINEDEBUG; this prevents logs growing to a few GB for some games
       ret.WINEDEBUG = 'timestamp'
     }
@@ -313,14 +312,11 @@ function setupWrappers(
   steamRuntime: string
 ): Array<string> {
   const wrappers = Array<string>()
-  // Wrappers could be specified in the environment variable section as well
-  if (gameSettings.otherOptions) {
-    gameSettings.otherOptions
-      .split(' ')
-      .filter((val) => val.indexOf('=') === -1)
-      .forEach((val) => {
-        wrappers.push(val)
-      })
+  if (gameSettings.wrapperOptions) {
+    gameSettings.wrapperOptions.forEach((wrapperEntry: WrapperVariable) => {
+      wrappers.push(wrapperEntry.exe)
+      wrappers.push(...wrapperEntry.args)
+    })
   }
   if (gameSettings.showMangohud) {
     // Mangohud needs some arguments in addition to the command, so we have to split here

electron/legendary/games.ts

@@ -579,6 +579,7 @@ class LegendaryGame extends Game {
           ...commandEnv,
           ...setupEnvVars(gameSettings)
         }
+
         wrappers = setupWrappers(
           gameSettings,
           mangoHudCommand,
@@ -617,6 +618,7 @@ class LegendaryGame extends Game {
         ...setupEnvVars(gameSettings),
         ...wineEnvVars
       }
+
       wrappers = setupWrappers(
         gameSettings,
         mangoHudCommand,

electron/main.ts

@@ -4,7 +4,9 @@ import {
   GamepadInputEventKey,
   GamepadInputEventWheel,
   GamepadInputEventMouse,
-  Runner
+  Runner,
+  AppSettings,
+  GameSettings
 } from './types'
 import * as path from 'path'
 import {
@@ -705,11 +707,48 @@ ipcMain.handle('readConfig', async (event, config_class) => {
 })
 
 ipcMain.handle('requestSettings', async (event, appName) => {
+  // To the changes how we handle env and wrappers
+  // otherOptions is deprectaed and needs to be mapped
+  // to new approach.
+  // Can be removed if otherOptions is removed aswell
+  const mapOtherSettings = (config: AppSettings | GameSettings) => {
+    if (config.otherOptions) {
+      if (config.enviromentOptions.length <= 0) {
+        config.otherOptions
+          .split(' ')
+          .filter((val) => val.indexOf('=') !== -1)
+          .forEach((envKeyAndVar) => {
+            const keyAndValueSplit = envKeyAndVar.split('=')
+            const key = keyAndValueSplit.shift()
+            const value = keyAndValueSplit.join('=')
+            config.enviromentOptions.push({ key, value })
+          })
+      }
+
+      if (config.wrapperOptions.length <= 0) {
+        config.otherOptions
+          .split(' ')
+          .filter((val) => val.indexOf('=') === -1)
+          .forEach((val, index) => {
+            if (index === 0) {
+              config.wrapperOptions.push({ exe: val, args: [] })
+            } else {
+              config.wrapperOptions.at(0).args.push(val)
+            }
+          })
+      }
+
+      delete config.otherOptions
+    }
+    return config
+  }
+
   if (appName === 'default') {
-    return GlobalConfig.get().config
+    return mapOtherSettings(GlobalConfig.get().config)
   }
   // We can't use .config since apparently its not loaded fast enough.
-  return GameConfig.get(appName).getSettings()
+  const config = await GameConfig.get(appName).getSettings()
+  return mapOtherSettings(config)
 })
 
 ipcMain.on('toggleDXVK', (event, [{ winePrefix, winePath }, action]) => {

electron/types.ts

@@ -37,7 +37,9 @@ export interface AppSettings {
   minimizeOnLaunch: boolean
   nvidiaPrime: boolean
   offlineMode: boolean
-  otherOptions: string
+  otherOptions: string //depricated
+  enviromentOptions: EnviromentVariable[]
+  wrapperOptions: WrapperVariable[]
   savesPath: string
   showFps: boolean
   showMangohud: boolean
@@ -150,7 +152,9 @@ export interface GameSettings {
   launcherArgs: string
   nvidiaPrime: boolean
   offlineMode: boolean
-  otherOptions: string
+  otherOptions: string //deprecated
+  enviromentOptions: EnviromentVariable[]
+  wrapperOptions: WrapperVariable[]
   savesPath: string
   showFps: boolean
   showMangohud: boolean
@@ -375,3 +379,13 @@ export interface CallRunnerOptions {
   wrappers?: string[]
   onOutput?: (output: string) => void
 }
+
+export interface EnviromentVariable {
+  key: string
+  value: string
+}
+
+export interface WrapperVariable {
+  exe: string
+  args: string[]
+}

electron/utils.ts

@@ -543,7 +543,11 @@ const formatEpicStoreUrl = (title: string) => {
 }
 
 function quoteIfNecessary(stringToQuote: string) {
-  if (stringToQuote.includes(' ')) {
+  if (
+    (stringToQuote.charAt(0) !== '"' ||
+      stringToQuote.charAt(stringToQuote.length - 1) !== '"') &&
+    stringToQuote.includes(' ')
+  ) {
     return `"${stringToQuote}"`
   }
   return stringToQuote

public/locales/bg/translation.json

@@ -161,9 +161,6 @@
         },
         "general": "Синхронизирайте с EGS, в случай че вече имате работеща инсталация на Epic Games Launcher и искате да внесете игрите си от там, за да избегнете повторното им сваляне.",
         "other": {
-            "part1": "Използвайте ",
-            "part2": "Разширените настройки",
-            "part3": "които да се викнат преди пускането на играта; ",
             "part4": "Използвайте ",
             "part5": "Аргументите за играта",
             "part6": " които да се викнат след командата за пускане, например: ",
@@ -189,8 +186,7 @@
     },
     "infobox": {
         "help": "Помощ",
-        "requirements": "Системни изисквания",
-        "wine-path": "Path"
+        "requirements": "Системни изисквания"
     },
     "install": {
         "path": "Изберете местоположение за инсталиране"
@@ -244,12 +240,23 @@
     },
     "options": {
         "advanced": {
-            "placeholder": "Тук можете да въведете други аргументи за пускане",
-            "title": "Разширени настройки (променливи на средата):"
+            "key": "Variable Name",
+            "placeHolderKey": "NAME",
+            "placeHolderValue": "E.g.: Path/To/ExtraFiles",
+            "title": "Разширени настройки (променливи на средата):",
+            "value": "Value"
         },
         "gameargs": {
             "placeholder": "Въведете аргументите за пускане тук",
             "title": "Аргументи за играта (които да се изпълнят след командата):"
+        },
+        "wrapper": {
+            "args": "Arguments",
+            "arguments_example": "Arguments example: --arg; --extra-file=\"file-path/ with/spaces\"",
+            "exe": "Wrapper",
+            "placeHolderKey": "New Wrapper",
+            "placeHolderValue": "Seperated by semicolon (;)",
+            "title": "Wrapper command:"
         }
     },
     "other": {

public/locales/ca/translation.json

@@ -161,9 +161,6 @@
         },
         "general": "Sincronitza amb l'EGL si ja tens instal·lat l'Epic Games Laucher en qualsevol altre lloc i vols importar els jocs sense haver de baixar-los de nou.",
         "other": {
-            "part1": "Utilitza les ",
-            "part2": "opcions avançades",
-            "part3": "abans d'iniciar el joc; ",
             "part4": "Utilitza els ",
             "part5": "arguments del joc",
             "part6": " després de l'ordre d'inici, per exemple: ",
@@ -189,8 +186,7 @@
     },
     "infobox": {
         "help": "Ajuda",
-        "requirements": "Requisits del sistema",
-        "wine-path": "Path"
+        "requirements": "Requisits del sistema"
     },
     "install": {
         "path": "Selecciona la ruta d'instal·lació"
@@ -244,12 +240,23 @@
     },
     "options": {
         "advanced": {
-            "placeholder": "Introdueix altres opcions d'inici",
-            "title": "Opcions avançades (variables d'entorn):"
+            "key": "Variable Name",
+            "placeHolderKey": "NAME",
+            "placeHolderValue": "E.g.: Path/To/ExtraFiles",
+            "title": "Opcions avançades (variables d'entorn):",
+            "value": "Value"
         },
         "gameargs": {
             "placeholder": "Introdueix aquí els arguments del llançador",
             "title": "Arguments del joc (s'executaran després de l'ordre):"
+        },
+        "wrapper": {
+            "args": "Arguments",
+            "arguments_example": "Arguments example: --arg; --extra-file=\"file-path/ with/spaces\"",
+            "exe": "Wrapper",
+            "placeHolderKey": "New Wrapper",
+            "placeHolderValue": "Seperated by semicolon (;)",
+            "title": "Wrapper command:"
         }
     },
     "other": {

public/locales/cs/translation.json

@@ -161,9 +161,6 @@
         },
         "general": "Synchronizujte s EGL v případě, že máte funkční instalaci Epic Games Launcher jinde a chcete své hry importovat, abyste se vyhnuli jejich opětovnému stahování.",
         "other": {
-            "part1": "Použijte ",
-            "part2": "Pokročilé možnosti",
-            "part3": "které budou použity před spuštěním hry; ",
             "part4": "Použijte ",
             "part5": "Herní argumenty",
             "part6": " které budou použity při spuštění hry, například: ",
@@ -189,8 +186,7 @@
     },
     "infobox": {
         "help": "Pomoc",
-        "requirements": "Systémové požadavky",
-        "wine-path": "Path"
+        "requirements": "Systémové požadavky"
     },
     "install": {
         "path": "Vyberte cestu instalace"
@@ -244,12 +240,23 @@
     },
     "options": {
         "advanced": {
-            "placeholder": "Sem vložte ostatní možnosti spuštění",
-            "title": "Pokročilé možnosti (Proměnné prostředí):"
+            "key": "Variable Name",
+            "placeHolderKey": "NAME",
+            "placeHolderValue": "E.g.: Path/To/ExtraFiles",
+            "title": "Pokročilé možnosti (Proměnné prostředí):",
+            "value": "Value"
         },
         "gameargs": {
             "placeholder": "Sem vložte argumenty spouštěče",
             "title": "Herní argumenty (Pro spuštění po příkazu):"
+        },
+        "wrapper": {
+            "args": "Arguments",
+            "arguments_example": "Arguments example: --arg; --extra-file=\"file-path/ with/spaces\"",
+            "exe": "Wrapper",
+            "placeHolderKey": "New Wrapper",
+            "placeHolderValue": "Seperated by semicolon (;)",
+            "title": "Wrapper command:"
         }
     },
     "other": {