Update script manager to pass event data via stdin

Author: t1m0thyj

src/ConfigMigrator.cs

@@ -60,31 +60,46 @@ public static void UpdateConfig(string jsonText)
             UpdateToVersion5(jsonText);
         }
 
-        public static void UpdateObsoleteSettings()  // Added 2024-01-22
+        public static bool UpdateObsoleteSettings(string jsonText)  // Added 2024-01-22
         {
+            bool settingsChanged = false;
 #pragma warning disable 618
             if (JsonConfig.settings.changeLockScreen)
             {
                 JsonConfig.settings.lockScreenDisplayIndex = Array.FindIndex(JsonConfig.settings.activeThemes,
                     (themeId) => themeId != null);
                 JsonConfig.settings.changeLockScreen = false;
+                settingsChanged = true;
             }
             if (JsonConfig.settings.enableShuffle)
             {
                 JsonConfig.settings.themeShuffleMode = 22;
                 JsonConfig.settings.enableShuffle = false;
+                settingsChanged = true;
             }
             if (JsonConfig.settings.lastShuffleDate != null)
             {
                 JsonConfig.settings.lastShuffleTime = JsonConfig.settings.lastShuffleDate;
                 JsonConfig.settings.lastShuffleDate = null;
+                settingsChanged = true;
             }
-            if (JsonConfig.settings.darkMode == true)
+            if (JsonConfig.settings.darkMode)
             {
                 JsonConfig.settings.appearanceMode = (int)AppearanceMode.Dark;
                 JsonConfig.settings.darkMode = false;
+                settingsChanged = true;
             }
 #pragma warning restore 618
+            if (JsonConfig.settings.enableScripts && jsonText?.IndexOf("\"appearanceMode\"") == -1)
+            {
+                MessageDialog.ShowInfo("Updated to WinDynamicDesktop 5.5 successfully. PowerShell scripts that are " +
+                    "outdated have been temporarily disabled.\n\nTo update them, download the latest scripts from " +
+                    "https://windd.info/scripts/ and revise any custom scripts.\n\nAfter scripts have been updated, " +
+                    "you can re-enable PowerShell scripts in the \"More Options\" menu.");
+                JsonConfig.settings.enableScripts = false;
+                settingsChanged = true;
+            }
+            return settingsChanged;
         }
 
         private static DateTime SafeParse(string dateTime)  // Added 2020-05-21

src/EventScheduler.cs

@@ -116,7 +116,8 @@ public void Run(bool forceImageUpdate = false, DisplayEvent overrideEvent = null
             ScriptManager.RunScripts(new ScriptArgs
             {
                 daySegment2 = displayEvents[0].daySegment2,
-                daySegment4 = displayEvents[0].daySegment4,
+                daySegment4 = displayEvents[0].daySegment4 ?? -1,
+                themeMode = JsonConfig.settings.appearanceMode,
                 imagePaths = displayEvents.Select(e =>
                     (e.displayIndex == overrideEvent?.displayIndex ? overrideEvent : e).lastImagePath).ToArray()
             }, forceImageUpdate);

src/JsonConfig.cs

@@ -69,12 +69,13 @@ public static void LoadConfig()
         {
             autoSaveTimer?.Stop();
             ConfigMigrator.RenameSettingsFile();
+            string jsonText = null;
 
             if (!firstRun)
             {
                 try
                 {
-                    string jsonText = File.ReadAllText("settings.json");
+                    jsonText = File.ReadAllText("settings.json");
                     ConfigMigrator.UpdateConfig(jsonText);
                     settings = JsonConvert.DeserializeObject<AppConfig>(jsonText);
                 }
@@ -94,10 +95,10 @@ public static void LoadConfig()
                 }
             }
 
-            unsavedChanges = false;
+            unsavedChanges = ConfigMigrator.UpdateObsoleteSettings(jsonText);
             autoSaveTimer = new System.Timers.Timer(1000);
             autoSaveTimer.AutoReset = false;
-            ConfigMigrator.UpdateObsoleteSettings();
+            autoSaveTimer.Enabled = unsavedChanges;
 
             settings.PropertyChanged += OnSettingsPropertyChanged;
             autoSaveTimer.Elapsed += OnAutoSaveTimerElapsed;

src/ScriptManager.cs

@@ -2,10 +2,10 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+using Newtonsoft.Json;
 using System;
 using System.Diagnostics;
 using System.IO;
-using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
@@ -14,20 +14,15 @@ namespace WinDynamicDesktop
     class ScriptArgs
     {
         public int daySegment2;
-        public int? daySegment4;
+        public int daySegment4;
+        public int themeMode;
         public string[] imagePaths;
-
-        public bool Equals(ScriptArgs other)
-        {
-            return other != null && this.daySegment2 == other.daySegment2 &&
-                this.daySegment4 == other.daySegment4 && this.imagePaths.SequenceEqual(other.imagePaths);
-        }
     }
 
     class ScriptManager
     {
         private static readonly Func<string, string> _ = Localization.GetTranslation;
-        private static ScriptArgs lastArgs;
+        private static string lastArgs;
 
         public static void Initialize()
         {
@@ -60,28 +55,29 @@ public static void ToggleEnableScripts()
 
         public static void RunScripts(ScriptArgs args, bool forceUpdate = false)
         {
-            if (!JsonConfig.settings.enableScripts || (args.Equals(lastArgs) && !forceUpdate))
+            string jsonArgs = JsonConvert.SerializeObject(args, Formatting.None);
+            if (!JsonConfig.settings.enableScripts || (jsonArgs.Equals(lastArgs) && !forceUpdate))
             {
                 return;
             }
 
             LoggingHandler.LogMessage("Running scripts with arguments: {0}", args);
             foreach (string scriptPath in Directory.EnumerateFiles("scripts", "*.ps1"))
             {
-                Task.Run(() => RunScript(scriptPath, args));
+                Task.Run(() => RunScript(scriptPath, jsonArgs));
             }
-            lastArgs = args;
+            lastArgs = jsonArgs;
         }
 
-        private static async void RunScript(string path, ScriptArgs args)
+        private static async void RunScript(string path, string jsonArgs)
         {
             Process proc = new Process();
-            string command = BuildCommandString(Path.GetFileName(path), args);
             proc.StartInfo = new ProcessStartInfo(ExistsOnPath("pwsh.exe") ? "pwsh.exe" : "powershell.exe",
-                "-NoProfile -ExecutionPolicy Bypass -Command \"" + command + "\"")
+                "-NoProfile -ExecutionPolicy Bypass -File \"" + Path.GetFileName(path) + "\"")
             {
                 CreateNoWindow = true,
                 RedirectStandardError = true,
+                RedirectStandardInput = true,
                 UseShellExecute = false,
                 WindowStyle = ProcessWindowStyle.Hidden,
                 WorkingDirectory = Path.GetDirectoryName(path)
@@ -98,6 +94,10 @@ private static async void RunScript(string path, ScriptArgs args)
             };
             proc.Start();
             proc.BeginErrorReadLine();
+            using (StreamWriter sw = proc.StandardInput)
+            {
+                sw.WriteLine(jsonArgs);
+            }
             await proc.WaitForExitAsync();
 
             if (proc.ExitCode != 0 || errors.Length > 0)
@@ -108,19 +108,6 @@ private static async void RunScript(string path, ScriptArgs args)
             }
         }
 
-        private static string BuildCommandString(string filename, ScriptArgs args)
-        {
-            string cmdStr = "& \\\".\\" + filename + "\\\"" +
-                " -daySegment2 " + args.daySegment2.ToString() +
-                " -daySegment4 " + (args.daySegment4 ?? -1).ToString() +
-                " -nightMode " + Convert.ToInt32(JsonConfig.settings.darkMode);
-            if (args.imagePaths.Length > 0)
-            {
-                cmdStr += " -imagePath \\\"" + args.imagePaths[0] + "\\\"";
-            }
-            return cmdStr;
-        }
-
         private static bool ExistsOnPath(string filename)
         {
             if (File.Exists(filename))