Merge pull request #155 from sebagomez/patch/blob-multiple-folder

Blobs not listed correclty when using Azurite

.gitignore

@@ -8,6 +8,8 @@ obj/
 
 *.user
 *.suo
+
+__azurite*.json
 private*.data
 
 .DS_Store

.vscode/launch.json

@@ -60,6 +60,7 @@
 			},
 			"env": {
 				"ASPNETCORE_ENVIRONMENT": "Development"
+				//"AZURE_STORAGE_CONNECTIONSTRING": "DefaultEndpointsProtocol=http;AccountName=devstoreaccount1;AccountKey=Eby8vdM02xNOcqFlqUwJPLlmEtlCDXJ1OUzFT50uSRZ6IFsuFq2UVErCz4I6tq/K1SZFPTOtr/KBHBeksoGMGw==;BlobEndpoint=http://localhost:10000/devstoreaccount1;QueueEndpoint=http://localhost:10001/devstoreaccount1;TableEndpoint=http://localhost:10002/devstoreaccount1;"
 			},
 			"sourceFileMap": {
 				"/Views": "${workspaceFolder}/Views"

README.md

@@ -104,15 +104,15 @@ To spin up a container with the latest version just run the following command
 docker run --rm -it -p 8000:8080 sebagomez/azurestorageexplorer
 ```
 
-Then open your browser and navigate to http://localhost:8000, and voilá!
+Then open your browser and navigate to http://localhost:8000, et voila!
 
 ## Docker Compose
 
-There's now a Docker Compose manifest in this repo that allows you to spin [Azurite](https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azurite?tabs=visual-studio%2Cblob-storage) and Azure Storage web Explorer. In the manifest you can see that the `AZURE_STORAGE_CONNECTIONSTRING` environment variable is already set up to connect to Azurite; so fter spinning up the containers you can navigate to http://localhost:8080 and you should be already logged in to Azurite.
+There's now a Docker Compose manifest in this repo that allows you to spin [Azurite](https://learn.microsoft.com/en-us/azure/storage/common/storage-use-azurite?tabs=visual-studio%2Cblob-storage) and Azure Storage web Explorer. In the manifest you can see that the `AZURE_STORAGE_CONNECTIONSTRING` environment variable is already set up to connect to Azurite; so after spinning up the containers you can navigate to http://localhost:8080 and you should be already logged in to Azurite.
 
 
 ```sh
- docker-compose -f ./docker-compose/azurestorageexplorer.yaml up 
+docker-compose -f ./docker-compose/azurestorageexplorer.yaml up 
 ```
 
 ## Kubernetes

src/StorageLibrary/AzureContainer.cs

@@ -38,11 +38,6 @@ public async Task<List<BlobItemWrapper>> ListBlobsAsync(string containerName, st
 			BlobContainerClient container = blobServiceClient.GetBlobContainerClient(containerName);
 
 			List<BlobItemWrapper> results = new List<BlobItemWrapper>();
-
-			string localPath = "/";
-			if (!string.IsNullOrEmpty(path))
-				localPath = path;
-
 			await foreach (BlobHierarchyItem blobItem in container.GetBlobsByHierarchyAsync(BlobTraits.None, BlobStates.None, "/", path, CancellationToken.None))
 			{
 				BlobItemWrapper wrapper = null;
@@ -54,7 +49,7 @@ public async Task<List<BlobItemWrapper>> ListBlobsAsync(string containerName, st
 				}
 				else if (blobItem.IsPrefix)
 				{
-					wrapper = new BlobItemWrapper($"{container.Uri}{localPath}{blobItem.Prefix}", 0);
+					wrapper = new BlobItemWrapper($"{container.Uri}/{blobItem.Prefix}", 0);
 				}
 
 				if (wrapper != null && !results.Contains(wrapper))

src/StorageLibrary/Common/BlobItemWrapper.cs

@@ -7,8 +7,17 @@ public class BlobItemWrapper : IEquatable<BlobItemWrapper>, IComparable<BlobItem
 	{
 		Uri m_internalUri;
 		public string Name { get => HttpUtility.UrlDecode(m_internalUri.Segments[m_internalUri.Segments.Length - 1]); }
-		public string Path { get => m_internalUri.LocalPath.Substring(Container.Length + 1, m_internalUri.LocalPath.Length - Container.Length - Name.Length - 1); }
-		public string Container { get => m_internalUri.Segments[1]; }
+		public string Path
+		{
+			get
+			{
+				int containerPos = m_internalUri.LocalPath.IndexOf(Container) + Container.Length;
+
+				return m_internalUri.LocalPath.Substring(containerPos, (m_internalUri.LocalPath.Length) - (containerPos) - Name.Length);
+			}
+		}
+
+		public string Container { get => IsAzurite ? m_internalUri.Segments[2] : m_internalUri.Segments[1]; }
 		public string FullName { get => $"{Path}{Name}"; }
 		public bool IsFile { get => !m_internalUri.Segments[m_internalUri.Segments.Length - 1].EndsWith("/"); }
 		public string Url
@@ -17,6 +26,8 @@ public string Url
 			private set { m_internalUri = new Uri(value); }
 		}
 
+		public bool IsAzurite { get => m_internalUri.IsLoopback; }
+
 		public long Size { get; private set; }
 
 		public decimal SizeInKBs { get => (decimal)Size / 1024; }

src/web/Directory.Build.props

@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-    <AzureStorageWebExplorerVersion>2.16.1</AzureStorageWebExplorerVersion>
+    <AzureStorageWebExplorerVersion>2.16.2</AzureStorageWebExplorerVersion>
   </PropertyGroup>
 </Project>