Block patching until moonlight is installed

moonlight-mod · Dec 6, 2023 · 8add202 · 8add202
1 parent 03e002b
commit 8add202
Show file tree

Hide file tree

Showing 4 changed files with 59 additions and 11 deletions.
diff --git a/src-tauri/src/commands/update.rs b/src-tauri/src/commands/update.rs
@@ -3,7 +3,7 @@ use crate::{
     types::{Error, MoonlightBranch},
     version::{download_nightly, download_stable, get_nightly_version, get_stable_version},
 };
-use tauri::AppHandle;
+use tauri::{AppHandle, Manager};
 
 #[tauri::command]
 pub fn get_moonlight_branch(app_handle: AppHandle) -> MoonlightBranch {
@@ -39,19 +39,29 @@ pub fn set_moonlight_branch(app_handle: AppHandle, branch: MoonlightBranch) -> R
     Ok(())
 }
 
+fn installed_version_changed(app_handle: &AppHandle, version: Option<String>) {
+    app_handle
+        .emit_all("installed_version_changed", version)
+        .unwrap();
+}
+
 #[tauri::command]
 pub fn get_downloaded_moonlight(app_handle: AppHandle) -> Option<String> {
     let data_dir = get_data_dir(&app_handle);
     if data_dir.is_err() {
+        installed_version_changed(&app_handle, None);
         return None;
     }
 
     let version = data_dir.unwrap().join("version.txt");
     if !version.exists() {
+        installed_version_changed(&app_handle, None);
         return None;
     }
 
-    std::fs::read_to_string(version).ok()
+    let version = std::fs::read_to_string(version).ok();
+    installed_version_changed(&app_handle, version.clone());
+    version
 }
 
 #[tauri::command]
@@ -75,9 +85,12 @@ pub fn download_moonlight(app_handle: AppHandle, branch: MoonlightBranch) -> Res
     std::fs::create_dir_all(&dir)?;
 
     match branch {
-        MoonlightBranch::Stable => download_stable(version_txt, dir)?,
-        MoonlightBranch::Nightly => download_nightly(version_txt, dir)?,
+        MoonlightBranch::Stable => download_stable(version_txt.clone(), dir)?,
+        MoonlightBranch::Nightly => download_nightly(version_txt.clone(), dir)?,
     }
 
+    let installed_version = std::fs::read_to_string(version_txt)?;
+    installed_version_changed(&app_handle, Some(installed_version));
+
     Ok(())
 }
diff --git a/src/components/Patchers.tsx b/src/components/Patchers.tsx
@@ -1,10 +1,14 @@
 import { invoke } from "@tauri-apps/api";
 import { DetectedInstall } from "../types";
 import React from "react";
+import { listen } from "@tauri-apps/api/event";
 
 function Install({ install }: { install: DetectedInstall }) {
   const [patched, setPatched] = React.useState<boolean | null>(null);
   const [locked, setLocked] = React.useState<boolean>(false);
+  const [installedVersion, setInstalledVersion] = React.useState<string | null>(
+    null
+  );
 
   React.useEffect(() => {
     async function updatePatched() {
@@ -15,6 +19,21 @@ function Install({ install }: { install: DetectedInstall }) {
     updatePatched();
   }, []);
 
+  // how the fuck do Tauri events work
+  React.useEffect(() => {
+    let unlisten: () => void = () => {};
+
+    listen("installed_version_changed", (event) => {
+      setInstalledVersion(event.payload as string | null);
+    }).then((unlistenFn) => {
+      unlisten = unlistenFn;
+    });
+
+    return () => {
+      unlisten();
+    };
+  }, []);
+
   async function togglePatch() {
     setLocked(true);
 
@@ -33,12 +52,13 @@ function Install({ install }: { install: DetectedInstall }) {
 
   return (
     <div className="install">
-      <h3>
-        Discord {install.branch}
-      </h3>
+      <h3>Discord {install.branch}</h3>
 
       {install != null && (
-        <button onClick={togglePatch} disabled={locked}>
+        <button
+          onClick={togglePatch}
+          disabled={locked || installedVersion == null}
+        >
           {patched ? "Unpatch" : "Patch"}
         </button>
       )}
@@ -59,7 +79,9 @@ export default function Patchers() {
 
   return (
     <div className="install-list">
-      {installs.map((install, i) => <Install install={install} key={i} />)}
+      {installs.map((install, i) => (
+        <Install install={install} key={i} />
+      ))}
     </div>
   );
 }
diff --git a/src/components/Updater.tsx b/src/components/Updater.tsx
@@ -68,8 +68,11 @@ export default function Updater() {
         </select>
       )}
 
-      {branch != null && currentVersion != null && (
-        <span>Installed version: {preview(currentVersion)}</span>
+      {branch != null && (
+        <span>
+          Installed version:{" "}
+          {currentVersion == null ? "None" : preview(currentVersion)}
+        </span>
       )}
       {branch != null && latestVersion != null && (
         <span>Latest version: {preview(latestVersion)}</span>

diff --git a/src/css/styles.css b/src/css/styles.css
@@ -58,6 +58,16 @@ button:hover {
   background-color: var(--color0);
 }
 
+button:disabled {
+  color: var(--fg);
+  outline: 2px solid var(--purple);
+  background-color: var(--color0);
+}
+
+button:disabled:hover {
+  cursor: not-allowed;
+}
+
 h3 {
   margin: 0;
 }