Backend notice and quotes fix

SheffeyG · Jan 13, 2024 · c7dbc23 · c7dbc23
1 parent 656c996
commit c7dbc23
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 25 deletions.
diff --git a/src/utils/backend.tsx b/src/utils/backend.tsx
@@ -1,4 +1,4 @@
-import { FileSelectionType, ServerAPI } from "decky-frontend-lib"
+import { FileSelectionType, ServerAPI, ToastData } from "decky-frontend-lib"
 
 export type FilePickerFilter = RegExp | ((file: File) => boolean) | undefined;
 
@@ -49,4 +49,15 @@ export class Backend {
       ).then(resolve, () => reject('User Canceled'));
     });
   };
+
+  static sendNotice = (msg: string) => {
+    const toastData: ToastData = {
+      title: "CheatDeck",
+      body: msg,
+      duration: 1500,
+      playSound: true,
+      showToast: true
+    }
+    Backend.serverAPI.toaster.toast(toastData);
+  }
 }
diff --git a/src/utils/options.tsx b/src/utils/options.tsx
@@ -34,7 +34,7 @@ export class Options {
     for (const key in this.options) {
       if (this.options.hasOwnProperty(key) && this.options[key]) {
         const value = this.options[key];
-        optionsString += `${key}="${value.replace(/^"(.*)"$/, '\$1')}" `;
+        optionsString += `${key}=${value} `;
       }
     }
     if (optionsString) optionsString += '%command%'

diff --git a/src/views/Advanced.tsx b/src/views/Advanced.tsx
@@ -2,7 +2,6 @@ import {
   AppDetails,
   DialogButton,
   Focusable,
-  ToastData,
   ToggleField,
 } from "decky-frontend-lib"
 import { VFC, useEffect, useState } from "react"
@@ -24,14 +23,7 @@ const Advanced: VFC<{ appid: number }> = ({ appid }) => {
 
   const saveOptions = () => {
     SteamClient.Apps.SetAppLaunchOptions(appid, options.getOptionsString());
-    const toastData: ToastData = {
-      title: "CheatDeck",
-      body: "Save game settings suscess.",
-      duration: 1500,
-      playSound: true,
-      showToast: true
-    }
-    Backend.serverAPI.toaster.toast(toastData);
+    Backend.sendNotice("Advanced settings saved.");
   }
 
 
@@ -60,7 +52,7 @@ const Advanced: VFC<{ appid: number }> = ({ appid }) => {
         onChange={(enable: boolean) => {
           setOptions((prevOptions) => {
             const value = enable ? 'gpl' : '';
-            prevOptions.setOptionValue('RADV_PERFTEST', value);
+            prevOptions.setOptionValue('RADV_PERFTEST', `"${value}"`);
             return prevOptions;
           });
         }}

diff --git a/src/views/Normal.tsx b/src/views/Normal.tsx
@@ -5,7 +5,6 @@ import {
   Field,
   Focusable,
   TextField,
-  ToastData,
   ToggleField,
 } from "decky-frontend-lib"
 import { VFC, useEffect, useState } from "react"
@@ -32,23 +31,16 @@ const Normal: VFC<{ appid: number }> = ({ appid }) => {
   }, [])
 
   const handleBrowse = async () => {
-    const filePickerRes = await Backend.openFilePicker("/home/deck", ["exe"]);
+    const filePickerRes = await Backend.openFilePicker("/home/deck", ["exe", "EXE"]);
     const cheatPath = filePickerRes.path;
     const newOptions = new Options(options.getOptionsString());
-    newOptions.setOptionValue('PROTON_REMOTE_DEBUG_CMD', cheatPath);
+    newOptions.setOptionValue('PROTON_REMOTE_DEBUG_CMD', `"${cheatPath}"`);
     setOptions(newOptions);
   };
 
   const saveOptions = () => {
     SteamClient.Apps.SetAppLaunchOptions(appid, options.getOptionsString());
-    const toastData: ToastData = {
-      title: "CheatDeck",
-      body: "Save game settings suscess.",
-      duration: 1500,
-      playSound: true,
-      showToast: true
-    }
-    Backend.serverAPI.toaster.toast(toastData);
+    Backend.sendNotice("Normal settings saved.");
   }
 
 
@@ -149,7 +141,7 @@ const Normal: VFC<{ appid: number }> = ({ appid }) => {
             onChange={(e) => {
               e.persist();
               const updatedOptions = new Options(options.getOptionsString());
-              updatedOptions.setOptionValue('LANG', e.target.value);
+              updatedOptions.setOptionValue('LANG', `"${e.target.value}"`);
               setOptions(updatedOptions);
             }}
           />
@@ -159,7 +151,7 @@ const Normal: VFC<{ appid: number }> = ({ appid }) => {
             onChange={(v) => {
               // logger.info(`selected: ${JSON.stringify(v)}`);
               const updatedOptions = new Options(options.getOptionsString());
-              updatedOptions.setOptionValue('LANG', v.data);
+              updatedOptions.setOptionValue('LANG', `"${v.data}"`);
               setOptions(updatedOptions);
             }}
             strDefaultLabel="Default"