feat: Make the ConvertToBlobInfo and ConvertToBlobFolder methods virtual (#30)

Author: alexeyshibanov

src/VirtoCommerce.AzureBlobAssetsModule.Core/AzureBlobProvider.cs

@@ -17,7 +17,6 @@
 using VirtoCommerce.Platform.Core.Events;
 using VirtoCommerce.Platform.Core.Exceptions;
 using VirtoCommerce.Platform.Core.Extensions;
-using VirtoCommerce.Platform.Core.Modularity;
 using BlobInfo = VirtoCommerce.AssetsModule.Core.Assets.BlobInfo;
 
 namespace VirtoCommerce.AzureBlobAssetsModule.Core
@@ -78,7 +77,8 @@ public virtual async Task<BlobInfo> GetBlobInfoAsync(string blobUrl)
             {
                 var blob = GetBlockBlobClient(blobUrl);
                 var props = await blob.GetPropertiesAsync();
-                result = ConvertToBlobInfo(blob, props.Value);
+                var blobTagResult = await blob.GetTagsAsync();
+                result = ConvertToBlobInfo(blob, props.Value, blobTagResult.Value?.Tags);
             }
             catch
             {
@@ -424,82 +424,7 @@ public string GetAbsoluteUrl(string inputUrl)
 
         #endregion IBlobUrlResolver Members
 
-        private async Task<BlobContainerClient> CreateContainerIfNotExists(string blobUrl)
-        {
-            var container = GetBlobContainerClient(blobUrl);
-
-            if (!await container.ExistsAsync())
-            {
-                var accessType = _allowBlobPublicAccess ? PublicAccessType.Blob : PublicAccessType.None;
-                await container.CreateAsync(accessType);
-            }
-
-            return container;
-        }
-
-        /// <summary>
-        /// Return outline folder from absolute or relative URL
-        /// </summary>
-        /// <param name="url"></param>
-        /// <returns></returns>
-        private static string[] GetOutlineFromUrl(string url)
-        {
-            var relativeUrl = url;
-            if (url.IsAbsoluteUrl())
-            {
-                relativeUrl = Uri.UnescapeDataString(new Uri(url).AbsolutePath);
-            }
-
-            var start = 0;
-            var end = 0;
-            if (relativeUrl.StartsWith(Delimiter))
-            {
-                start++;
-            }
-            if (relativeUrl.EndsWith(Delimiter))
-            {
-                end++;
-            }
-            relativeUrl = relativeUrl[start..^end];
-
-            return relativeUrl.Split(Delimiter[0], '\\'); // name may be empty
-        }
-
-        private static string GetContainerNameFromUrl(string url)
-        {
-            return GetOutlineFromUrl(url).First();
-        }
-
-        private static string GetDirectoryPathFromUrl(string url)
-        {
-            var result = string.Join(Delimiter, GetOutlineFromUrl(url).Skip(1).ToArray());
-            return !string.IsNullOrEmpty(result) ? HttpUtility.UrlDecode(result) + Delimiter : null;
-        }
-
-        private static string GetFilePathFromUrl(string url)
-        {
-            var result = string.Join(Delimiter, GetOutlineFromUrl(url).Skip(1).ToArray());
-            return !string.IsNullOrEmpty(result) ? HttpUtility.UrlDecode(result) : null;
-        }
-
-        private BlockBlobClient GetBlockBlobClient(string blobUrl)
-        {
-            var filePath = GetFilePathFromUrl(blobUrl);
-            var container = GetBlobContainerClient(blobUrl);
-            var blob = container.GetBlockBlobClient(filePath);
-
-            return blob;
-        }
-
-        private BlobContainerClient GetBlobContainerClient(string blobUrl)
-        {
-            var containerName = GetContainerNameFromUrl(blobUrl);
-            var container = _blobServiceClient.GetBlobContainerClient(containerName);
-
-            return container;
-        }
-
-        private BlobInfo ConvertToBlobInfo(BlobBaseClient blob, BlobProperties props)
+        protected virtual BlobInfo ConvertToBlobInfo(BlobBaseClient blob, BlobProperties props, IDictionary<string, string> tags)
         {
             var blobInfo = AbstractTypeFactory<BlobInfo>.TryCreateInstance();
 
@@ -518,7 +443,7 @@ private BlobInfo ConvertToBlobInfo(BlobBaseClient blob, BlobProperties props)
             return blobInfo;
         }
 
-        private BlobInfo ConvertToBlobInfo(BlobItem blob, Uri baseUri)
+        protected virtual BlobInfo ConvertToBlobInfo(BlobItem blob, Uri baseUri)
         {
             var blobInfo = AbstractTypeFactory<BlobInfo>.TryCreateInstance();
 
@@ -537,7 +462,7 @@ private BlobInfo ConvertToBlobInfo(BlobItem blob, Uri baseUri)
             return blobInfo;
         }
 
-        private BlobFolder ConvertToBlobFolder(BlobHierarchyItem blobHierarchyItem, Uri baseUri, BlobContainerProperties containerProperties)
+        protected virtual BlobFolder ConvertToBlobFolder(BlobHierarchyItem blobHierarchyItem, Uri baseUri, BlobContainerProperties containerProperties)
         {
             var folder = AbstractTypeFactory<BlobFolder>.TryCreateInstance();
 
@@ -552,7 +477,7 @@ private BlobFolder ConvertToBlobFolder(BlobHierarchyItem blobHierarchyItem, Uri
             return folder;
         }
 
-        private BlobFolder ConvertToBlobFolder(BlobContainerItem container)
+        protected virtual BlobFolder ConvertToBlobFolder(BlobContainerItem container)
         {
             var folder = AbstractTypeFactory<BlobFolder>.TryCreateInstance();
 
@@ -567,6 +492,81 @@ private BlobFolder ConvertToBlobFolder(BlobContainerItem container)
             return folder;
         }
 
+        protected async Task<BlobContainerClient> CreateContainerIfNotExists(string blobUrl)
+        {
+            var container = GetBlobContainerClient(blobUrl);
+
+            if (!await container.ExistsAsync())
+            {
+                var accessType = _allowBlobPublicAccess ? PublicAccessType.Blob : PublicAccessType.None;
+                await container.CreateAsync(accessType);
+            }
+
+            return container;
+        }
+
+        protected BlockBlobClient GetBlockBlobClient(string blobUrl)
+        {
+            var filePath = GetFilePathFromUrl(blobUrl);
+            var container = GetBlobContainerClient(blobUrl);
+            var blob = container.GetBlockBlobClient(filePath);
+
+            return blob;
+        }
+
+        protected BlobContainerClient GetBlobContainerClient(string blobUrl)
+        {
+            var containerName = GetContainerNameFromUrl(blobUrl);
+            var container = _blobServiceClient.GetBlobContainerClient(containerName);
+
+            return container;
+        }
+
+        /// <summary>
+        /// Return outline folder from absolute or relative URL
+        /// </summary>
+        /// <param name="url"></param>
+        /// <returns></returns>
+        private static string[] GetOutlineFromUrl(string url)
+        {
+            var relativeUrl = url;
+            if (url.IsAbsoluteUrl())
+            {
+                relativeUrl = Uri.UnescapeDataString(new Uri(url).AbsolutePath);
+            }
+
+            var start = 0;
+            var end = 0;
+            if (relativeUrl.StartsWith(Delimiter))
+            {
+                start++;
+            }
+            if (relativeUrl.EndsWith(Delimiter))
+            {
+                end++;
+            }
+            relativeUrl = relativeUrl[start..^end];
+
+            return relativeUrl.Split(Delimiter[0], '\\'); // name may be empty
+        }
+
+        private static string GetContainerNameFromUrl(string url)
+        {
+            return GetOutlineFromUrl(url).First();
+        }
+
+        private static string GetDirectoryPathFromUrl(string url)
+        {
+            var result = string.Join(Delimiter, GetOutlineFromUrl(url).Skip(1).ToArray());
+            return !string.IsNullOrEmpty(result) ? HttpUtility.UrlDecode(result) + Delimiter : null;
+        }
+
+        private static string GetFilePathFromUrl(string url)
+        {
+            var result = string.Join(Delimiter, GetOutlineFromUrl(url).Skip(1).ToArray());
+            return !string.IsNullOrEmpty(result) ? HttpUtility.UrlDecode(result) : null;
+        }
+
         private static string GetParentUrl(Uri baseUri, string blobPrefix)
         {
             var baseUriString = baseUri.GetLeftPart(UriPartial.Path);