move color to setting, update signing cert

win-acme · Feb 2, 2024 · f2a2cfe · f2a2cfe
1 parent 12a6c29
commit f2a2cfe
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/build/codesigning.pfx b/build/codesigning.pfx
diff --git a/build/sign-exe.ps1 b/build/sign-exe.ps1
@@ -4,7 +4,8 @@ New-SelfSignedCertificate `
     -CertStoreLocation cert:\currentuser\my `
     -Subject "CN=WACS" `
     -KeyUsage DigitalSignature `
-    -Type CodeSigning
+    -Type CodeSigning `
+	-NotAfter (Get-Date).AddMonths(24) 
 #>
 
 param (

diff --git a/src/main.lib/Configuration/Settings/Settings.cs b/src/main.lib/Configuration/Settings/Settings.cs
@@ -66,6 +66,18 @@ public class UiSettings
         /// How console tekst should be encoded
         /// </summary>
         public string? TextEncoding { get; set; }
+        /// <summary>
+        /// Which colors should be applied
+        /// </summary>
+        public ColorSettings? Color { get; set; }
+    }
+
+    /// <summary>
+    /// Colors
+    /// </summary>
+    public class ColorSettings
+    {
+        public string? Background { get; set; }
     }
 
     public class AcmeSettings

diff --git a/src/main.lib/Services/InputService.cs b/src/main.lib/Services/InputService.cs
@@ -41,7 +41,7 @@ public void CreateSpace()
             }
         }
 
-        private static void WriteLine(string? text = "", ConsoleColor? color = null)
+        private void WriteLine(string? text = "", ConsoleColor? color = null)
         {
             text ??= "";
             var size = -1;
@@ -66,14 +66,15 @@ private static void WriteLine(string? text = "", ConsoleColor? color = null)
 
         private const string Black = "\u001b[40m";
         private const string Reset = "\u001b[0m";
-        private static void Write(string? text = "", ConsoleColor? color = null)
+        private void Write(string? text = "", ConsoleColor? color = null)
         {
             text ??= "";
             if (color != null)
             {
                 Console.ForegroundColor = color.Value;
             }
-            if (Environment.OSVersion.Version.Major >= 10)
+            if (Environment.OSVersion.Version.Major >= 10 && 
+                _settings.UI?.Color?.Background == "black")
             {
                 text = $"{Black}{text}{Reset}";
             }
@@ -159,7 +160,7 @@ public void Show(string? label, string? value, int level = 0)
             _dirty = true;
         }
 
-        private static void WriteMultiline(int startPos, string value)
+        private void WriteMultiline(int startPos, string value)
         {
             var step = 79 - startPos;
             var sentences = value.Split('\n');

diff --git a/src/main/settings.json b/src/main/settings.json
@@ -8,7 +8,10 @@
   "UI": {
     "DateFormat": "yyyy/M/d",
     "PageSize": 50,
-    "TextEncoding": "utf-8"
+    "TextEncoding": "utf-8",
+    "Color": {
+      "Background": null
+    }
   },
   "Acme": {
     "DefaultBaseUri": "https://acme-v02.api.letsencrypt.org/",