From dc81d8fceb6b7e2afc3e10d57a85978bd3f07dcd Mon Sep 17 00:00:00 2001
From: Toru the Red Fox <needforspeedfun@gmail.com>
Date: Wed, 27 Jul 2022 15:50:46 +0100
Subject: [PATCH] configurable envver

---
 .../ConfigurationCategories/CustomizationConfiguration.cs | 2 ++
 ProjectLighthouse/Configuration/ServerConfiguration.cs    | 2 +-
 ProjectLighthouse/Helpers/VersionHelper.cs                | 8 ++++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ProjectLighthouse/Configuration/ConfigurationCategories/CustomizationConfiguration.cs b/ProjectLighthouse/Configuration/ConfigurationCategories/CustomizationConfiguration.cs
index 027c1753..d552eb1c 100644
--- a/ProjectLighthouse/Configuration/ConfigurationCategories/CustomizationConfiguration.cs
+++ b/ProjectLighthouse/Configuration/ConfigurationCategories/CustomizationConfiguration.cs
@@ -3,4 +3,6 @@ namespace LBPUnion.ProjectLighthouse.Configuration.ConfigurationCategories;
 public class CustomizationConfiguration
 {
     public string ServerName { get; set; } = "Project Lighthouse";
+    public string EnvironmentName { get; set; } = "lighthouse";
+    public bool UseNumericRevisionNumber { get; set; } = false;
 }
\ No newline at end of file
diff --git a/ProjectLighthouse/Configuration/ServerConfiguration.cs b/ProjectLighthouse/Configuration/ServerConfiguration.cs
index 41618860..6a8f08fd 100644
--- a/ProjectLighthouse/Configuration/ServerConfiguration.cs
+++ b/ProjectLighthouse/Configuration/ServerConfiguration.cs
@@ -23,7 +23,7 @@ public class ServerConfiguration
     // You can use an ObsoleteAttribute instead. Make sure you set it to error, though.
     //
     // Thanks for listening~
-    public const int CurrentConfigVersion = 8;
+    public const int CurrentConfigVersion = 9;
 
     #region Meta
 
diff --git a/ProjectLighthouse/Helpers/VersionHelper.cs b/ProjectLighthouse/Helpers/VersionHelper.cs
index 495778a8..44961dad 100644
--- a/ProjectLighthouse/Helpers/VersionHelper.cs
+++ b/ProjectLighthouse/Helpers/VersionHelper.cs
@@ -8,11 +8,12 @@ public static class VersionHelper
 {
     static VersionHelper()
     {
+        string rawRevision = "<unknown>";
         try
         {
             CommitHash = ResourceHelper.ReadManifestFile("gitVersion.txt");
             Branch = ResourceHelper.ReadManifestFile("gitBranch.txt");
-            string rawRevision = ResourceHelper.ReadManifestFile("gitRevCount.txt");
+            rawRevision = ServerConfiguration.Instance.Customization.UseNumericRevisionNumber ? ResourceHelper.ReadManifestFile("gitRevCount.txt") : $"{CommitHash}_{Build}";
             Revision = (Branch == "main") ? $"r{rawRevision}" : $"{Branch}_r{rawRevision}";
 
             string remotesFile = ResourceHelper.ReadManifestFile("gitRemotes.txt");
@@ -50,7 +51,6 @@ public static class VersionHelper
                 "Please make sure you are properly disclosing the source code to any users who may be using this instance.",
                 LogArea.Startup
             );
-            string rawRevision = ResourceHelper.ReadManifestFile("gitRevCount.txt");
             Revision = $"{Branch}-dirty_r{rawRevision}";
             CanCheckForUpdates = false;
         }
@@ -59,8 +59,8 @@ public static class VersionHelper
     public static string CommitHash { get; set; }
     public static string Branch { get; set; }
     public static string Revision { get; set; }
-    public static string FullVersion => $"Project Lighthouse {Branch}@{CommitHash} {Build} ({ServerConfiguration.Instance.Customization.ServerName} {Revision})";
-    public static string EnvVer => $"{ServerConfiguration.Instance.Customization.ServerName} {Revision}";
+    public static string EnvVer => $"{ServerConfiguration.Instance.Customization.EnvironmentName} {Revision}";
+    public static string FullVersion => $"Project Lighthouse {Branch}@{CommitHash} {Build} ({EnvVer})";
     public static bool IsDirty => CommitHash.EndsWith("-dirty") || CommitsOutOfDate != 1 || CommitHash == "invalid" || Branch == "invalid";
     public static int CommitsOutOfDate { get; set; }
     public static bool CanCheckForUpdates { get; set; }