From f3bf50e8d76409711a631dd9633a2ced348cdae8 Mon Sep 17 00:00:00 2001
From: Mark McDowall <mark@mcdowall.ca>
Date: Sun, 20 Aug 2017 23:26:37 -0700
Subject: [PATCH] Backup API improvements

---
 src/NzbDrone.Api/System/Backup/BackupModule.cs |  6 +++---
 src/NzbDrone.Core/Backup/Backup.cs             |  2 +-
 src/NzbDrone.Core/Backup/BackupCommand.cs      | 13 ++++++++++++-
 src/NzbDrone.Core/Backup/BackupService.cs      |  2 +-
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/NzbDrone.Api/System/Backup/BackupModule.cs b/src/NzbDrone.Api/System/Backup/BackupModule.cs
index b5074793e..8874ad420 100644
--- a/src/NzbDrone.Api/System/Backup/BackupModule.cs
+++ b/src/NzbDrone.Api/System/Backup/BackupModule.cs
@@ -21,9 +21,9 @@ namespace NzbDrone.Api.System.Backup
 
             return backups.Select(b => new BackupResource
                                        {
-                                           Id = b.Path.GetHashCode(),
-                                           Name = Path.GetFileName(b.Path),
-                                           Path = b.Path,
+                                           Id = b.Name.GetHashCode(),
+                                           Name = b.Name,
+                                           Path = $"/backup/{b.Type.ToString().ToLower()}/{b.Name}",
                                            Type = b.Type,
                                            Time = b.Time
                                        }).ToList();
diff --git a/src/NzbDrone.Core/Backup/Backup.cs b/src/NzbDrone.Core/Backup/Backup.cs
index a4505d991..5d148648e 100644
--- a/src/NzbDrone.Core/Backup/Backup.cs
+++ b/src/NzbDrone.Core/Backup/Backup.cs
@@ -4,7 +4,7 @@ namespace NzbDrone.Core.Backup
 {
     public class Backup
     {
-        public string Path { get; set; }
+        public string Name { get; set; }
         public BackupType Type { get; set; }
         public DateTime Time { get; set; }
     }
diff --git a/src/NzbDrone.Core/Backup/BackupCommand.cs b/src/NzbDrone.Core/Backup/BackupCommand.cs
index 3a852cf7a..1f5550e59 100644
--- a/src/NzbDrone.Core/Backup/BackupCommand.cs
+++ b/src/NzbDrone.Core/Backup/BackupCommand.cs
@@ -4,7 +4,18 @@ namespace NzbDrone.Core.Backup
 {
     public class BackupCommand : Command
     {
-        public BackupType Type { get; set; }
+        public BackupType Type
+        {
+            get
+            {
+                if (Trigger == CommandTrigger.Scheduled)
+                {
+                    return BackupType.Scheduled;
+                }
+
+                return BackupType.Manual;
+            }
+        }
 
         public override bool SendUpdatesToClient => true;
 
diff --git a/src/NzbDrone.Core/Backup/BackupService.cs b/src/NzbDrone.Core/Backup/BackupService.cs
index abe0ec00c..3bd564b2b 100644
--- a/src/NzbDrone.Core/Backup/BackupService.cs
+++ b/src/NzbDrone.Core/Backup/BackupService.cs
@@ -93,7 +93,7 @@ namespace NzbDrone.Core.Backup
                 {
                     backups.AddRange(GetBackupFiles(folder).Select(b => new Backup
                                                                         {
-                                                                            Path = Path.GetFileName(b),
+                                                                            Name = Path.GetFileName(b),
                                                                             Type = backupType,
                                                                             Time = _diskProvider.FileGetLastWrite(b)
                                                                         }));