Remove DB and Directory settings out of the BTCPayServerOptions (#2168)

This commit is contained in:
Nicolas Dorier
2020-12-27 22:06:00 +09:00
committed by GitHub
parent 0dcd834535
commit a6ee64ea63
11 changed files with 126 additions and 123 deletions

View File

@@ -1,5 +1,6 @@
using System;
using System.IO;
using System.Runtime.InteropServices.ComTypes;
using BTCPayServer.Configuration;
using BTCPayServer.Storage.Services;
using BTCPayServer.Storage.Services.Providers;
@@ -27,30 +28,28 @@ namespace BTCPayServer.Storage
// serviceCollection.AddSingleton<IStorageProviderService, GoogleCloudStorageFileProviderService>();
}
public static void UseProviderStorage(this IApplicationBuilder builder, BTCPayServerOptions options)
public static void UseProviderStorage(this IApplicationBuilder builder, DataDirectories datadirs)
{
try
{
var dir = FileSystemFileProviderService.GetStorageDir(options);
var tmpdir = FileSystemFileProviderService.GetTempStorageDir(options);
DirectoryInfo dirInfo;
if (!Directory.Exists(dir))
if (!Directory.Exists(datadirs.StorageDir))
{
dirInfo = Directory.CreateDirectory(dir);
dirInfo = Directory.CreateDirectory(datadirs.StorageDir);
}
else
{
dirInfo = new DirectoryInfo(dir);
dirInfo = new DirectoryInfo(datadirs.StorageDir);
}
DirectoryInfo tmpdirInfo;
if (!Directory.Exists(tmpdir))
if (!Directory.Exists(datadirs.TempStorageDir))
{
tmpdirInfo = Directory.CreateDirectory(tmpdir);
tmpdirInfo = Directory.CreateDirectory(datadirs.TempStorageDir);
}
else
{
tmpdirInfo = new DirectoryInfo(tmpdir);
tmpdirInfo = new DirectoryInfo(datadirs.TempStorageDir);
}
builder.UseStaticFiles(new StaticFileOptions()