From a7108c079d09343e58039c4709c02d55493db6c8 Mon Sep 17 00:00:00 2001 From: Qstick Date: Tue, 2 Oct 2018 22:15:53 -0400 Subject: [PATCH] Fixed: Backup API tweaks Co-Authored-By: Mark McDowall --- src/Lidarr.Api.V1/System/Backup/BackupModule.cs | 5 +++-- src/NzbDrone.Core/Backup/BackupService.cs | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/Lidarr.Api.V1/System/Backup/BackupModule.cs b/src/Lidarr.Api.V1/System/Backup/BackupModule.cs index 3d5d556d6..8a33bde7a 100644 --- a/src/Lidarr.Api.V1/System/Backup/BackupModule.cs +++ b/src/Lidarr.Api.V1/System/Backup/BackupModule.cs @@ -117,7 +117,8 @@ public Response UploadAndRestore() private string GetBackupPath(NzbDrone.Core.Backup.Backup backup) { - return Path.Combine(_backupService.GetBackupFolder(), backup.Type.ToString(), backup.Name); + return Path.Combine(_backupService.GetBackupFolder(backup.Type), backup.Name); + } private int GetBackupId(NzbDrone.Core.Backup.Backup backup) @@ -127,7 +128,7 @@ private int GetBackupId(NzbDrone.Core.Backup.Backup backup) private NzbDrone.Core.Backup.Backup GetBackup(int id) { - return _backupService.GetBackups().SingleOrDefault(b => id == GetBackupId(b)); + return _backupService.GetBackups().SingleOrDefault(b => GetBackupId(b) == id); } } } diff --git a/src/NzbDrone.Core/Backup/BackupService.cs b/src/NzbDrone.Core/Backup/BackupService.cs index 5cd1ca9cd..6ad56ab04 100644 --- a/src/NzbDrone.Core/Backup/BackupService.cs +++ b/src/NzbDrone.Core/Backup/BackupService.cs @@ -23,6 +23,7 @@ public interface IBackupService List GetBackups(); void Restore(string backupFileName); string GetBackupFolder(); + string GetBackupFolder(BackupType backupType); } public class BackupService : IBackupService, IExecute @@ -165,7 +166,7 @@ public string GetBackupFolder() return Path.Combine(_appFolderInfo.GetAppDataPath(), backupFolder); } - private string GetBackupFolder(BackupType backupType) + public string GetBackupFolder(BackupType backupType) { return Path.Combine(GetBackupFolder(), backupType.ToString().ToLower()); }