Version 0.6.1

rds1983 · Aug 25, 2023 · beb2c4d · beb2c4d
1 parent 5e548c8
commit beb2c4d
Show file tree

Hide file tree

Showing 9 changed files with 107 additions and 126 deletions.
diff --git a/src/AssetManagementBase.csproj b/src/AssetManagementBase.csproj
@@ -6,7 +6,7 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/rds1983/AssetManagementBase</PackageProjectUrl>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>0.6.0</Version>
+    <Version>0.6.1</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Release'">

diff --git a/src/AssetManager.cs b/src/AssetManager.cs
@@ -1,87 +1,54 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 
 namespace AssetManagementBase
 {
-	public struct AssetLoaderContext
+	public delegate Stream AssetOpener(string assetName);
+	public delegate T AssetLoader<T>(AssetManager manager, string assetName, object settings);
+
+	public class AssetManager
 	{
-		public AssetManager Manager;
-		public string Name;
-		public Func<Stream> DataStreamOpener;
-		public object Settings;
+		internal const char SeparatorSymbol = '/';
+		internal const string SeparatorString = "/";
 
-		/// <summary>
-		/// Reads asset stream as string
-		/// </summary>
-		/// <returns></returns>
-		public string ReadDataAsString()
-		{
-			string result;
+		private readonly AssetManagerCore _core;
+		private readonly string _currentFolder = SeparatorString;
 
-			using (var stream = DataStreamOpener())
-			using (var textReader = new StreamReader(stream))
-			{
-				result = textReader.ReadToEnd();
-			}
+		public Dictionary<string, object> Cache => _core.Cache;
 
-			return result;
+		public AssetManager(AssetOpener assetOpener)
+		{
+			_core = new AssetManagerCore(assetOpener);
 		}
 
-		/// <summary>
-		/// Reads asset stream as byte array
-		/// </summary>
-		/// <returns></returns>
-		public byte[] ReadAssetAsByteArray()
+		internal AssetManager(AssetManagerCore core, string currentFolder)
 		{
-			using (var stream = DataStreamOpener())
-			using (var ms = new MemoryStream())
-			{
-				stream.CopyTo(ms);
-				return ms.ToArray();
-			}
+			_core = core;
+			_currentFolder = currentFolder;
 		}
-	}
 
-	public delegate Stream AssetOpener(string assetName);
-	public delegate T AssetLoader<T>(AssetLoaderContext context);
+		public Stream OpenAssetStream(string assetName) => _core.OpenAssetStream(BuildFullPath(assetName));
 
-	public class AssetManager
-	{
-		public const char SeparatorSymbol = '/';
-		public const string SeparatorString = "/";
-		private readonly AssetOpener _assetOpener;
-		private string _currentFolder = SeparatorString;
+		/// <summary>
+		/// Reads asset stream as string
+		/// </summary>
+		/// <returns></returns>
+		public string ReadAssetAsString(string assetName) => _core.ReadAssetAsString(BuildFullPath(assetName));
 
-		public Dictionary<string, object> Cache { get; } = new Dictionary<string, object>();
+		/// <summary>
+		/// Reads asset stream as byte array
+		/// </summary>
+		/// <returns></returns>
+		public byte[] ReadAssetAsByteArray(string assetName) => _core.ReadAssetAsByteArray(BuildFullPath(assetName));
 
-		public AssetManager(AssetOpener assetOpener)
-		{
-			_assetOpener = assetOpener ?? throw new ArgumentNullException(nameof(assetOpener));
-		}
 
 		public bool HasAsset(string assetName, object settings = null)
 		{
 			assetName = BuildFullPath(assetName);
 			var cacheKey = BuildCacheKey(assetName, settings);
 
-			return Cache.ContainsKey(cacheKey);
-		}
-
-		private Func<Stream> CreateStreamOpener(string assetName)
-		{
-			return () =>
-			{
-				var stream = _assetOpener(assetName);
-
-				if (stream == null)
-				{
-					throw new Exception(string.Format("Can't open asset {0}", assetName));
-				}
-
-				return stream;
-			};
+			return _core.Cache.ContainsKey(cacheKey);
 		}
 
 		public T UseLoader<T>(AssetLoader<T> loader, string assetName, object settings = null, bool storeInCache = true)
@@ -90,47 +57,29 @@ public T UseLoader<T>(AssetLoader<T> loader, string assetName, object settings =
 			var cacheKey = BuildCacheKey(assetName, settings);
 
 			object cached;
-			if (Cache.TryGetValue(cacheKey, out cached))
+			if (_core.Cache.TryGetValue(cacheKey, out cached))
 			{
 				// Found in cache
 				return (T)cached;
 			}
 
-			var oldFolder = _currentFolder;
-
-			T result;
-
-			try
+			var assetManager = this;
+			var separatorIndex = assetName.LastIndexOf(SeparatorSymbol);
+			if (separatorIndex != -1)
 			{
-				var separatorIndex = assetName.LastIndexOf(SeparatorSymbol);
-				if (separatorIndex != -1)
+				var assetFolder = assetName.Substring(0, separatorIndex);
+				if (!string.IsNullOrEmpty(assetFolder))
 				{
-					_currentFolder = assetName.Substring(0, separatorIndex);
-					if (string.IsNullOrEmpty(_currentFolder))
-					{
-						_currentFolder = SeparatorString;
-					}
+					assetManager = new AssetManager(_core, assetFolder);
 				}
-
-				var context = new AssetLoaderContext
-				{
-					Manager = this,
-					Name = assetName,
-					DataStreamOpener = CreateStreamOpener(assetName),
-					Settings = settings,
-				};
-
-				result = loader(context);
-			}
-			finally
-			{
-				_currentFolder = oldFolder;
 			}
 
+			var result = loader(assetManager, assetName, settings);
+
 			if (storeInCache)
 			{
 				// Store in cache
-				Cache[cacheKey] = result;
+				_core.Cache[cacheKey] = result;
 			}
 
 			return result;
@@ -174,12 +123,12 @@ private static string CombinePath(string _base, string url)
 				return url;
 			}
 
-			if (_base[_base.Length - 1] == AssetManager.SeparatorSymbol)
+			if (_base[_base.Length - 1] == SeparatorSymbol)
 			{
 				return _base + url;
 			}
 
-			return _base + AssetManager.SeparatorSymbol + url;
+			return _base + SeparatorSymbol + url;
 		}
 
 		public static AssetManager CreateFileAssetManager(string baseFolder) => new AssetManager(DefaultOpeners.CreateFileOpener(baseFolder));

diff --git a/src/AssetManagerCore.cs b/src/AssetManagerCore.cs
@@ -0,0 +1,51 @@
+using System.Collections.Generic;
+using System.IO;
+using System;
+
+namespace AssetManagementBase
+{
+	internal class AssetManagerCore
+	{
+		private readonly AssetOpener _assetOpener;
+
+		public Dictionary<string, object> Cache { get; } = new Dictionary<string, object>();
+
+		public AssetManagerCore(AssetOpener assetOpener)
+		{
+			_assetOpener = assetOpener ?? throw new ArgumentNullException(nameof(assetOpener));
+		}
+
+		public Stream OpenAssetStream(string assetName) => _assetOpener(assetName);
+
+		/// <summary>
+		/// Reads asset stream as string
+		/// </summary>
+		/// <returns></returns>
+		public string ReadAssetAsString(string assetName)
+		{
+			string result;
+
+			using (var stream = OpenAssetStream(assetName))
+			using (var textReader = new StreamReader(stream))
+			{
+				result = textReader.ReadToEnd();
+			}
+
+			return result;
+		}
+
+		/// <summary>
+		/// Reads asset stream as byte array
+		/// </summary>
+		/// <returns></returns>
+		public byte[] ReadAssetAsByteArray(string assetName)
+		{
+			using (var stream = OpenAssetStream(assetName))
+			using (var ms = new MemoryStream())
+			{
+				stream.CopyTo(ms);
+				return ms.ToArray();
+			}
+		}
+	}
+}
diff --git a/src/DefaultLoaders.cs b/src/DefaultLoaders.cs
@@ -2,8 +2,8 @@
 {
 	public static class DefaultLoaders
 	{
-		private static AssetLoader<string> StringLoader = context => context.ReadDataAsString();
-		private static AssetLoader<byte[]> ByteArrayLoader = context => context.ReadAssetAsByteArray();
+		private static AssetLoader<string> StringLoader = (manager, assetName, settings) => manager.ReadAssetAsString(assetName);
+		private static AssetLoader<byte[]> ByteArrayLoader = (manager, assetName, settings) => manager.ReadAssetAsByteArray(assetName);
 
 		public static string LoadString(this AssetManager assetManager, string assetName, bool storeInCache = true) => assetManager.UseLoader(StringLoader, assetName, storeInCache: storeInCache);
 		public static byte[] LoadByteArray(this AssetManager assetManager, string assetName, bool storeInCache = true) => assetManager.UseLoader(ByteArrayLoader, assetName, storeInCache: storeInCache);

diff --git a/src/Utility/PathUtils.cs b/src/Utility/PathUtils.cs
diff --git a/tests/AssetManagementBase.Tests.csproj b/tests/AssetManagementBase.Tests.csproj
@@ -6,6 +6,10 @@
 
   <ItemGroup>
     <EmbeddedResource Include="Resources\**\*.*" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="Resources\sub\test.txt" />
   </ItemGroup>  
 
   <ItemGroup>

diff --git a/tests/AssetManagerExtensions.cs b/tests/AssetManagerExtensions.cs
@@ -4,9 +4,9 @@ namespace AssetManagementBase.Tests
 {
 	public static class AssetManagerExtensions
 	{
-		private static AssetLoader<UserProfile> _userProfileLoader = (context) =>
+		private static AssetLoader<UserProfile> _userProfileLoader = (manager, assetName, settings) =>
 		{
-			var data = context.ReadDataAsString();
+			var data = manager.ReadAssetAsString(assetName);
 
 			var xDoc = XDocument.Parse(data);
 

diff --git a/tests/ResourceAssetResolverTests.cs b/tests/ResourceAssetResolverTests.cs
@@ -53,6 +53,12 @@ public void TestWithEndDot()
 			TestResourceAccess("Resources.", true, "test.txt");
 		}
 
+		[Test]
+		public void TestSubFolder()
+		{
+			TestResourceAccess("Resources.", true, "sub/test.txt");
+		}
+
 		[Test]
 		public void TestWithoutPrependAssemblyName()
 		{

diff --git a/tests/Resources/sub/test.txt b/tests/Resources/sub/test.txt
@@ -0,0 +1 @@
+Test