add Name property to IStore

improve getAsync
add Delete Test

Author: sandorfr

src/GeekLearning.Storage.Azure/AzureStorageProvider.cs

@@ -12,9 +12,9 @@ public string Name
             }
         }
 
-        public IStore BuildStore(StorageOptions.StorageStore storeOptions)
+        public IStore BuildStore(string storeName, StorageOptions.StorageStore storeOptions)
         {
-            return new AzureStore(storeOptions.Parameters["ConnectionString"], storeOptions.Parameters["Container"]);
+            return new AzureStore(storeName, storeOptions.Parameters["ConnectionString"], storeOptions.Parameters["Container"]);
         }
     }
 }

src/GeekLearning.Storage.Azure/AzureStore.cs

@@ -15,8 +15,10 @@ public class AzureStore : IStore
         private Lazy<CloudBlobClient> client;
         private string containerName;
 
-        public AzureStore(string connectionString, string containerName)
+        public AzureStore(string storeName, string connectionString, string containerName)
         {
+            this.Name = storeName;
+
             if (string.IsNullOrWhiteSpace(connectionString))
             {
                 throw new ArgumentNullException("connectionString");
@@ -34,9 +36,23 @@ public AzureStore(string connectionString, string containerName)
             container = new Lazy<CloudBlobContainer>(() => this.client.Value.GetContainerReference(this.containerName));
         }
 
+        public string Name { get; }
+
         private async Task<Internal.AzureFileReference> InternalGetAsync(IPrivateFileReference file)
         {
-            return new Internal.AzureFileReference(file.Path, await this.container.Value.GetBlobReferenceFromServerAsync(file.Path));
+            try
+            {
+                var blob = await this.container.Value.GetBlobReferenceFromServerAsync(file.Path);
+                return new Internal.AzureFileReference(file.Path, blob);
+            }
+            catch (StorageException storageException)
+            {
+                if (storageException.RequestInformation.HttpStatusCode == 404)
+                {
+                    return null;
+                }
+                throw;
+            }
         }
 
         public async Task<IFileReference> GetAsync(IPrivateFileReference file)

src/GeekLearning.Storage.FileSystem/FileSystemStorageProvider.cs

@@ -20,9 +20,9 @@ public string Name
             }
         }
 
-        public IStore BuildStore(StorageOptions.StorageStore storeOptions)
+        public IStore BuildStore(string storeName, StorageOptions.StorageStore storeOptions)
         {
-            return new FileSystemStore(storeOptions.Parameters["Path"], this.options.Value.RootPath);
+            return new FileSystemStore(storeName, storeOptions.Parameters["Path"], this.options.Value.RootPath);
         }
     }
 }

src/GeekLearning.Storage.FileSystem/FileSystemStore.cs

@@ -9,8 +9,10 @@ public class FileSystemStore : IStore
     {
         private string absolutePath;
 
-        public FileSystemStore(string path, string rootPath)
+        public FileSystemStore(string storeName, string path, string rootPath)
         {
+            this.Name = storeName;
+
             if (string.IsNullOrEmpty(path))
             {
                 throw new ArgumentNullException("path");
@@ -25,10 +27,16 @@ public FileSystemStore(string path, string rootPath)
                 this.absolutePath = Path.Combine(rootPath, path);
             }
         }
+        public string Name { get; }
 
         private Internal.FileSystemFileReference InternalGetAsync(IPrivateFileReference file)
         {
-            return new Internal.FileSystemFileReference(Path.Combine(this.absolutePath, file.Path), file.Path);
+            var fullPath = Path.Combine(this.absolutePath, file.Path);
+            if (File.Exists(fullPath))
+            {
+                return new Internal.FileSystemFileReference(fullPath, file.Path);
+            }
+            return null;
         }
 
         public async Task<IFileReference> GetAsync(IPrivateFileReference file)

src/GeekLearning.Storage/IStorageProvider.cs

@@ -4,6 +4,6 @@ public interface IStorageProvider
     {
         string Name { get; }
 
-        IStore BuildStore(StorageOptions.StorageStore storeOptions);
+        IStore BuildStore(string storeName, StorageOptions.StorageStore storeOptions);
     }
 }

src/GeekLearning.Storage/IStore.cs

@@ -6,6 +6,8 @@
 
     public interface IStore
     {
+        string Name { get; }
+
         Task<IFileReference[]> ListAsync(string path, bool recursive);
 
         Task<IFileReference[]> ListAsync(string path, string searchPattern, bool recursive);

src/GeekLearning.Storage/StorageFactory.cs

@@ -18,7 +18,7 @@ public StorageFactory(IEnumerable<IStorageProvider> storageProviders, IOptions<S
         public IStore GetStore(string store)
         {
             var conf = this.options.Value.Stores[store];
-            return this.storageProviders.FirstOrDefault(x => x.Name == conf.Provider).BuildStore(conf);
+            return this.storageProviders.FirstOrDefault(x => x.Name == conf.Provider).BuildStore(store, conf);
         }
     }
 }

tests/GeekLearning.Integration.Test/DeleteTests.cs

@@ -0,0 +1,38 @@
+namespace GeekLearning.Integration.Test
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Threading.Tasks;
+    using Xunit;
+    using GeekLearning.Storage;
+    using Microsoft.Extensions.DependencyInjection;
+    using System.IO;
+
+    [Collection(nameof(IntegrationCollection))]
+    [Trait("Operation", "Delete"), Trait("Kind", "Integration")]
+    public class DeleteTests
+    {
+        StoresFixture storeFixture;
+
+        public DeleteTests(StoresFixture fixture)
+        {
+            this.storeFixture = fixture;
+        }
+
+        [Theory(DisplayName = nameof(Delete)), InlineData("azure"), InlineData("filesystem")]
+        public async Task Delete(string storeName)
+        {
+            var storageFactory = this.storeFixture.Services.GetRequiredService<IStorageFactory>();
+
+            var store = storageFactory.GetStore(storeName);
+
+            var file = await store.GetAsync("Delete/ToDelete.txt");
+
+            await file.DeleteAsync();
+
+            Assert.Null(await store.GetAsync("Delete/ToDelete.txt"));
+            Assert.NotNull(await store.GetAsync("Delete/ToSurvive.txt"));
+        }
+    }
+}

tests/GeekLearning.Integration.Test/SampleDirectory/Delete/ToDelete.txt

@@ -0,0 +1 @@
+

tests/GeekLearning.Integration.Test/SampleDirectory/Delete/ToSurvive.txt

@@ -0,0 +1 @@
+