Add YAML/Presamp Watcher

OpenUtau.Core/Classic/PresampWatcher.cs

@@ -0,0 +1,45 @@
+using System;
+using System.IO;
+using Serilog;
+
+namespace OpenUtau.Core {
+    public class PresampWatcher : IDisposable {
+        public bool Paused { get; set; }
+
+        private FileSystemWatcher watcher;
+        private Action reloadCallback;
+
+        public PresampWatcher(string path, Action reloadCallback) {
+            this.reloadCallback = reloadCallback;
+
+            watcher = new FileSystemWatcher(path);
+            watcher.Changed += OnFileChanged;
+            watcher.Created += OnFileChanged;
+            watcher.Deleted += OnFileChanged;
+            watcher.Renamed += OnFileChanged;
+            watcher.Error += OnError;
+
+            watcher.Filter = "presamp.ini"; 
+            // Set to false since presamp.ini is always at the root of the voicebank
+            watcher.IncludeSubdirectories = false; 
+            watcher.EnableRaisingEvents = true;
+        }
+
+        private void OnFileChanged(object sender, FileSystemEventArgs e) {
+            if (Paused) {
+                return;
+            }
+            Log.Information($"Presamp File \"{e.FullPath}\" {e.ChangeType}");
+            reloadCallback?.Invoke();
+        }
+
+        private void OnError(object sender, ErrorEventArgs e) {
+            Log.Error($"Presamp Watcher error {e}");
+        }
+        public void Dispose() {
+            if (watcher != null) {
+                watcher.Dispose();
+            }
+        }
+    }
+}

OpenUtau.Core/Classic/YamlWatcher.cs

@@ -0,0 +1,48 @@
+using System;
+using System.IO;
+using Serilog;
+
+namespace OpenUtau.Core {
+    public class YamlWatcher : IDisposable {
+        public bool Paused { get; set; }
+
+        private FileSystemWatcher watcher;
+        private Action reloadCallback;
+
+        public YamlWatcher(string path, Action reloadCallback) {
+            this.reloadCallback = reloadCallback;
+
+            watcher = new FileSystemWatcher(path);
+            watcher.Changed += OnFileChanged;
+            watcher.Created += OnFileChanged;
+            watcher.Deleted += OnFileChanged;
+            watcher.Renamed += OnFileChanged;
+            watcher.Error += OnError;
+
+            // Filters specifically for .yaml. 
+            watcher.Filter = "*.yaml"; 
+            watcher.IncludeSubdirectories = true;
+            watcher.EnableRaisingEvents = true;
+        }
+
+        private void OnFileChanged(object sender, FileSystemEventArgs e) {
+            if (Paused) {
+                return;
+            }
+            Log.Information($"YAML File \"{e.FullPath}\" {e.ChangeType}");
+
+            // Execute the refresh logic passed in during initialization
+            reloadCallback?.Invoke();
+        }
+
+        private void OnError(object sender, ErrorEventArgs e) {
+            Log.Error($"YAML Watcher error {e}");
+        }
+
+        public void Dispose() {
+            if (watcher != null) {
+                watcher.Dispose();
+            }
+        }
+    }
+}

OpenUtau.Core/DiffSinger/DiffSingerBasePhonemizer.cs

@@ -27,6 +27,10 @@ public abstract class DiffSingerBasePhonemizer : MachineLearningPhonemizer
         IG2p g2p;
         Dictionary<string, int> phonemeTokens;
         DiffSingerSpeakerEmbedManager speakerEmbedManager;
+        private static int globalDsGeneration = 0;
+        private int localDsGeneration = 0;
+        private static YamlWatcher dsWatcher;
+        private static string currentlyWatchedDsDir;
 
         string defaultPause = "SP";
         protected virtual string GetDictionaryName()=>"dsdict.yaml";
@@ -35,9 +39,11 @@ public abstract class DiffSingerBasePhonemizer : MachineLearningPhonemizer
         private bool _singerLoaded;
 
         public override void SetSinger(USinger singer) {
-            if (_singerLoaded && singer == this.singer) return;
+            if (_singerLoaded && singer == this.singer && localDsGeneration == globalDsGeneration) return;
             try {
+                localDsGeneration = globalDsGeneration;
                 _singerLoaded = _executeSetSinger(singer);
+                SetupYamlWatcher(rootPath);
             } catch {
                 _singerLoaded = false;
                 throw;
@@ -103,6 +109,32 @@ private bool _executeSetSinger(USinger singer) {
             return true;
         }
 
+        private void SetupYamlWatcher(string directory) {
+            if (string.IsNullOrEmpty(directory) || currentlyWatchedDsDir == directory) {
+                return;
+            }
+
+            if (dsWatcher != null) {
+                dsWatcher.Dispose();
+                dsWatcher = null;
+            }
+
+            currentlyWatchedDsDir = directory;
+
+            if (Directory.Exists(directory)) {
+                dsWatcher = new YamlWatcher(directory, () => {
+                    Log.Information($"[DiffSingerBasePhonemizer] Detected YAML change in {directory}. Reloading globally...");
+                    System.Threading.Thread.Sleep(200);
+                    globalDsGeneration++;
+
+                    // Signal OpenUtau to re-run the timeline runner
+                    if (this.singer != null) {
+                        OpenUtau.Core.SingerManager.Inst.ScheduleReload(this.singer);
+                    }
+                });
+            }
+        }
+
         protected virtual IG2p LoadG2p(string rootPath, bool useLangId = false) {
             //Each phonemizer has a delicated dictionary name, such as dsdict-en.yaml, dsdict-ru.yaml.
             //If this dictionary exists, load it.