Fixed concurrency issue. Added ClearCache(url)

Author: IvanMurzak

Assets/_PackageRoot/Runtime/ImageLoader.LoadSprite.cs

@@ -132,13 +132,19 @@ static async void InternalLoadSprite(Future<Sprite> future, Vector2 pivot, Textu
 
                     request = UnityWebRequestTexture.GetTexture(future.Url);
                     request.timeout = (int)Math.Ceiling(settings.timeout.TotalSeconds);
-                    var asyncOperation = request.SendWebRequest();
-                    await asyncOperation.WithCancellation(future.CancellationToken);
+                    future = future.Canceled(request.Abort);
+                    await request.SendWebRequest();
                 }
                 catch (OperationCanceledException)
                 {
                     future.Cancel();
                 }
+                catch (TimeoutException e)
+                {
+                    RemoveLoading(future); // LOADING REMOVED
+                    future.FailToLoad(e);
+                    return;
+                }
                 catch (Exception e)
                 {
                     if (settings.debugLevel <= DebugLevel.Exception && !ignoreImageNotFoundError)

Assets/_PackageRoot/Runtime/ImageLoader.cs

@@ -1,24 +1,35 @@
 using UnityEngine;
+using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using System.Collections.Concurrent;
+using System.Linq;
 
 namespace Extensions.Unity.ImageLoader
 {
     public static partial class ImageLoader
     {
-        private static Dictionary<string, Future<Sprite>> loadingInProcess = new Dictionary<string, Future<Sprite>>();
+        private static ConcurrentDictionary<string, Future<Sprite>> loadingInProcess = new ConcurrentDictionary<string, Future<Sprite>>();
         private static void AddLoading(Future<Sprite> future)
         {
-            loadingInProcess.Add(future.Url, future);
+            if (!loadingInProcess.TryAdd(future.Url, future))
+                throw new Exception($"[ImageLoader] AddLoading: {future.Url} already loading");
+
             if (settings.debugLevel <= DebugLevel.Log)
                 Debug.Log($"[ImageLoader] AddLoading: {future.Url}, total {loadingInProcess.Count} loading tasks");
         }
-        private static void RemoveLoading(Future<Sprite> future)
+        private static void RemoveLoading(Future<Sprite> future) => RemoveLoading(future.Url);
+        private static void RemoveLoading(string url)
         {
-            if (loadingInProcess.Remove(future.Url))
+            if (loadingInProcess.TryRemove(url, out var future))
             {
                 if (settings.debugLevel <= DebugLevel.Log)
-                    Debug.Log($"[ImageLoader] RemoveLoading: {future.Url}, left {loadingInProcess.Count} loading tasks");
+                    Debug.Log($"[ImageLoader] RemoveLoading: {url}, left {loadingInProcess.Count} loading tasks");
+            }
+            else
+            {
+                if (settings.debugLevel <= DebugLevel.Warning)
+                    Debug.LogWarning($"[ImageLoader] RemoveLoading: {url} not found in loading tasks");
             }
         }
 
@@ -48,17 +59,29 @@ public static void Init()
         /// Return all current loading Futures
         /// </summary>
         /// <returns>Returns read only list of all current loading Futures</returns>
-        public static IReadOnlyCollection<Future<Sprite>> GetLoadingFutures() => loadingInProcess.Values;
+        public static IReadOnlyCollection<Future<Sprite>> GetLoadingFutures() => loadingInProcess.Values.ToArray();
 
         /// <summary>
         /// Clear cache from Memory and Disk layers for all urls
         /// </summary>
+        /// <returns>Returns task of the disk cache clearing process</returns>
         public static Task ClearCache()
         {
             ClearMemoryCache();
             return ClearDiskCache();
         }
 
+        /// <summary>
+        /// Clear cache from Memory and Disk layers for all urls
+        /// </summary>
+        /// <param name="url">URL to the picture, web or local</param>
+        /// <returns>Returns task of the disk cache clearing process</returns>
+        public static Task ClearCache(string url)
+        {
+            ClearMemoryCache(url);
+            return ClearDiskCache(url);
+        }
+
         /// <summary>
         /// Checks cache at Memory and at Disk by the url
         /// </summary>

Assets/_PackageRoot/package.json

@@ -5,7 +5,7 @@
         "name": "Ivan Murzak",
         "url": "https://github.com/IvanMurzak"
     },
-    "version": "5.1.3",
+    "version": "5.2.0",
     "unity": "2019.2",
     "description": "Asynchronous image loading from remote or local destination. It has two layers of configurable Memory and Disk cache systems.",
     "dependencies": {