Fixed the bug of additional tasks crashing the app.

LittlePox · LittlePox · commit e0fe17f53433 · 2019-08-30T01:32:31.000+08:00
diff --git a/OKEGui/OKEGui/App.xaml.cs b/OKEGui/OKEGui/App.xaml.cs
@@ -16,8 +16,8 @@ static App()
         {
             if (EnvironmentChecker.CheckEnviornment())
             {
-                ConfigManager.ConfigLogger();
-                ConfigManager.WriteConfig();
+                Initializer.ConfigLogger();
+                Initializer.WriteConfig();
                 Logger.Info("程序正常启动");
             }
             else
diff --git a/OKEGui/OKEGui/Gui/MainWindow.xaml.cs b/OKEGui/OKEGui/Gui/MainWindow.xaml.cs
@@ -55,7 +55,7 @@ private void BtnNew_Click(object sender, RoutedEventArgs e)
             // 新建任务。具体实现请见Gui/wizardWindow
             try
             {
-                var wizard = new WizardWindow(ref tm);
+                var wizard = new WizardWindow(wm);
                 wizard.ShowDialog();
                 BtnRun.IsEnabled = true;
                 tm.IsCanStart = true;
diff --git a/OKEGui/OKEGui/Gui/WizardWindow.xaml.cs b/OKEGui/OKEGui/Gui/WizardWindow.xaml.cs
@@ -2,14 +2,13 @@
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Windows;
 using System.Windows.Forms;
-using Newtonsoft.Json;
 using OKEGui.Utils;
 using OKEGui.Model;
+using OKEGui.Worker;
 
 namespace OKEGui
 {
@@ -58,11 +57,11 @@ public void OnPropertyChanged(PropertyChangedEventArgs e)
         }
 
         private readonly NewTask wizardInfo = new NewTask();
-        private readonly TaskManager taskManager;
+        private readonly WorkerManager workerManager;
         private TaskProfile json;
         private string vsScript;
 
-        public WizardWindow(ref TaskManager t)
+        public WizardWindow(WorkerManager w)
         {
             InitializeComponent();
             taskWizard.BackButtonContent = "上一步";
@@ -73,7 +72,7 @@ public WizardWindow(ref TaskManager t)
             taskWizard.NextButtonContent = "下一步";
             DataContext = wizardInfo;
 
-            taskManager = t;
+            workerManager = w;
         }
 
         // 读入json文件，检查项目设置，并生成预览信息
@@ -217,7 +216,7 @@ private void WizardFinish(object sender, RoutedEventArgs e)
                 td.Taskfile.InputScript = fileName;
                 td.UpdateOutputFileName();
 
-                taskManager.AddTask(td);
+                workerManager.AddTask(td);
             }
         }
 
diff --git a/OKEGui/OKEGui/JobProcessor/Demuxer/EACDemuxer.cs b/OKEGui/OKEGui/JobProcessor/Demuxer/EACDemuxer.cs
@@ -220,7 +220,7 @@ private void DetectFileTracks(string line)
         {
             line = line.Trim();
             if (string.IsNullOrEmpty(line)) return;
-            Logger.Info(line);
+            Logger.Trace(line);
             if (Regex.IsMatch(line, @"\d*:\d*:\d*"))
             {
                 string[] match = Regex.Split(line, @"(\d*):(\d*):(\d*)");
@@ -242,7 +242,7 @@ private void DetectFileTracks(string line)
                 {
                     return;
                 }
-
+                Logger.Debug(line);
                 var trackInfo = new TrackInfo
                 {
                     Index = Convert.ToInt32(match.Groups[1].Value),
diff --git a/OKEGui/OKEGui/JobProcessor/Video/VSPipeProcessor.cs b/OKEGui/OKEGui/JobProcessor/Video/VSPipeProcessor.cs
@@ -26,7 +26,7 @@ public static IJobProcessor NewVSPipeProcessor(Job j)
         public VSPipeProcessor(VideoInfoJob j) : base()
         {
             // 获取VSPipe路径
-            this.executable = ConfigManager.Config.vspipePath;
+            this.executable = Initializer.Config.vspipePath;
             videoInfo = new VSVideoInfo();
 
             StringBuilder sb = new StringBuilder();
diff --git a/OKEGui/OKEGui/JobProcessor/Video/X264Encoder.cs b/OKEGui/OKEGui/JobProcessor/Video/X264Encoder.cs
@@ -27,7 +27,7 @@ public X264Encoder(Job j) : base()
             }
 
             // 获取VSPipe路径
-            this.VspipePath = ConfigManager.Config.vspipePath;
+            this.VspipePath = Initializer.Config.vspipePath;
 
             commandLine = BuildCommandline(job.EncodeParam, job.NumaNode);
         }
diff --git a/OKEGui/OKEGui/JobProcessor/Video/x265Encoder.cs b/OKEGui/OKEGui/JobProcessor/Video/x265Encoder.cs
@@ -26,7 +26,7 @@ public X265Encoder(Job j) : base()
             }
 
             // 获取VSPipe路径
-            this.vspipePath = ConfigManager.Config.vspipePath;
+            this.vspipePath = Initializer.Config.vspipePath;
 
             commandLine = BuildCommandline(job.EncodeParam, job.NumaNode);
         }
diff --git a/OKEGui/OKEGui/OKEGui.csproj b/OKEGui/OKEGui/OKEGui.csproj
@@ -139,7 +139,7 @@
     <Compile Include="Worker\ExecuteTaskService.cs" />
     <Compile Include="Task\TaskStatus.cs" />
     <Compile Include="Utils\Cleaner.cs" />
-    <Compile Include="Utils\ConfigManager.cs" />
+    <Compile Include="Utils\Initializer.cs" />
     <Compile Include="Utils\Constants.cs" />
     <Compile Include="Utils\CRC32.cs" />
     <Compile Include="Utils\EnvironmentChecker.cs" />
diff --git a/OKEGui/OKEGui/Properties/AssemblyInfo.cs b/OKEGui/OKEGui/Properties/AssemblyInfo.cs
@@ -47,4 +47,4 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值，
 // 方法是按如下所示使用“*”: :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("4.7.*")]
+[assembly: AssemblyVersion("4.8.*")]
diff --git a/OKEGui/OKEGui/Utils/EnvironmentChecker.cs b/OKEGui/OKEGui/Utils/EnvironmentChecker.cs
@@ -18,7 +18,7 @@ public static bool CheckEnviornment()
                 MessageBox.Show("没有权限控制OKEGui所在的文件夹，请保证当前用户获取了目录权限，或者以管理员模式运行。", "没有权限控制OKEGui所在的文件夹");
                 return false;
             }
-            Config = ConfigManager.LoadConfig();
+            Config = Initializer.LoadConfig();
 
             return CheckVspipe() && CheckQAAC() && CheckFfmpeg();
         }
diff --git a/OKEGui/OKEGui/Utils/Initializer.cs b/OKEGui/OKEGui/Utils/Initializer.cs
@@ -15,7 +15,7 @@ class OKEGuiConfig
         public string logLevel = "DEBUG";
     }
 
-    static class ConfigManager
+    static class Initializer
     {
         public static OKEGuiConfig Config = new OKEGuiConfig();
 
diff --git a/OKEGui/OKEGui/Worker/ExecuteTaskService.cs b/OKEGui/OKEGui/Worker/ExecuteTaskService.cs
@@ -29,10 +29,10 @@ private void WorkerDoWork(object sender, DoWorkEventArgs e)
                     lock (o)
                     {
                         bgworkerlist.TryRemove(args.Name, out BackgroundWorker v);
-                        workerType.TryRemove(args.Name, out WorkerType t);
 
-                        if (bgworkerlist.Count == 0 && workerType.Count == 0)
+                        if (bgworkerlist.Count == 0)
                         {
+                            isRunning = false;
                             Debugger.Log(0, "", "Ready to call the after finish process\n");
                             AfterFinish?.Invoke();
                         }
diff --git a/OKEGui/OKEGui/Worker/WorkerManager.cs b/OKEGui/OKEGui/Worker/WorkerManager.cs
@@ -27,12 +27,12 @@ public partial class WorkerManager
         public TaskManager tm;
 
         private List<string> workerList;
+        private ConcurrentDictionary<string, WorkerType> workerType;
 
         // dummy object for locking.
         private object o = new object();
 
         private ConcurrentDictionary<string, BackgroundWorker> bgworkerlist;
-        private ConcurrentDictionary<string, WorkerType> workerType;
         private int tempCounter;
         private bool isRunning;
 
@@ -50,6 +50,22 @@ public WorkerManager(TaskManager taskManager)
             tempCounter = 0;
         }
 
+        public void AddTask(TaskDetail detail)
+        {
+            tm.AddTask(detail);
+            if (isRunning)
+            {
+                foreach (string worker in workerList)
+                {
+                    if (!bgworkerlist.ContainsKey(worker))
+                    {
+                        CreateWorker(worker);
+                        StartWorker(worker);
+                    }
+                }
+            }
+        }
+
         public bool Start()
         {
             lock (o)
@@ -63,14 +79,11 @@ public bool Start()
 
                 foreach (string worker in workerList)
                 {
-                    if (bgworkerlist.ContainsKey(worker))
+                    if (!bgworkerlist.ContainsKey(worker))
                     {
-                        BackgroundWorker bg;
-                        bgworkerlist.TryRemove(worker, out bg);
+                        CreateWorker(worker);
+                        StartWorker(worker);
                     }
-
-                    CreateWorker(worker);
-                    StartWorker(worker);
                 }
 
                 return true;

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,8 @@ static App()`
`16`	`16`	`{`
`17`	`17`	`if (EnvironmentChecker.CheckEnviornment())`
`18`	`18`	`{`
`19`		`- ConfigManager.ConfigLogger();`
`20`		`- ConfigManager.WriteConfig();`
	`19`	`+ Initializer.ConfigLogger();`
	`20`	`+ Initializer.WriteConfig();`
`21`	`21`	`Logger.Info("程序正常启动");`
`22`	`22`	`}`
`23`	`23`	`else`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ private void BtnNew_Click(object sender, RoutedEventArgs e)`
`55`	`55`	`// 新建任务。具体实现请见Gui/wizardWindow`
`56`	`56`	`try`
`57`	`57`	`{`
`58`		`- var wizard = new WizardWindow(ref tm);`
	`58`	`+ var wizard = new WizardWindow(wm);`
`59`	`59`	`wizard.ShowDialog();`
`60`	`60`	`BtnRun.IsEnabled = true;`
`61`	`61`	`tm.IsCanStart = true;`
Original file line number	Diff line number	Diff line change
`@@ -220,7 +220,7 @@ private void DetectFileTracks(string line)`
`220`	`220`	`{`
`221`	`221`	`line = line.Trim();`
`222`	`222`	`if (string.IsNullOrEmpty(line)) return;`
`223`		`- Logger.Info(line);`
	`223`	`+ Logger.Trace(line);`
`224`	`224`	`if (Regex.IsMatch(line, @"\d:\d:\d*"))`
`225`	`225`	`{`
`226`	`226`	`string[] match = Regex.Split(line, @"(\d):(\d):(\d*)");`
`@@ -242,7 +242,7 @@ private void DetectFileTracks(string line)`
`242`	`242`	`{`
`243`	`243`	`return;`
`244`	`244`	`}`
`245`		`-`
	`245`	`+ Logger.Debug(line);`
`246`	`246`	`var trackInfo = new TrackInfo`
`247`	`247`	`{`
`248`	`248`	`Index = Convert.ToInt32(match.Groups[1].Value),`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public static IJobProcessor NewVSPipeProcessor(Job j)`
`26`	`26`	`public VSPipeProcessor(VideoInfoJob j) : base()`
`27`	`27`	`{`
`28`	`28`	`// 获取VSPipe路径`
`29`		`- this.executable = ConfigManager.Config.vspipePath;`
	`29`	`+ this.executable = Initializer.Config.vspipePath;`
`30`	`30`	`videoInfo = new VSVideoInfo();`
`31`	`31`
`32`	`32`	`StringBuilder sb = new StringBuilder();`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public X264Encoder(Job j) : base()`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`// 获取VSPipe路径`
`30`		`- this.VspipePath = ConfigManager.Config.vspipePath;`
	`30`	`+ this.VspipePath = Initializer.Config.vspipePath;`
`31`	`31`
`32`	`32`	`commandLine = BuildCommandline(job.EncodeParam, job.NumaNode);`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public X265Encoder(Job j) : base()`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`// 获取VSPipe路径`
`29`		`- this.vspipePath = ConfigManager.Config.vspipePath;`
	`29`	`+ this.vspipePath = Initializer.Config.vspipePath;`
`30`	`30`
`31`	`31`	`commandLine = BuildCommandline(job.EncodeParam, job.NumaNode);`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public static bool CheckEnviornment()`
`18`	`18`	`MessageBox.Show("没有权限控制OKEGui所在的文件夹，请保证当前用户获取了目录权限，或者以管理员模式运行。", "没有权限控制OKEGui所在的文件夹");`
`19`	`19`	`return false;`
`20`	`20`	`}`
`21`		`- Config = ConfigManager.LoadConfig();`
	`21`	`+ Config = Initializer.LoadConfig();`
`22`	`22`
`23`	`23`	`return CheckVspipe() && CheckQAAC() && CheckFfmpeg();`
`24`	`24`	`}`