Fix RequestContainer Task issue

TypNull · TypNull · commit ec6885084acc · 2023-11-22T09:03:47.000+01:00
Fix RequestContainer State issue
Add IEnumerable to RequestContainer
diff --git a/Requests.sln b/Requests.sln
@@ -3,7 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.4.33122.133
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Requests", "Requests\Requests.csproj", "{95D249D8-C261-43E8-941B-386E78BCC381}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Requests", "Requests\Requests.csproj", "{95D249D8-C261-43E8-941B-386E78BCC381}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTest", "UnitTest\UnitTest.csproj", "{CD416881-1C3A-4A8A-84F4-F9FA2F884602}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -15,6 +17,10 @@ Global
 		{95D249D8-C261-43E8-941B-386E78BCC381}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{95D249D8-C261-43E8-941B-386E78BCC381}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{95D249D8-C261-43E8-941B-386E78BCC381}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CD416881-1C3A-4A8A-84F4-F9FA2F884602}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CD416881-1C3A-4A8A-84F4-F9FA2F884602}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CD416881-1C3A-4A8A-84F4-F9FA2F884602}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CD416881-1C3A-4A8A-84F4-F9FA2F884602}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Requests/ProgressableContainer.cs b/Requests/ProgressableContainer.cs
@@ -21,7 +21,7 @@ public ProgressableContainer() { }
         /// Constructor to merge <see cref="IRequest"/> together
         /// </summary>
         /// <param name="requests"><see cref="IRequest"/>s to merge</param>
-        public ProgressableContainer(params TRequest[] requests) => Add(requests);
+        public ProgressableContainer(params TRequest[] requests) => AddRange(requests);
 
         /// <summary>
         /// Creates a new <see cref="ProgressableContainer{TRequest}"/> that megres  <see cref="ProgressableContainer{TRequest}"/> together.
@@ -30,12 +30,9 @@ public ProgressableContainer() { }
         /// <returns>A new <see cref="ProgressableContainer{TRequest}"/></returns>
         public static ProgressableContainer<TRequest> MergeContainers(/*bool autoReset = false,*/ params ProgressableContainer<TRequest>[] requestContainers)
         {
-            List<TRequest> requests = new();
-            Array.ForEach(requestContainers, requestContainer => requests.AddRange(requestContainer.GetRequests()));
-            return new ProgressableContainer<TRequest>(requests.ToArray())
-            {
-                // AutoReset = autoReset
-            };
+            ProgressableContainer<TRequest> container = new();
+            Array.ForEach(requestContainers, requestContainer => container.AddRange(requestContainer.ToArray()));
+            return container;
         }
 
         /// <summary>
@@ -73,9 +70,9 @@ private void AttachProgress(TRequest request)
         /// Adds a range <see cref="IRequest"/> to the <see cref="ProgressableContainer{TRequest}"/>.
         /// </summary>
         /// <param name="requests">The <see cref="IRequest"/> to add.</param>
-        public override void Add(params TRequest[] requests)
+        public override void AddRange(params TRequest[] requests)
         {
-            base.Add(requests);
+            base.AddRange(requests);
             Array.ForEach(requests, req => AttachProgress(req));
         }
 
diff --git a/Requests/RequestContainer.cs b/Requests/RequestContainer.cs
@@ -1,24 +1,26 @@
 ﻿using Requests.Options;
+using System.Collections;
 
 namespace Requests
 {
     /// <summary>
     /// Class to manage and merge more than one TRequest.
     /// </summary>
     /// <typeparam name="TRequest">A RequestObject class</typeparam>
-    public class RequestContainer<TRequest> : IRequest where TRequest : IRequest
+    public class RequestContainer<TRequest> : IEnumerable<TRequest>, IRequest where TRequest : IRequest
     {
         private readonly List<TRequest> _requests = new();
         private bool _isrunning = true;
         private bool _isCanceled = false;
         private bool _disposed = false;
-        private Task _task = Task.CompletedTask;
+        private TaskCompletionSource? _task;
+        private CancellationTokenSource _taskCancelationTokenSource = new();
         private RequestState _state = RequestState.Paused;
 
         /// <summary>
         /// Merged task out the requests
         /// </summary>
-        public Task Task => _task;
+        public Task Task => _task?.Task ?? Task.CompletedTask;
 
         /// <summary>
         /// State of this <see cref="RequestContainer{TRequest}"/>
@@ -28,6 +30,8 @@ public RequestState State
             get { return _state; }
             protected set
             {
+                if (_state == value)
+                    return;
                 _state = value;
                 SynchronizationContext.Post((o) => StateChanged?.Invoke((IRequest)o!, value), this);
             }
@@ -44,7 +48,12 @@ protected set
         public RequestPriority Priority => RequestPriority.Normal;
 
         /// <summary>
-        /// The synchronization context captured upon construction.  This will never be null.
+        /// Gets the number of <see cref="IRequest"/> conntained in the <see cref="RequestContainer{TRequest}"/>
+        /// </summary>
+        public int Count => _requests.Count;
+
+        /// <summary>
+        /// The synchronization context captured upon construction. This will never be null.
         /// </summary>
         protected SynchronizationContext SynchronizationContext { get; }
 
@@ -57,13 +66,17 @@ protected set
         /// Constructor to merge <see cref="IRequest"/> together
         /// </summary>
         /// <param name="requests"><see cref="IRequest"/>s to merge</param>
-        public RequestContainer(params TRequest[] requests) : this() => Add(requests);
+        public RequestContainer(params TRequest[] requests) : this() => AddRange(requests);
 
         /// <summary>
         /// Get all <see cref="IRequest"/> in this Container
         /// </summary>
         /// <returns>returns a <see cref="IRequest"/> array</returns>
-        public IReadOnlyList<TRequest> GetRequests() => _requests;
+        public TRequest this[int key]
+        {
+            get => _requests[key];
+            set => _requests[key] = value;
+        }
 
         /// <summary>
         /// Creates a new <see cref="RequestContainer{TRequest}"/> that megres  <see cref="RequestContainer{TRequest}"/> together.
@@ -72,17 +85,16 @@ protected set
         /// <returns></returns>
         public static RequestContainer<TRequest> MergeContainers(params RequestContainer<TRequest>[] requestContainers)
         {
-            List<TRequest> requests = new();
-            Array.ForEach(requestContainers, requestContainer => requests.AddRange(requestContainer._requests));
-            return new RequestContainer<TRequest>(requests.ToArray());
+            RequestContainer<TRequest> newContainer = new();
+            Array.ForEach(requestContainers, requestContainer => newContainer.AddRange(requestContainer.ToArray()));
+            return newContainer;
         }
 
         /// <summary>
         /// Main Contructor for <see cref="RequestContainer{TRequest}"/>.
         /// </summary>
         public RequestContainer() => SynchronizationContext = SynchronizationContext.Current ?? new();
 
-
         /// <summary>
         /// Adds a <see cref="IRequest"/> to the <see cref="RequestContainer{TRequest}"/>.
         /// </summary>
@@ -98,56 +110,80 @@ public virtual void Add(TRequest request)
 
             request.StateChanged += OnStateChanged;
             _requests.Add(request);
-            _task = Task.WhenAll(_requests.Select(request => request.Task));
-        }
-
-        private void OnStateChanged(object? sender, RequestState state)
-        {
-            if (state == State)
-                return;
-            if (state != RequestState.Failed)
-            {
-                int[] states = _requests.Select(req => (int)req.State).ToArray();
-                int[] counter = new int[7];
-                foreach (int value in states)
-                    counter[value]++;
-
-                if (counter[(int)RequestState.Running] > 1)
-                    state = RequestState.Running;
-                else if (counter[(int)RequestState.Idle] > 1)
-                    state = RequestState.Idle;
-                else
-                {
-                    int max = counter.Max();
-                    state = (RequestState)counter.ToList().IndexOf(max);
-                }
-            }
-            if (state != State)
-                State = state;
+            NewTaskCompletion();
+            OnStateChanged(this, request.State);
         }
 
-        async Task IRequest.StartRequestAsync()
+        private void NewTaskCompletion()
         {
-            _isrunning = true;
-            foreach (TRequest? request in _requests)
-                await request.StartRequestAsync();
+            _taskCancelationTokenSource.Cancel();
+            _taskCancelationTokenSource = new();
+            if (Task.IsCompleted)
+                _task = new(TaskCreationOptions.RunContinuationsAsynchronously);
+            Task.WhenAll(_requests.Select(request => request.Task)).ContinueWith(task => _task?.TrySetResult(), _taskCancelationTokenSource.Token);
         }
 
         /// <summary>
         /// Adds a range <see cref="IRequest"/> to the <see cref="RequestContainer{TRequest}"/>.
         /// </summary>
         /// <param name="requests">The <see cref="IRequest"/> to add.</param>
-        public virtual void Add(params TRequest[] requests)
+        public virtual void AddRange(params TRequest[] requests)
         {
             if (_isCanceled)
                 Array.ForEach(requests, request => request.Cancel());
             else if (_disposed)
                 Array.ForEach(requests, request => request.Dispose());
             else if (!_isrunning)
                 Array.ForEach(requests, request => request.Pause());
-
+            Array.ForEach(requests, request => request.StateChanged += OnStateChanged);
             _requests.AddRange(requests);
-            _task = Task.WhenAll(_requests.Select(request => request.Task));
+            NewTaskCompletion();
+            State = CalculateState();
+        }
+
+
+        private void OnStateChanged(object? sender, RequestState state)
+        {
+            if (state == State)
+                return;
+            if (state != RequestState.Failed)
+                state = CalculateState();
+            State = state;
+        }
+
+        private RequestState CalculateState()
+        {
+            RequestState state;
+            IEnumerable<int> states = _requests.Select(req => (int)req.State);
+            int[] counter = new int[7];
+            foreach (int value in states)
+                counter[value]++;
+
+            if (counter[6] > 0)
+                state = RequestState.Failed;
+            else if (counter[1] > 0)
+                state = RequestState.Running;
+            else if (counter[5] > 0)
+                state = RequestState.Cancelled;
+            else if (counter[0] > 0)
+                state = RequestState.Idle;
+            else if (counter[4] > 0)
+                state = RequestState.Waiting;
+            else if (counter[2] == _requests.Count)
+                state = RequestState.Compleated;
+            else if (counter[3] > 0)
+                state = RequestState.Paused;
+            else
+                state = (RequestState)Array.IndexOf(counter, counter.Max());
+
+            return state;
+        }
+
+        async Task IRequest.StartRequestAsync()
+        {
+            _isrunning = true;
+            foreach (TRequest? request in _requests)
+                await request.StartRequestAsync();
         }
 
         /// <summary>
@@ -156,10 +192,18 @@ public virtual void Add(params TRequest[] requests)
         /// <param name="requests">Request to remove</param>
         public virtual void Remove(params TRequest[] requests)
         {
-            Array.ForEach(requests, request => _requests.Remove(request));
-            if (_requests.Count > 0)
-                _task = Task.WhenAll(_requests.Select(request => request.Task));
-            else _task = Task.CompletedTask;
+            Array.ForEach(requests, request =>
+            {
+                _requests.Remove(request);
+                request.StateChanged -= StateChanged;
+            });
+            if (_requests.Count > 0 && !Task.IsCompleted)
+                NewTaskCompletion();
+            else
+                _task = null;
+            if (State is not RequestState.Compleated and not RequestState.Paused)
+                State = CalculateState();
+
         }
 
         /// <summary>
@@ -180,6 +224,7 @@ public void Start()
             foreach (TRequest? request in _requests)
                 request.Start();
         }
+
         /// <summary>
         /// Put every <see cref="IRequest"/> in Container on hold
         /// </summary>
@@ -203,5 +248,14 @@ public void Dispose()
                 request.Dispose();
             GC.SuppressFinalize(this);
         }
+
+        /// <summary>
+        ///    Returns an enumerator that iterates through the <see cref="RequestContainer{TRequest}"/> 
+        /// </summary>
+        /// <returns> A  <see cref="RequestContainer{TRequest}"/> .Enumerator for the <see cref="RequestContainer{TRequest}"/> .</returns>
+        public IEnumerator<TRequest> GetEnumerator() => _requests.GetEnumerator();
+
+        /// <inheritdoc/>
+        IEnumerator IEnumerable.GetEnumerator() => _requests.GetEnumerator();
     }
 }
diff --git a/Requests/Requests.csproj b/Requests/Requests.csproj
@@ -16,13 +16,13 @@
     <PackageTags>async; channel; priority; request; parallel; </PackageTags>
     <RepositoryUrl>https://github.com/TypNull/Requests</RepositoryUrl>
     <PackageIcon>logo.png</PackageIcon>
-    <Version>2.0.1</Version>
+    <Version>2.0.2</Version>
     <PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
     <PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
     <PackageId>Shard.Requests</PackageId>
-    <PackageReleaseNotes>
-      Minor RequestContainer improvements
-    </PackageReleaseNotes>
+    <PackageReleaseNotes>Fix RequestContainer Task issue,
+Fix RequestContainer State issue 
+Add IEnumerable to RequestContainer</PackageReleaseNotes>
   </PropertyGroup>
 
   <ItemGroup>
