Fixed QA issues and bugs

intechstudio · Nov 5, 2024 · 01f60d8 · 01f60d8
1 parent cb833c9
commit 01f60d8
Show file tree

Hide file tree

Showing 19 changed files with 112 additions and 121 deletions.
diff --git a/src/renderer/config-blocks/Lookup.svelte b/src/renderer/config-blocks/Lookup.svelte
@@ -52,12 +52,10 @@
   let scriptSegments = [];
   let lookupTable = {};
 
-  $: {
-    lookupTable = createLookupTable(config.script);
-  }
+  $: handleScriptChange($config.script);
 
-  $: if (lookupTable.source || lookupTable.pairs.length) {
-    sendData();
+  function handleScriptChange(script) {
+    lookupTable = createLookupTable(script);
   }
 
   let suggestions = [];
@@ -78,6 +76,7 @@
       array.push(pair.output);
     });
 
+    console.log(lookupTable);
     array = [lookupTable.source, ...array];
 
     const script = Script.toScript({
@@ -115,15 +114,13 @@
 
   function addNewLine() {
     lookupTable.pairs = [...lookupTable.pairs, ["", ""]];
+    sendData();
   }
 
   function removeLine(i) {
     lookupTable.pairs.splice(i, 1);
     lookupTable.pairs = [...lookupTable.pairs];
   }
-
-  let suggestionElement1 = undefined;
-  let suggestionElement2 = undefined;
 </script>
 
 <config-lookup
@@ -138,7 +135,7 @@
       return new Validator(e).NotEmpty().Result();
     }}
     on:input={(e) => {
-      lookupTable.source = e.detail;
+      sendData();
     }}
     on:validator={(e) => {
       const data = e.detail;
@@ -209,7 +206,8 @@
     {suggestions}
     bind:value={lookupTable.destination}
     on:input={(e) => {
-      lookupTable.destination = e.detail;
+      //lookupTable.destination = e.detail;
+      sendData();
     }}
     validator={(e) => {
       return new Validator(e).NotEmpty().Result();

diff --git a/src/renderer/config-blocks/Macro.svelte b/src/renderer/config-blocks/Macro.svelte
@@ -89,7 +89,7 @@
   });
 
   $: {
-    scriptToKeyList({ script: config.script });
+    scriptToKeyList({ script: $config.script });
   }
 
   function change_layout() {
@@ -395,9 +395,7 @@
   }
 </script>
 
-<div
-  class="{$$props.class} flex w-full flex-col px-4 py-2 gap-2 pointer-events-auto"
->
+<div class="flex w-full flex-col px-4 py-2 gap-2 pointer-events-auto">
   <div class="flex flex-col">
     <div class="flex flex-row justify-between mb-2">
       <div class="text-gray-500 text-sm truncate">Macro Input Field</div>

diff --git a/src/renderer/config-blocks/SettingsButton.svelte b/src/renderer/config-blocks/SettingsButton.svelte
@@ -118,7 +118,6 @@
     bind:value={bmo}
     suggestions={suggestions[0]}
     on:input={(e) => {
-      bmo = e.detail;
       sendData();
     }}
     validator={(e) => {
@@ -145,7 +144,6 @@
           : new Validator(e).Result();
       }}
       on:input={(e) => {
-        bmi = e.detail;
         sendData();
       }}
       on:validator={(e) => {
@@ -167,7 +165,6 @@
           : new Validator(e).Result();
       }}
       on:input={(e) => {
-        bma = e.detail;
         sendData();
       }}
       on:validator={(e) => {

diff --git a/src/renderer/config-blocks/SettingsEncoder.svelte b/src/renderer/config-blocks/SettingsEncoder.svelte
@@ -44,8 +44,10 @@
 
   const whatsInParenthesis = /\(([^)]+)\)/;
 
-  $: {
-    const arr = config.script.split("self:").slice(1);
+  $: handleScriptChange($config.script);
+
+  function handleScriptChange(script) {
+    const arr = script.split("self:").slice(1);
 
     const extractParam = (index) => {
       const param = whatsInParenthesis.exec(arr[index]);
@@ -130,7 +132,7 @@
         return new Validator(e).NotEmpty().Result();
       }}
       on:input={(e) => {
-        emo = e.detail;
+        //emo = e.detail;
       }}
       on:validator={(e) => {
         const data = e.detail;
@@ -149,7 +151,7 @@
         return new Validator(e).NotEmpty().Result();
       }}
       on:input={(e) => {
-        ev0 = e.detail;
+        //ev0 = e.detail;
       }}
       on:validator={(e) => {
         const data = e.detail;
@@ -174,7 +176,7 @@
           : new Validator(e).Result();
       }}
       on:input={(e) => {
-        emi = e.detail;
+        //emi = e.detail;
       }}
       on:validator={(e) => {
         const data = e.detail;
@@ -195,7 +197,7 @@
           : new Validator(e).Result();
       }}
       on:input={(e) => {
-        ema = e.detail;
+        //ema = e.detail;
       }}
       on:validator={(e) => {
         const data = e.detail;
@@ -218,7 +220,7 @@
         : new Validator(e).Result();
     }}
     on:input={(e) => {
-      ese = e.detail;
+      //ese = e.detail;
     }}
     on:validator={(e) => {
       const data = e.detail;

diff --git a/src/renderer/config-blocks/SettingsEndless.svelte b/src/renderer/config-blocks/SettingsEndless.svelte
@@ -44,8 +44,10 @@
 
   const whatsInParenthesis = /\(([^)]+)\)/;
 
-  $: {
-    const arr = config.script.split("self:").slice(1);
+  $: handleScriptChange($config.script);
+
+  function handleScriptChange(script) {
+    const arr = script.split("self:").slice(1);
 
     const extractParam = (index) => {
       const param = whatsInParenthesis.exec(arr[index]);
@@ -126,7 +128,7 @@
       return new Validator(e).NotEmpty().Result();
     }}
     on:input={(e) => {
-      epmo = e.detail;
+      //epmo = e.detail;
     }}
     on:validator={(e) => {
       const data = e.detail;
@@ -145,7 +147,7 @@
       return new Validator(e).NotEmpty().Result();
     }}
     on:input={(e) => {
-      epv0 = e.detail;
+      //epv0 = e.detail;
     }}
     on:validator={(e) => {
       const data = e.detail;
@@ -160,15 +162,15 @@
   <div class="w-full grid grid-flow-col auto-cols-fr gap-2">
     <MeltCombo
       title={"Min"}
-      disabled={minMaxEnabled}
+      disabled={!minMaxEnabled}
       bind:value={epmi}
       validator={(e) => {
         return minMaxEnabled
           ? new Validator(e).NotEmpty().Result()
           : new Validator(e).Result();
       }}
       on:input={(e) => {
-        epmi = e.detail;
+        //epmi = e.detail;
       }}
       on:validator={(e) => {
         const data = e.detail;
@@ -189,7 +191,7 @@
           : new Validator(e).Result();
       }}
       on:input={(e) => {
-        epma = e.detail;
+        //epma = e.detail;
       }}
       on:validator={(e) => {
         const data = e.detail;
@@ -213,7 +215,7 @@
         : new Validator(e).Result();
     }}
     on:input={(e) => {
-      epse = e.detail;
+      //epse = e.detail;
     }}
     on:validator={(e) => {
       const data = e.detail;

diff --git a/src/renderer/config-blocks/SettingsPotmeter.svelte b/src/renderer/config-blocks/SettingsPotmeter.svelte
@@ -42,8 +42,10 @@
 
   const whatsInParenthesis = /\(([^)]+)\)/;
 
-  $: {
-    const arr = config.script.split("self:").slice(1);
+  $: handleScriptChange($config.script);
+
+  function handleScriptChange(script) {
+    const arr = script.split("self:").slice(1);
 
     const extractParam = (index) => {
       const param = whatsInParenthesis.exec(arr[index]);
@@ -118,7 +120,7 @@
       return new Validator(e).NotEmpty().Result();
     }}
     on:input={(e) => {
-      pmo = e.detail;
+      //pmo = e.detail;
     }}
     on:validator={(e) => {
       const data = e.detail;
@@ -142,7 +144,7 @@
           : new Validator(e).Result();
       }}
       on:input={(e) => {
-        pmi = e.detail;
+        //pmi = e.detail;
       }}
       on:validator={(e) => {
         const data = e.detail;
@@ -162,7 +164,7 @@
         return new Validator(e).NotEmpty().Result();
       }}
       on:input={(e) => {
-        pma = e.detail;
+        //pma = e.detail;
       }}
       on:validator={(e) => {
         const data = e.detail;

diff --git a/src/renderer/config-blocks/TimerStop.svelte b/src/renderer/config-blocks/TimerStop.svelte
@@ -43,14 +43,13 @@
 
   const dispatch = createEventDispatcher();
 
-  const whatsInParenthesis = /\(([^)]+)\)/;
+  const whatsInParenthesis = /gtp\(([^"]*)\)/;
   let scriptValue = "";
 
-  $: handleConfigChange(config.script);
-
-  function handleConfigChange(config) {
-    let param1 = whatsInParenthesis.exec(config.script);
+  $: handleScriptChange($config.script);
 
+  function handleScriptChange(script) {
+    let param1 = whatsInParenthesis.exec(script);
     if (param1 !== null) {
       if (param1.length > 0) {
         scriptValue = param1[1];

diff --git a/src/renderer/config-blocks/VarGlobal.svelte b/src/renderer/config-blocks/VarGlobal.svelte
@@ -63,7 +63,7 @@
   // config.script cannot be undefined
   $: {
     // this works differently from normal _utils...
-    scriptSegments = globalsToConfig({ script: config.script });
+    scriptSegments = globalsToConfig({ script: $config.script });
   }
 
   function saveChangesOnInput(e, i, k) {
@@ -242,7 +242,7 @@
           <div class="w-full h-full bg-secondary">
             {#key rerenderList}
               <LineEditor
-                on:output={(e) => {
+                on:input={(e) => {
                   saveChangesOnInput(e.detail.script, i, "value");
                 }}
                 action={config}

diff --git a/src/renderer/config-blocks/VarLocals.svelte b/src/renderer/config-blocks/VarLocals.svelte
@@ -63,7 +63,7 @@
   // config.script cannot be undefined
   $: {
     // this works differently from normal _utils...
-    scriptSegments = localsToConfig({ script: config.script });
+    scriptSegments = localsToConfig({ script: $config.script });
   }
 
   function saveChangesOnInput(e, i, k) {
@@ -245,7 +245,7 @@
           <div class="w-full h-full bg-secondary">
             {#key rerenderList}
               <LineEditor
-                on:output={(e) => {
+                on:input={(e) => {
                   saveChangesOnInput(e.detail.script, i, "value");
                 }}
                 action={config}

diff --git a/src/renderer/config-blocks/VarSelf.svelte b/src/renderer/config-blocks/VarSelf.svelte
@@ -63,7 +63,7 @@
   // config.script cannot be undefined
   $: {
     // this works differently from normal _utils...
-    scriptSegments = selfsToConfig({ script: config.script });
+    scriptSegments = selfsToConfig({ script: $config.script });
   }
 
   function saveChangesOnInput(e, i, k) {
@@ -246,7 +246,7 @@
           <div class="w-full h-full bg-secondary">
             {#key rerenderList}
               <LineEditor
-                on:output={(e) => {
+                on:input={(e) => {
                   saveChangesOnInput(e.detail.script, i, "value");
                 }}
                 action={config}

diff --git a/src/renderer/config-blocks/components/MeltCombo.svelte b/src/renderer/config-blocks/components/MeltCombo.svelte
@@ -72,7 +72,7 @@
     }
 
     value = input;
-
+    inputValue.set(value);
     dispatch("validator", { isError });
     dispatch("input", postProcessor(input));
   }