Schedule

Indemos · Feb 25, 2024 · 31c194d · 31c194d
1 parent fa32938
commit 31c194d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 22 deletions.
diff --git a/Canvas.Core/Canvas.Core.csproj b/Canvas.Core/Canvas.Core.csproj
@@ -5,7 +5,7 @@
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>disable</Nullable>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.9.8</Version>
+    <Version>1.9.9</Version>
     <Description>Internal package used in Canvas.Views.Web</Description>
     <Authors>artemiusgreat</Authors>
     <Copyright>indemos.com</Copyright>

diff --git a/Canvas.Core/Services/ScheduleService.cs b/Canvas.Core/Services/ScheduleService.cs
@@ -7,29 +7,18 @@ namespace Canvas.Core.Services
 {
   public class ScheduleService : IDisposable
   {
-    protected virtual Task Consumer { get; set; }
-    protected virtual BlockingCollection<(Action, TaskCompletionSource)> Queue { get; set; }
     protected virtual CancellationTokenSource Cancellation { get; set; }
+    protected virtual BlockingCollection<(Action, TaskCompletionSource)> Queue { get; set; }
 
     /// <summary>
-    /// Dispose
+    /// Constructor
     /// </summary>
-    public virtual void Dispose()
+    public ScheduleService()
     {
-      Queue?.Dispose();
-      Cancellation?.Cancel();
-    }
+      Queue = new();
+      Cancellation = new CancellationTokenSource();
 
-    /// <summary>
-    /// Schedule
-    /// </summary>
-    /// <param name="action"></param>
-    /// <returns></returns>
-    public virtual Task Schedule(Action action)
-    {
-      Queue ??= new();
-      Cancellation ??= new CancellationTokenSource();
-      Consumer ??= Task.Factory.StartNew(() =>
+      Task.Factory.StartNew(() =>
       {
         foreach (var (o, com) in Queue.GetConsumingEnumerable())
         {
@@ -39,15 +28,28 @@ public virtual Task Schedule(Action action)
       },
       Cancellation.Token,
       TaskCreationOptions.LongRunning,
-      TaskScheduler.Current).ContinueWith(o => Consumer.Dispose());
+      TaskScheduler.Current).ContinueWith(o => Queue.Dispose());
+    }
+
+    /// <summary>
+    /// Dispose
+    /// </summary>
+    public virtual void Dispose() => Cancellation?.Cancel();
+
+    /// <summary>
+    /// Schedule
+    /// </summary>
+    /// <param name="action"></param>
+    /// <returns></returns>
+    public virtual Task Schedule(Action action)
+    {
+      var completion = new TaskCompletionSource();
 
       if (Queue.Count > 1)
       {
         Queue.TryTake(out var o);
       }
 
-      var completion = new TaskCompletionSource();
-
       Queue.TryAdd((action, completion));
 
       return completion.Task;

diff --git a/Canvas.Views.Web/Canvas.Views.Web.csproj b/Canvas.Views.Web/Canvas.Views.Web.csproj
@@ -10,7 +10,7 @@
   <PropertyGroup>
     <IsPackable>true</IsPackable>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>1.9.8</Version>
+    <Version>1.9.9</Version>
     <PackageTags>finance chart opengl canvas trading gdi stock direct2d</PackageTags>
     <Authors>artemiusgreat</Authors>
     <Copyright>indemos.com</Copyright>