Process job output using single channel

cezarypiatek · Aug 7, 2022 · 394c697 · 394c697
1 parent 3d203cd
commit 394c697
Showing 1 changed file with 25 additions and 6 deletions.
diff --git a/src/ScriptRunner/ScriptRunner.GUI/ViewModels/RunningJobViewModel.cs b/src/ScriptRunner/ScriptRunner.GUI/ViewModels/RunningJobViewModel.cs
@@ -7,7 +7,9 @@
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Threading;
+using System.Threading.Channels;
 using System.Threading.Tasks;
+using Avalonia.Media;
 
 namespace ScriptRunner.GUI.ViewModels;
 
@@ -188,6 +190,28 @@ private void ChangeStatus(RunningJobStatus status)
 
     private static readonly Regex ConsoleSpecialCharsPattern = new Regex(@"\u001b\[[\d;]+\w?");
 
+    static readonly Channel<(RunningJobViewModel, string)> ch = Channel.CreateUnbounded<(RunningJobViewModel, string)>();
+
+    static RunningJobViewModel()
+    {
+        try
+        {
+            Dispatcher.UIThread.InvokeAsync(async () =>
+            {
+                while (await ch.Reader.WaitToReadAsync())
+                {
+                    var (instance, newContent) = await ch.Reader.ReadAsync();
+                    instance.CurrentRunOutput += newContent + Environment.NewLine;
+                    instance.OutputIndex = instance.CurrentRunOutput.Length;
+                }
+            });
+        }
+        catch (Exception e)
+        {
+
+        }
+    }
+
     private void AppendToOutput(string? s)
     {
         if (s != null)
@@ -198,12 +222,7 @@ private void AppendToOutput(string? s)
                 return;
             }
 
-            Dispatcher.UIThread.Post(() =>
-            {
-
-                CurrentRunOutput += newContent + Environment.NewLine;
-                OutputIndex = CurrentRunOutput.Length;
-            });
+            ch.Writer.WriteAsync((this, s));
         }
     }