网页端新增支持进程优先级设置

autodotua · May 15, 2023 · 024b932 · 024b932
1 parent 25ed184
commit 024b932
Show file tree

Hide file tree

Showing 13 changed files with 161 additions and 67 deletions.
diff --git a/SimpleFFmpegGUI.Core/IPipeService.cs b/SimpleFFmpegGUI.Core/IPipeService.cs
@@ -93,5 +93,9 @@ public interface IPipeService
         void CancelQueueSchedule();
 
         DateTime? GetQueueScheduleTime();
+
+        public int GetDefaultProcessPriority();
+
+        public void SetDefaultProcessPriority(int priority);
     }
 }
diff --git a/SimpleFFmpegGUI.Core/Logger.cs b/SimpleFFmpegGUI.Core/Logger.cs
@@ -132,6 +132,7 @@ private void AddLog(char type, string message, TaskInfo task = null)
             };
             Log?.Invoke(null, new LogEventArgs(log));
             db.Logs.Add(log);
+            Debug.WriteLine($"[{type}] {message}");
         }
 
         private void Save()

diff --git a/SimpleFFmpegGUI.Core/Manager/ConfigManager.cs b/SimpleFFmpegGUI.Core/Manager/ConfigManager.cs
@@ -10,27 +10,46 @@ namespace SimpleFFmpegGUI.Manager
 {
     public static class ConfigManager
     {
+        public const string DefaultProcessPriorityKey = "DefaultProcessPriority";
         public const string SyncModifiedTimeKey = "SyncModifiedTime";
+        private static readonly Dictionary<string, object> cache = new Dictionary<string, object>();
+
+        public static int DefaultProcessPriority
+        {
+            get => GetConfig(DefaultProcessPriorityKey, 2);
+            set => SetConfig(DefaultProcessPriorityKey, value);
+        }
 
         public static bool SyncModifiedTime
         {
             get => GetConfig(SyncModifiedTimeKey, true);
             set => SetConfig(SyncModifiedTimeKey, value);
         }
-
         public static T GetConfig<T>(string key, T defaultValue)
         {
+            if (cache.ContainsKey(key))
+            {
+                return (T)cache[key];
+            }
             using var db = FFmpegDbContext.GetNew();
             var item = db.Configs.Where(p => p.Key == key).FirstOrDefault();
             if (item == null)
             {
                 return defaultValue;
             }
-            return Parse<T>(item.Value);
-        }
+            T value = Parse<T>(item.Value);
+            cache.Add(key, value);
 
+            using Logger logger = new Logger();
+            logger.Info($"读取配置：[{key}]={value}");
+            return value;
+        }
         public static void SetConfig<T>(string key, T value)
         {
+            if (cache.ContainsKey(key))
+            {
+                cache[key] = value;
+            }
             using var db = FFmpegDbContext.GetNew();
             var item = db.Configs.Where(p => p.Key == key).FirstOrDefault();
             if (item == null)
@@ -49,16 +68,19 @@ public static void SetConfig<T>(string key, T value)
             }
 
             db.SaveChanges();
-        }
 
-        private static T Parse<T>(string data)
-        {
-            return JsonConvert.DeserializeObject<T>(data);
+            using Logger logger = new Logger();
+            logger.Info($"写入配置：[{key}]={value}");
         }
 
         private static string GetString<T>(T data)
         {
             return JsonConvert.SerializeObject(data);
         }
+
+        private static T Parse<T>(string data)
+        {
+            return JsonConvert.DeserializeObject<T>(data);
+        }
     }
 }
diff --git a/SimpleFFmpegGUI.Core/Manager/FFmpegProcess.cs b/SimpleFFmpegGUI.Core/Manager/FFmpegProcess.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.Threading;
 using System.Threading.Tasks;
@@ -10,13 +11,19 @@ namespace SimpleFFmpegGUI.Manager
     /// </summary>
     public class FFmpegProcess
     {
-        public ProcessPriorityClass priority = ProcessPriorityClass.Normal;
         private readonly Process process = new Process();
 
+        private ProcessPriorityClass priority = default;
+
         private bool started = false;
+
         private TaskCompletionSource<bool> tcs;
 
-        public FFmpegProcess(string argument)
+        private FFmpegProcess()
+        {
+            Priority = ConfigManager.DefaultProcessPriority;
+        }
+        public FFmpegProcess(string argument) : this()
         {
             process.StartInfo = new ProcessStartInfo()
             {
@@ -47,7 +54,7 @@ public FFmpegProcess(string argument)
         /// </summary>
         public int Id => !started ? throw new Exception("进程还未开始运行") : process.Id;
 
-        public ProcessPriorityClass Priority
+        public int Priority
         {
             get
             {
@@ -56,18 +63,36 @@ public ProcessPriorityClass Priority
                     throw new Exception("进程已经退出");
                 }
 
-                return priority;
+                return priority switch
+                {
+                    ProcessPriorityClass.RealTime => 5,
+                    ProcessPriorityClass.High => 4,
+                    ProcessPriorityClass.AboveNormal => 3,
+                    ProcessPriorityClass.Normal => 2,
+                    ProcessPriorityClass.BelowNormal => 1,
+                    ProcessPriorityClass.Idle => 0,
+                    _ => throw new InvalidEnumArgumentException()
+                };
             }
             set
             {
                 if (started && process.HasExited)
                 {
                     throw new Exception("进程已经退出");
                 }
-                priority = value;
+                priority = value switch
+                {
+                    5 => ProcessPriorityClass.RealTime,
+                    4 => ProcessPriorityClass.High,
+                    3 => ProcessPriorityClass.AboveNormal,
+                    2 => ProcessPriorityClass.Normal,
+                    1 => ProcessPriorityClass.BelowNormal,
+                    0 => ProcessPriorityClass.Idle,
+                    _ => ProcessPriorityClass.Normal,
+                };
                 if (started)
                 {
-                    process.PriorityClass = value;
+                    process.PriorityClass = priority;
                 }
             }
         }

diff --git a/SimpleFFmpegGUI.Host/PipeService.cs b/SimpleFFmpegGUI.Host/PipeService.cs
@@ -252,5 +252,19 @@ public string GetSingleFileInDir(string dir, string name)
             }
             return files.First();
         }
+
+        public int GetDefaultProcessPriority()
+        {
+            return ConfigManager.DefaultProcessPriority;
+        }
+
+        public void SetDefaultProcessPriority(int priority)
+        {
+            ConfigManager.DefaultProcessPriority = priority;
+            foreach (var task in manager.Managers)
+            {
+                task.Process.Priority=priority; 
+            }
+        }
     }
 }
diff --git a/SimpleFFmpegGUI.WPF/Config.cs b/SimpleFFmpegGUI.WPF/Config.cs
@@ -36,7 +36,6 @@ public class Config : IJsonSerializable, INotifyPropertyChanged
 
         private DefaultOutputDirType defaultOutputDirType = DefaultOutputDirType.InputDir;
 
-        private int defaultProcessPriority = 2;
         private bool rememberLastArguments = true;
 
         private List<RemoteHost> remoteHosts = new List<RemoteHost>();
@@ -87,11 +86,6 @@ public DefaultOutputDirType DefaultOutputDirType
             get => defaultOutputDirType;
             set => this.SetValueAndNotify(ref defaultOutputDirType, value, nameof(DefaultOutputDirType));
         }
-        public int DefaultProcessPriority
-        {
-            get => defaultProcessPriority;
-            set => this.SetValueAndNotify(ref defaultProcessPriority, value, nameof(DefaultProcessPriority));
-        }
 
         public Dictionary<TaskType, OutputArguments> LastOutputArguments { get; set; } = new Dictionary<TaskType, OutputArguments>();
 

diff --git a/SimpleFFmpegGUI.WPF/MainWindow.xaml.cs b/SimpleFFmpegGUI.WPF/MainWindow.xaml.cs
@@ -339,7 +339,7 @@ private void ResetUI(bool force = false)
             grdLeft.RowDefinitions[2].Height = new GridLength(IsUiCompressMode ? 384 : 0);
             grdLeft.RowDefinitions[2].MinHeight = IsUiCompressMode ? 384 : 0;
             leftSplitter.Visibility = IsUiCompressMode ? Visibility.Visible : Visibility.Collapsed;
-            statusPanel.Margin = new Thickness(12, IsUiCompressMode ? 12 : 44, 12, 12);
+            statusPanel.Margin = new Thickness(12, IsUiCompressMode ? 12 : 44, 12, IsUiCompressMode ? 12 : 42);
             UiCompressModeChanged?.Invoke(this, new EventArgs());
             void RemoveFromGrid()
             {

diff --git a/SimpleFFmpegGUI.WPF/Model/UITaskInfo.cs b/SimpleFFmpegGUI.WPF/Model/UITaskInfo.cs
@@ -45,7 +45,7 @@ public class UITaskInfo : ModelBase, INotifyPropertyChanged
 
         private FFmpegManager processManager;
 
-        private int processPriority = Config.Instance.DefaultProcessPriority;
+        private int processPriority = ConfigManager.DefaultProcessPriority;
 
         private StatusDto processStatus;
 
@@ -236,33 +236,13 @@ public int ProcessPriority
             get
             {
                 return processPriority;
-                //     ProcessManager.Process.Priority switch
-                //{
-                //    ProcessPriorityClass.RealTime => 0,
-                //    ProcessPriorityClass.High => 1,
-                //    ProcessPriorityClass.AboveNormal => 2,
-                //    ProcessPriorityClass.Normal => 3,
-                //    ProcessPriorityClass.BelowNormal => 4,
-                //    ProcessPriorityClass.Idle => 5,
-                //    _ => throw new InvalidEnumArgumentException(nameof(ProcessPriorityClass)),
-                //};
             }
             set
             {
                 processPriority = value;
                 if (ProcessManager.Process != null)
                 {
-
-                    ProcessManager.Process.Priority = value switch
-                    {
-                        5 => ProcessPriorityClass.RealTime,
-                        4 => ProcessPriorityClass.High,
-                        3 => ProcessPriorityClass.AboveNormal,
-                        2 => ProcessPriorityClass.Normal,
-                        1 => ProcessPriorityClass.BelowNormal,
-                        0 => ProcessPriorityClass.Idle,
-                        _ => ProcessPriorityClass.Normal,
-                    };
+                    ProcessManager.Process.Priority = value;
                 }
                 this.Notify(nameof(Manager), nameof(ProcessPriority));
             }

diff --git a/SimpleFFmpegGUI.WPF/Pages/SettingPage.xaml.cs b/SimpleFFmpegGUI.WPF/Pages/SettingPage.xaml.cs
@@ -41,6 +41,12 @@ public SettingPageViewModel()
         public IEnumerable DefaultOutputDirTypes => Enum.GetValues<DefaultOutputDirType>();
 
         public ObservableCollection<RemoteHost> ObservableRemoteHosts { get; set; }
+
+        public int DefaultProcessPriority
+        {
+            get => ConfigManager.DefaultProcessPriority;
+            set => ConfigManager.DefaultProcessPriority = value;
+        }
     }
 
     /// <summary>
@@ -85,7 +91,7 @@ private void BrowseSpecialDirPathButton_Click(object sender, RoutedEventArgs e)
         {
             CommonOpenFileDialog dialog = new CommonOpenFileDialog();
             var path = dialog.GetFolderPath();
-            if(path != null)
+            if (path != null)
             {
                 ViewModel.DefaultOutputDirSpecialDirPath = path;
             }

diff --git a/SimpleFFmpegGUI.Web/src/net.ts b/SimpleFFmpegGUI.Web/src/net.ts
@@ -248,4 +248,14 @@ export function postSchedule(time:any): Promise<AxiosResponse<any>> {
 export function postCancelSchedule(): Promise<AxiosResponse<any>> {
         return Vue.axios
         .post(getUrl("Queue/CancelSchedule"))
+}
+
+export function getDefaultProcessPriority(): Promise<AxiosResponse<any>> {
+        return Vue.axios
+        .get(getUrl("Power/DefaultProcessPriority"))
+}
+
+export function postDefaultProcessPriority(priority:number): Promise<AxiosResponse<any>> {
+        return Vue.axios
+        .post(getUrl("Power/DefaultProcessPriority?priority="+priority))
 }