FileSystemStorage - base folder

managedcode · Apr 7, 2022 · 29f6842 · 29f6842
1 parent 2313741
commit 29f6842
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 17 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -13,8 +13,8 @@
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
         <PackageReadmeFile>README.md</PackageReadmeFile>
         <Product>Managed Code - Storage</Product>
-        <Version>1.1.0</Version>
-        <PackageVersion>1.1.0</PackageVersion>
+        <Version>1.1.1</Version>
+        <PackageVersion>1.1.1</PackageVersion>
     </PropertyGroup>
     <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
         <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>

diff --git a/ManagedCode.Storage.FileSystem/FileSystemStorage.cs b/ManagedCode.Storage.FileSystem/FileSystemStorage.cs
@@ -17,7 +17,7 @@ public class FileSystemStorage : IFileSystemStorage
 
     public FileSystemStorage(FileSystemStorageOptions fileSystemStorageOptions)
     {
-        _path = Path.Combine(fileSystemStorageOptions.CommonPath, fileSystemStorageOptions.Path);
+        _path = fileSystemStorageOptions?.BaseFolder ?? Environment.CurrentDirectory;
         EnsureDirectoryExists();
     }
 

diff --git a/ManagedCode.Storage.FileSystem/Options/FileSystemStorageOptions.cs b/ManagedCode.Storage.FileSystem/Options/FileSystemStorageOptions.cs
@@ -1,7 +1,6 @@
 namespace ManagedCode.Storage.FileSystem.Options;
 
 public class FileSystemStorageOptions
-{
-    public string CommonPath { get; set; } = null!;
-    public string Path { get; set; } = null!;
+{ 
+    public string BaseFolder { get; set; } = null!;
 }
diff --git a/ManagedCode.Storage.Tests/AspNetExtensions/StorageExtensionsTests.cs b/ManagedCode.Storage.Tests/AspNetExtensions/StorageExtensionsTests.cs
@@ -30,8 +30,7 @@ public static ServiceProvider ConfigureServices()
 
         services.AddFileSystemStorageAsDefault(opt =>
         {
-            opt.CommonPath = Path.Combine(Environment.CurrentDirectory, "managed-code-bucket");
-            opt.Path = "managed-code-bucket";
+            opt.BaseFolder = Path.Combine(Environment.CurrentDirectory, "managed-code-bucket");
         });
 
         return services.BuildServiceProvider();

diff --git a/ManagedCode.Storage.Tests/FileSystem/FileSystemTests.cs b/ManagedCode.Storage.Tests/FileSystem/FileSystemTests.cs
@@ -18,14 +18,12 @@ protected override ServiceProvider ConfigureServices()
 
         services.AddFileSystemStorageAsDefault(opt =>
         {
-            opt.CommonPath = Path.Combine(Environment.CurrentDirectory, "managed-code-bucket");
-            opt.Path = "managed-code-bucket";
+            opt.BaseFolder = Path.Combine(Environment.CurrentDirectory, "managed-code-bucket");
         });
 
         services.AddFileSystemStorage(new FileSystemStorageOptions
         {
-            CommonPath = Path.Combine(Environment.CurrentDirectory, "managed-code-bucket"),
-            Path = "managed-code-bucket"
+            BaseFolder = Path.Combine(Environment.CurrentDirectory, "managed-code-bucket")
         });
         return services.BuildServiceProvider();
     }

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-![img|300x200](https://github.com/managed-code-hub/Storage/raw/main/logo.png)
+![img|300x200](https://raw.githubusercontent.com/managed-code-hub/Storage/main/logo.png)
 # ManagedCode.Storage
 [![.NET](https://github.com/managed-code-hub/Storage/actions/workflows/dotnet.yml/badge.svg)](https://github.com/managed-code-hub/Storage/actions/workflows/dotnet.yml)
 [![Coverage Status](https://coveralls.io/repos/github/managed-code-hub/Storage/badge.svg?branch=main&service=github)](https://coveralls.io/github/managed-code-hub/Storage?branch=main)

diff --git a/Samples/WebApiSample/Program.cs b/Samples/WebApiSample/Program.cs
@@ -16,14 +16,12 @@
 
 builder.Services.AddFileSystemStorageAsDefault(new FileSystemStorageOptions
 {
-    CommonPath = Path.Combine(Environment.CurrentDirectory, "managed-code-bucket"),
-    Path = "managed-code-bucket"
+    BaseFolder = Path.Combine(Environment.CurrentDirectory, "managed-code-bucket"),
 });
 
 builder.Services.AddFileSystemStorage(new FileSystemStorageOptions
 {
-    CommonPath = Path.Combine(Environment.CurrentDirectory, "managed-code-bucket"),
-    Path = "managed-code-bucket"
+    BaseFolder = Path.Combine(Environment.CurrentDirectory, "managed-code-bucket"),
 });
 
 #endregion