From 89446ad0a47d9d61074fb3ad47c44ac2894a82e5 Mon Sep 17 00:00:00 2001
From: Artemiy Davydov <hi@fax1ty.dev>
Date: Tue, 12 Nov 2024 20:32:44 +0300
Subject: [PATCH] little windows modifications

---
 .github/workflows/publish.yml | 10 +++++-----
 package.json                  |  2 +-
 src-tauri/Cargo.lock          |  2 +-
 src-tauri/Cargo.toml          |  6 +++---
 src-tauri/tauri.conf.json     |  2 +-
 src/app.tsx                   | 34 +++++++++++++++++-----------------
 src/services/api/emulator.ts  |  2 +-
 src/services/execute.ts       | 20 +++++++++-----------
 8 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index 947954d..57a991e 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -12,11 +12,11 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # - platform: "macos-latest" # for Arm based macs (M1 and above).
-          #   args: "--target aarch64-apple-darwin"
-          # - platform: "macos-latest" # for Intel based macs.
-          #   args: "--target x86_64-apple-darwin"
-          # - platform: "ubuntu-22.04" # for Tauri v1 you could replace this with ubuntu-20.04.
+          - platform: "macos-latest" # for Arm based macs (M1 and above).
+            args: "--target aarch64-apple-darwin"
+          - platform: "macos-latest" # for Intel based macs.
+            args: "--target x86_64-apple-darwin"
+          # - platform: "ubuntu-22.04"
           #   args: ""
           - platform: "windows-latest"
             args: ""
diff --git a/package.json b/package.json
index 6a131f3..5c207b6 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "emu",
   "private": true,
-  "version": "0.1.0",
+  "version": "0.1.1",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 94ee0d5..9000708 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -696,7 +696,7 @@ checksum = "4ef6b89e5b37196644d8796de5268852ff179b44e96276cf4290264843743bb7"
 
 [[package]]
 name = "emu"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "serde",
  "serde_json",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index e080f00..d02f0e8 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,8 +1,8 @@
 [package]
 name = "emu"
-version = "0.1.0"
-description = "A Tauri App"
-authors = ["you"]
+version = "0.1.1"
+description = "Manage emulators with ease"
+authors = ["fax1ty"]
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index d764c02..21d7c14 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "emu",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "identifier": "emu.app",
   "build": {
     "beforeDevCommand": "bun run dev",
diff --git a/src/app.tsx b/src/app.tsx
index 60cb8dc..f5906ce 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -31,8 +31,6 @@ function App() {
     await window.close();
   };
 
-  if (!emulators) return null;
-
   return (
     <>
       <nav
@@ -62,20 +60,22 @@ function App() {
       </nav>
 
       <main className="flex-1 px-4 pb-2 py-1">
-        <ul>
-          {Object.values(emulators).map((emulator, i) => (
-            <EmulatorListItem
-              key={i}
-              emulator={emulator}
-              onOptionsButtonPressed={(event) => {
-                setSelectedEmulator(emulator.name);
-                show({
-                  event,
-                });
-              }}
-            />
-          ))}
-        </ul>
+        {emulators && (
+          <ul>
+            {Object.values(emulators).map((emulator, i) => (
+              <EmulatorListItem
+                key={i}
+                emulator={emulator}
+                onOptionsButtonPressed={(event) => {
+                  setSelectedEmulator(emulator.name);
+                  show({
+                    event,
+                  });
+                }}
+              />
+            ))}
+          </ul>
+        )}
       </main>
 
       <Menu
@@ -87,7 +87,7 @@ function App() {
         <Item
           disabled={
             !selectedEmulator ||
-            emulators[selectedEmulator]?.state !== "offline"
+            emulators?.[selectedEmulator]?.state !== "offline"
           }
           onClick={async () => {
             if (!selectedEmulator) return;
diff --git a/src/services/api/emulator.ts b/src/services/api/emulator.ts
index 2b6907d..c957b37 100644
--- a/src/services/api/emulator.ts
+++ b/src/services/api/emulator.ts
@@ -39,7 +39,7 @@ export const getEmulatorProps = async (id: string) => {
 };
 
 export const getEmulatorFeatures = async (id: string) => {
-  const output = await adb("shell pm list features");
+  const output = await adb(`-s ${id} shell pm list features`);
   return output.split("\n");
 };
 
diff --git a/src/services/execute.ts b/src/services/execute.ts
index a6894eb..5da8d12 100644
--- a/src/services/execute.ts
+++ b/src/services/execute.ts
@@ -6,34 +6,32 @@ const getAndroidHomePrefix = () => {
 
   switch (currentPlatfrom) {
     case "windows":
-      return "%ANDROID_HOME";
+      return "%ANDROID_HOME%";
 
     default:
       return "$ANDROID_HOME";
   }
 };
 
-const makeCommand = (executable: string, ...args: string[]) => {
+const makeCommand = (executable: string, args: string) => {
   const currentPlatfrom = platform();
 
   switch (currentPlatfrom) {
     case "windows":
-      return Command.create("cmd.exe", [
-        "/c",
-        executable + ".exe " + args.join(" "),
-      ]);
+      const command = ["/c", `${executable}.exe ${args}`];
+      return Command.create("cmd.exe", command);
 
     default:
-      return Command.create("sh", ["-c", executable + " " + args.join(" ")]);
+      return Command.create("sh", ["-c", `${executable} ${args}`]);
   }
 };
 
 export const execute = async (
   executable: string,
-  args: string[] = [],
+  args: string,
   options?: SpawnOptions & { timeout?: number; verbose?: boolean }
 ) => {
-  const cmd = makeCommand(executable, ...args);
+  const cmd = makeCommand(executable, args);
   cmd.stdout.on("data", (v) => {
     if (options?.verbose) console.info(executable, args, v);
   });
@@ -49,10 +47,10 @@ export const execute = async (
 
 export const emulator = (command: string) => {
   const prefix = getAndroidHomePrefix();
-  return execute(`${prefix}/emulator/emulator`, [command]);
+  return execute(`${prefix}/emulator/emulator`, command);
 };
 
 export const adb = (command: string) => {
   const prefix = getAndroidHomePrefix();
-  return execute(`${prefix}/platform-tools/adb`, [command]);
+  return execute(`${prefix}/platform-tools/adb`, command);
 };