From e1fddcc99cd059e5a048dd384f94385124c10289 Mon Sep 17 00:00:00 2001
From: ReenigneArcher <42013603+ReenigneArcher@users.noreply.github.com>
Date: Mon, 27 Mar 2023 15:55:21 -0400
Subject: [PATCH] versioning: fix dirty commit notifications (#1084)

---
 src_assets/common/assets/web/index.html | 27 +++++++++++++++----------
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/src_assets/common/assets/web/index.html b/src_assets/common/assets/web/index.html
index 506d302d..217615e8 100644
--- a/src_assets/common/assets/web/index.html
+++ b/src_assets/common/assets/web/index.html
@@ -6,13 +6,13 @@
     <div class="card-body" v-if="version">
       <h2>Version {{version}}</h2>
       <br />
-      <div class="alert alert-success" v-if="version.indexOf('dirty') !== -1">
-        Thank you for helping to make Sunshine a better software! 🌇
-      </div>
       <div v-if="loading">
         Loading Latest Release...
       </div>
-      <div v-else-if="!nightlyBuildAvailable && !stableBuildAvailable">
+      <div class="alert alert-success" v-if="runningDirtyBuild">
+        Thank you for helping to make Sunshine a better software! 🌇
+      </div>
+      <div v-else-if="!nightlyBuildAvailable && !stableBuildAvailable && !runningDirtyBuild">
         <div class="alert alert-success">
           You're running the latest version of Sunshine
         </div>
@@ -97,18 +97,19 @@
       this.loading = false;
     },
     computed: {
+      runningDirtyBuild() {
+        return this.buildVersionIsDirty()
+      },
       stableBuildAvailable() {
         // If we can't get versions, return false
         if (!this.githubVersion || !this.version) return false;
-        // If built with dirty git tree, return false
-        if (this.version.indexOf("dirty") !== -1) return false;
         // Get the GitHub version tag
         let v = this.githubVersion.name;
         // If the version starts with a v, remove it
         if (v.indexOf("v") === 0) v = v.substring(1);
 
-        // if nightly, we do an additional check to make sure its an actual upgrade.
-        if (this.buildVersionIsNightly()) {
+        // if nightly or dirty, we do an additional check to make sure it's an actual upgrade.
+        if (this.buildVersionIsNightly() || this.buildVersionIsDirty()) {
           const stableVersion = this.version.split('.').slice(0, 3).join('.');
           return this.githubVersion.tag_name.substring(1) > stableVersion;
         }
@@ -121,7 +122,7 @@
         // This is important to ensure the UI does not try to load undefined values.
         if (!this.nightlyData || this.buildVersionIsStable()) return false;
         // If built with dirty git tree, return false
-        if (this.version?.indexOf("dirty") !== -1) return false;
+        if (this.buildVersionIsDirty()) return false;
         // Get the commit hash
         let commit = this.version?.split(".").pop();
         // return true if the commit hash is different, otherwise false
@@ -129,11 +130,15 @@
       }
     },
     methods: {
-      buildVersionIsStable() {
-        return this.version?.split(".").length === 3;
+      buildVersionIsDirty() {
+        return this.version?.split(".").length === 5 &&
+          this.version.indexOf("dirty") !== -1
       },
       buildVersionIsNightly() {
         return this.version?.split(".").length === 4
+      },
+      buildVersionIsStable() {
+        return this.version?.split(".").length === 3
       }
     }
   });