Merge pull request #20 from davidchalifoux/main

v0.0.10
davidchalifoux · Apr 17, 2024 · 70fb6fc · 70fb6fc
2 parents 9196cb5 + 1a44d14
commit 70fb6fc
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 10 deletions.
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
@@ -15,7 +15,7 @@ struct ElgatoService {
 }
 
 #[tauri::command]
-fn scan() -> Vec<ElgatoService> {
+async fn scan() -> Vec<ElgatoService> {
     let (service_sender, service_receiver) = flume::unbounded::<ElgatoService>();
 
     // Create a daemon

diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "Keylight Commander",
-    "version": "0.0.9"
+    "version": "0.0.10"
   },
   "tauri": {
     "macOSPrivateApi": true,

diff --git a/src/App.tsx b/src/App.tsx
@@ -38,6 +38,9 @@ export const App: React.FC = () => {
   const [isManualAddOpen, { open: openManualAdd, close: closeManualAdd }] =
     useDisclosure(false);
 
+  /** True if the Rust backend is scanning for new services */
+  const [isScanning, setIsScanning] = useState(false);
+
   const [globalBrightness, setGlobalBrightness] = useState<number | null>(null);
   const [globalTemperature, setGlobalTemperature] = useState<number | null>(
     null
@@ -56,16 +59,27 @@ export const App: React.FC = () => {
     count: 0,
   });
 
-  function scanServices() {
-    invoke<ElgatoServiceResponse[]>("scan").then((res): void => {
+  /**
+   * Scans for services and adds them to the service store.
+   */
+  async function scanServices(): Promise<void> {
+    setIsScanning(true);
+
+    try {
+      const res = await invoke<ElgatoServiceResponse[]>("scan");
+
       res.forEach((service) => {
         serviceStore.addService({
           ...service,
           id: nanoid(),
           name: service.full_name.split(".")[0],
         });
       });
-    });
+    } catch (error) {
+      console.error(error);
+    } finally {
+      setIsScanning(false);
+    }
   }
 
   const isEveryLightOn = useMemo(() => {
@@ -136,6 +150,7 @@ export const App: React.FC = () => {
                   variant="subtle"
                   color="gray"
                   onClick={() => scanServices()}
+                  loading={isScanning}
                 >
                   <IconScanEye
                     style={{ width: "70%", height: "70%" }}