From 044c756fe8aa839d1c909546bb2f830e3645d1d4 Mon Sep 17 00:00:00 2001
From: alexkar598 <25136265+alexkar598@users.noreply.github.com>
Date: Fri, 28 Jun 2024 16:30:52 -0400
Subject: [PATCH] Displays active version

---
 src/app/panels/byond/byond.component.html | 23 ++++++++++++++---------
 src/vm/byond.service.ts                   | 13 +++++++++----
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/app/panels/byond/byond.component.html b/src/app/panels/byond/byond.component.html
index 3593113..387e856 100644
--- a/src/app/panels/byond/byond.component.html
+++ b/src/app/panels/byond/byond.component.html
@@ -27,15 +27,20 @@
 
 <ul>
   @for (version of byondService.versions; track version[0]) {
-    {{ version[0] }} ({{ statusToMessage[version[1]] }})
-    <button
-      tuiButton
-      appearance="primary"
-      size="xs"
-      (click)="byondService.setActive(version[0])"
-    >
-      Set active
-    </button>
+    {{ version[0] }}
+    @if (version[0] === byondService.activeVersion) {
+      (Active)
+    } @else {
+      ({{ statusToMessage[version[1]] }})
+      <button
+        tuiButton
+        appearance="primary"
+        size="xs"
+        (click)="byondService.setActive(version[0])"
+      >
+        Set active
+      </button>
+    }
     <button
       tuiButton
       appearance="secondary-destructive"
diff --git a/src/vm/byond.service.ts b/src/vm/byond.service.ts
index 67d3d1a..b4409c7 100644
--- a/src/vm/byond.service.ts
+++ b/src/vm/byond.service.ts
@@ -19,7 +19,12 @@ export enum VersionStatus {
 export class ByondService {
   public latestVersion: Promise<{ beta?: string; stable: string }>;
   private lock = new SharedLock();
-  private active: string | null = null;
+
+  private _activeVersion: string | null = null;
+  public get activeVersion() {
+    return this._activeVersion;
+  }
+
   public deleteVersion = this.lock.wrap(async (version: string) => {
     const installs = await this.getByondFolder();
     await installs.removeEntry(version.toString());
@@ -28,7 +33,7 @@ export class ByondService {
       '/bin/rm',
       `-rf\0/var/lib/byond/${version}.zip\0/var/lib/byond/${version}`,
     );
-    if (this.active === version) this.active = null;
+    if (this._activeVersion === version) this._activeVersion = null;
   });
 
   private _versions = new Map<string, VersionStatus>();
@@ -58,7 +63,7 @@ export class ByondService {
           `/mnt/host/byond/${version}.zip`,
         );
         this._versions.set(version, VersionStatus.Loaded);
-        this.active = version;
+        this._activeVersion = version;
       } catch (e) {
         this._versions.set(version, VersionStatus.Fetched);
         await this.commandQueueService.runToCompletion(
@@ -131,7 +136,7 @@ export class ByondService {
 
   public useActive<T extends (path: string | null) => any>(fn: T) {
     this.lock.run(() =>
-      fn(this.active ? `/var/lib/byond/${this.active}/` : null),
+      fn(this._activeVersion ? `/var/lib/byond/${this._activeVersion}/` : null),
     );
   }
 }