fix: diff syntax error

auto select the only controller
MaaXYZ · Nov 2, 2023 · 1efc9d7 · 1efc9d7
1 parent 4880c69
commit 1efc9d7
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/app/renderer/src/stores/controller.ts b/app/renderer/src/stores/controller.ts
@@ -74,6 +74,15 @@ function init_from(handle: ControllerHandle) {
   return Controller.init_from(handle, handles.value[handle]!.cb)
 }
 
+function only_one() {
+  const ks = Object.keys(handles.value)
+  if (ks.length === 1) {
+    return ks[0] as ControllerHandle
+  } else {
+    return null
+  }
+}
+
 export const useController = {
   handles,
 
@@ -83,5 +92,6 @@ export const useController = {
   disconnect_all,
   find,
   info,
-  init_from
+  init_from,
+  only_one
 }
diff --git a/app/renderer/src/stores/instance.ts b/app/renderer/src/stores/instance.ts
@@ -54,6 +54,7 @@ watch(
 async function create_with(cfg: InstanceSaveInfo) {
   const inst = await Instance.init()
   const res = await Resource.init()
+  const ctrl = useController.only_one()
   handles.value[inst.handle] = {
     ...cfg,
     runtime: {
@@ -64,7 +65,8 @@ async function create_with(cfg: InstanceSaveInfo) {
       resource: {
         handle: res.handle,
         cb: res.cbId
-      }
+      },
+      controller: ctrl
     }
   }
   return inst
@@ -297,7 +299,11 @@ async function run(
     merge(finalDiff, entry.provide ?? {})
 
     console.log(entry.task, finalDiff)
-    await hinst.post_task(entry.task, finalDiff).wait()
+    await hinst
+      .post_task(entry.task, {
+        diff_task: finalDiff
+      })
+      .wait()
   }
 
   output.state = RunningState.Idle

diff --git a/app/renderer/src/views/Devices/DevicesSide.vue b/app/renderer/src/views/Devices/DevicesSide.vue
@@ -51,7 +51,7 @@ function dropSaved(serial: string) {
     </div>
     <NCard :title="t('device.side.connected')" :theme-overrides="{ color: 'transparent' }">
       <div class="flex flex-col gap-2">
-        <div class="flex gap-2" v-for="(item, idx) of connectDevices" :key="idx">
+        <div class="flex gap-2 items-center" v-for="(item, idx) of connectDevices" :key="idx">
           <NButton
             @click="curDevice = item"
             secondary
@@ -96,7 +96,7 @@ function dropSaved(serial: string) {
     </NCard>
     <NCard :title="t('device.side.disconnected')" :theme-overrides="{ color: 'transparent' }">
       <div class="flex flex-col gap-2">
-        <div class="flex gap-2" v-for="(item, idx) of foundDevices" :key="idx">
+        <div class="flex gap-2 items-center" v-for="(item, idx) of foundDevices" :key="idx">
           <NButton
             @click="curDevice = idx"
             secondary

diff --git a/pkgs/type/src/handle.ts b/pkgs/type/src/handle.ts
@@ -26,7 +26,7 @@ export type InstanceSaveInfo = {
 
 export type InstanceHandleInfo = InstanceSaveInfo & {
   runtime: {
-    controller?: ControllerHandle
+    controller?: ControllerHandle | null
     resource: {
       handle: ResourceHandle
       cb: string