diff --git a/API/API.csproj b/API/API.csproj index 51bb3becf..b3ac07324 100644 --- a/API/API.csproj +++ b/API/API.csproj @@ -28,6 +28,7 @@ + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/API/Controllers/ServerController.cs b/API/Controllers/ServerController.cs index 348929523..2889e2317 100644 --- a/API/Controllers/ServerController.cs +++ b/API/Controllers/ServerController.cs @@ -5,6 +5,7 @@ using System.Threading.Tasks; using API.Extensions; using API.Interfaces; using API.Interfaces.Services; +using API.Services; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Configuration; @@ -68,7 +69,7 @@ namespace API.Controllers } var fileBytes = await _directoryService.ReadFileAsync(zipPath); - _directoryService.ClearAndDeleteDirectory(tempLocation); + DirectoryService.ClearAndDeleteDirectory(tempLocation); (new FileInfo(zipPath)).Delete(); return File(fileBytes, "application/zip", Path.GetFileName(zipPath)); diff --git a/API/Services/DirectoryService.cs b/API/Services/DirectoryService.cs index 25f068a62..89025cb92 100644 --- a/API/Services/DirectoryService.cs +++ b/API/Services/DirectoryService.cs @@ -95,7 +95,7 @@ namespace API.Services /// Deletes all files within the directory, then the directory itself. /// /// - public void ClearAndDeleteDirectory(string directoryPath) + public static void ClearAndDeleteDirectory(string directoryPath) { DirectoryInfo di = new DirectoryInfo(directoryPath); @@ -109,7 +109,7 @@ namespace API.Services /// /// /// - public void ClearDirectory(string directoryPath) + public static void ClearDirectory(string directoryPath) { var di = new DirectoryInfo(directoryPath); if (!di.Exists) return; diff --git a/API/Services/TaskScheduler.cs b/API/Services/TaskScheduler.cs index 2faf74475..23e7040d0 100644 --- a/API/Services/TaskScheduler.cs +++ b/API/Services/TaskScheduler.cs @@ -100,7 +100,7 @@ namespace API.Services public void CleanupTemp() { var tempDirectory = Path.Join(Directory.GetCurrentDirectory(), "temp"); - BackgroundJob.Enqueue((() => _directoryService.ClearDirectory(tempDirectory))); + BackgroundJob.Enqueue((() => DirectoryService.ClearDirectory(tempDirectory))); } public void BackupDatabase() diff --git a/API/Services/Tasks/BackupService.cs b/API/Services/Tasks/BackupService.cs index 8e59fce47..a5b115c3f 100644 --- a/API/Services/Tasks/BackupService.cs +++ b/API/Services/Tasks/BackupService.cs @@ -82,7 +82,7 @@ namespace API.Services.Tasks var tempDirectory = Path.Join(_tempDirectory, dateString); DirectoryService.ExistOrCreate(tempDirectory); - _directoryService.ClearDirectory(tempDirectory); + DirectoryService.ClearDirectory(tempDirectory); _directoryService.CopyFilesToDirectory( _backupFiles.Select(file => Path.Join(Directory.GetCurrentDirectory(), file)).ToList(), tempDirectory); @@ -95,7 +95,7 @@ namespace API.Services.Tasks _logger.LogError(ex, "There was an issue when archiving library backup"); } - _directoryService.ClearAndDeleteDirectory(tempDirectory); + DirectoryService.ClearAndDeleteDirectory(tempDirectory); _logger.LogInformation("Database backup completed"); } diff --git a/API/Services/Tasks/CleanupService.cs b/API/Services/Tasks/CleanupService.cs index 484557bcf..aaa7eba9b 100644 --- a/API/Services/Tasks/CleanupService.cs +++ b/API/Services/Tasks/CleanupService.cs @@ -26,7 +26,7 @@ namespace API.Services.Tasks { _logger.LogInformation("Cleaning temp directory"); var tempDirectory = Path.Join(Directory.GetCurrentDirectory(), "temp"); - _directoryService.ClearDirectory(tempDirectory); + DirectoryService.ClearDirectory(tempDirectory); _logger.LogInformation("Cleaning cache directory"); _cacheService.Cleanup(); _logger.LogInformation("Cleaning old database backups");