Refactor Future and ImageLoader to enhance method visibility and improve loading futures management

Author: IvanMurzak

Assets/_PackageRoot/Runtime/Future/Future.WebRequest.cs

@@ -6,7 +6,7 @@ namespace Extensions.Unity.ImageLoader
 {
     public partial class Future<T>
     {
-        internal Future<T> SetWebRequest(UnityWebRequest webRequest)
+        protected virtual Future<T> SetWebRequest(UnityWebRequest webRequest)
         {
             WebRequest = PrepareWebRequest(webRequest);
             return this;
@@ -17,7 +17,7 @@ protected virtual UnityWebRequest PrepareWebRequest(UnityWebRequest webRequest)
             return webRequest;
         }
 
-        internal UnityWebRequestAsyncOperation SendWebRequest()
+        protected virtual UnityWebRequestAsyncOperation SendWebRequest()
         {
             if (WebRequest == null)
                 throw new Exception($"[ImageLoader] Future[id={Id}] UnityWebRequest is not set. Use SetWebRequest method before calling SendWebRequest.");

Assets/_PackageRoot/Runtime/ImageLoader.cs

@@ -1,38 +1,11 @@
 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 ConcurrentDictionary<string, Future<Sprite>> loadingInProcess = new ConcurrentDictionary<string, Future<Sprite>>();
-        private static void AddLoading(Future<Sprite> future)
-        {
-            if (!loadingInProcess.TryAdd(future.Url, future))
-                throw new Exception($"[ImageLoader] Future[id={future.Id}] AddLoading: already loading\n{future.Url}");
-
-            if (settings.debugLevel.IsActive(DebugLevel.Log))
-                Debug.Log($"[ImageLoader] Future[id={future.Id}] AddLoading: total {loadingInProcess.Count} loading tasks\n{future.Url}");
-        }
-        private static void RemoveLoading(Future<Sprite> future) => RemoveLoading(future.Url);
-        private static void RemoveLoading(string url)
-        {
-            if (loadingInProcess.TryRemove(url, out var future))
-            {
-                if (settings.debugLevel.IsActive(DebugLevel.Log))
-                    Debug.Log($"[ImageLoader] Future[id={future.Id}] RemoveLoading: left {loadingInProcess.Count} loading tasks\n{url}");
-            }
-            else
-            {
-                if (settings.debugLevel.IsActive(DebugLevel.Warning))
-                    Debug.LogWarning($"[ImageLoader] Future[id={future.Id}] RemoveLoading: not found in loading tasks\n{url}");
-            }
-        }
-
         /// <summary>
         /// Initialization of static variables, should be called from main thread at project start
         /// </summary>
@@ -46,20 +19,39 @@ public static void Init()
         /// Check if the url is loading right now
         /// </summary>
         /// <returns>Returns true if the url is loading right now</returns>
-        public static bool IsLoading(string url) => loadingInProcess.ContainsKey(url);
+        public static bool IsLoadingSprite<T>(string url) => Future<Sprite>.IsLoading(url);
+
+        /// <summary>
+        /// Check if the url is loading right now
+        /// </summary>
+        /// <returns>Returns true if the url is loading right now</returns>
+        public static bool IsLoadingTexture<T>(string url) => Future<Texture2D>.IsLoading(url);
 
         /// <summary>
         /// Find and return current loading Future by the url
         /// <param name="url">URL to the picture, web or local</param>
         /// </summary>
         /// <returns>Returns current loading Future or null if none</returns>
-        public static Future<Sprite> GetLoadingFuture(string url) => loadingInProcess.TryGetValue(url, out var future) ? future : null;
+        public static Future<Sprite> GetLoadingSpriteFuture<T>(string url) => Future<Sprite>.GetLoadingFuture(url);
+
+        /// <summary>
+        /// Find and return current loading Future by the url
+        /// <param name="url">URL to the picture, web or local</param>
+        /// </summary>
+        /// <returns>Returns current loading Future or null if none</returns>
+        public static Future<Texture2D> GetLoadingTextureFuture<T>(string url) => Future<Texture2D>.GetLoadingFuture(url);
+
+        /// <summary>
+        /// Return all current loading Futures
+        /// </summary>
+        /// <returns>Returns read only list of all current loading Futures</returns>
+        public static IReadOnlyCollection<Future<Sprite>> GetLoadingSpriteFutures() => Future<Sprite>.GetLoadingFutures();
 
         /// <summary>
         /// 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.ToList().AsReadOnly();
+        public static IReadOnlyCollection<Future<Texture2D>> GetLoadingTextureFutures() => Future<Texture2D>.GetLoadingFutures();
 
         /// <summary>
         /// Clear cache from Memory and Disk layers for all urls

Assets/_PackageRoot/Tests/Editor/Test.cs

@@ -13,7 +13,8 @@ public virtual IEnumerator SetUp()
         }
         public virtual IEnumerator TearDown()
         {
-            Assert.Zero(ImageLoader.GetLoadingFutures().Count);
+            Assert.Zero(ImageLoader.GetLoadingSpriteFutures().Count);
+            Assert.Zero(ImageLoader.GetLoadingTextureFutures().Count);
             yield return TestUtils.ClearEverything("<b>Test End </b>");
         }
     }

Assets/_PackageRoot/Tests/Editor/TestFuture.cs

@@ -19,15 +19,24 @@ [UnityTest] public IEnumerator GetAllLoadingFutures()
             ImageLoader.settings.useDiskCache = true;
             ImageLoader.settings.useMemoryCache = true;
 
-            var loadingFutures = ImageLoader.GetLoadingFutures();
-            Assert.NotNull(loadingFutures);
-            Debug.Log($"Loading future count={loadingFutures.Count}");
-            foreach (var loadingFuture in loadingFutures)
+            var loadingSpriteFutures = ImageLoader.GetLoadingSpriteFutures();
+            Assert.NotNull(loadingSpriteFutures);
+            Debug.Log($"Loading Future<Sprite> count={loadingSpriteFutures.Count}");
+            foreach (var loadingFuture in loadingSpriteFutures)
             {
-                Debug.Log($"Loading future: {loadingFuture.Url}, Status={loadingFuture.Status}");
+                Debug.Log($"Loading Future<Sprite>: {loadingFuture.Url}, Status={loadingFuture.Status}");
             }
-            Assert.Zero(loadingFutures.Count);
+            Assert.Zero(loadingSpriteFutures.Count);
             yield return UniTask.Yield();
+
+            var loadingTextureFutures = ImageLoader.GetLoadingTextureFutures();
+            Assert.NotNull(loadingTextureFutures);
+            Debug.Log($"Loading Future<Texture2D> count={loadingTextureFutures.Count}");
+            foreach (var loadingFuture in loadingTextureFutures)
+            {
+                Debug.Log($"Loading Future<Texture2D>: {loadingFuture.Url}, Status={loadingFuture.Status}");
+            }
+            Assert.Zero(loadingTextureFutures.Count);
         }
         [UnityTest] public IEnumerator LoadingRefAndWaiting_NoLogs() => TestUtils.RunNoLogs(LoadingRefAndWaiting);
         [UnityTest] public IEnumerator LoadingRefAndWaiting()