From 8055b5e5da7187923814e8b3bffa68f3816dcedc Mon Sep 17 00:00:00 2001
From: Mark McDowall <mark@mcdowall.ca>
Date: Wed, 17 Apr 2019 22:39:37 -0700
Subject: [PATCH] New: Output Path column in Queue

Closes #3058
---
 frontend/src/Activity/Queue/QueueRow.js    | 10 ++++++++++
 frontend/src/Store/Actions/queueActions.js |  6 ++++++
 src/NzbDrone.Core/Queue/Queue.cs           |  1 +
 src/NzbDrone.Core/Queue/QueueService.cs    |  3 ++-
 src/Sonarr.Api.V3/Queue/QueueResource.cs   |  4 +++-
 5 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/frontend/src/Activity/Queue/QueueRow.js b/frontend/src/Activity/Queue/QueueRow.js
index 1e3c808f6..1b5bb0059 100644
--- a/frontend/src/Activity/Queue/QueueRow.js
+++ b/frontend/src/Activity/Queue/QueueRow.js
@@ -76,6 +76,7 @@ class QueueRow extends Component {
       quality,
       protocol,
       indexer,
+      outputPath,
       downloadClient,
       estimatedCompletionTime,
       timeleft,
@@ -260,6 +261,14 @@ class QueueRow extends Component {
               );
             }
 
+            if (name === 'outputPath') {
+              return (
+                <TableRowCell key={name}>
+                  {outputPath}
+                </TableRowCell>
+              );
+            }
+
             if (name === 'estimatedCompletionTime') {
               return (
                 <TimeleftCell
@@ -364,6 +373,7 @@ QueueRow.propTypes = {
   quality: PropTypes.object.isRequired,
   protocol: PropTypes.string.isRequired,
   indexer: PropTypes.string,
+  outputPath: PropTypes.string,
   downloadClient: PropTypes.string,
   estimatedCompletionTime: PropTypes.string,
   timeleft: PropTypes.string,
diff --git a/frontend/src/Store/Actions/queueActions.js b/frontend/src/Store/Actions/queueActions.js
index 459af3811..f2f774a4c 100644
--- a/frontend/src/Store/Actions/queueActions.js
+++ b/frontend/src/Store/Actions/queueActions.js
@@ -121,6 +121,12 @@ export const defaultState = {
         isSortable: true,
         isVisible: false
       },
+      {
+        name: 'outputPath',
+        label: 'Output Path',
+        isSortable: false,
+        isVisible: false
+      },
       {
         name: 'estimatedCompletionTime',
         label: 'Timeleft',
diff --git a/src/NzbDrone.Core/Queue/Queue.cs b/src/NzbDrone.Core/Queue/Queue.cs
index de93bd667..e4bd0e2b2 100644
--- a/src/NzbDrone.Core/Queue/Queue.cs
+++ b/src/NzbDrone.Core/Queue/Queue.cs
@@ -29,6 +29,7 @@ namespace NzbDrone.Core.Queue
         public DownloadProtocol Protocol { get; set; }
         public string DownloadClient { get; set; }
         public string Indexer { get; set; }
+        public string OutputPath { get; set; }
         public string ErrorMessage { get; set; }
     }
 }
diff --git a/src/NzbDrone.Core/Queue/QueueService.cs b/src/NzbDrone.Core/Queue/QueueService.cs
index 2f1d682bd..8857f4660 100644
--- a/src/NzbDrone.Core/Queue/QueueService.cs
+++ b/src/NzbDrone.Core/Queue/QueueService.cs
@@ -77,7 +77,8 @@ namespace NzbDrone.Core.Queue
                 DownloadId = trackedDownload.DownloadItem.DownloadId,
                 Protocol = trackedDownload.Protocol,
                 DownloadClient = trackedDownload.DownloadItem.DownloadClient,
-                Indexer = trackedDownload.Indexer
+                Indexer = trackedDownload.Indexer,
+                OutputPath = trackedDownload.DownloadItem.OutputPath.ToString()
             };
 
             if (episode != null)
diff --git a/src/Sonarr.Api.V3/Queue/QueueResource.cs b/src/Sonarr.Api.V3/Queue/QueueResource.cs
index a4e09d508..975a16644 100644
--- a/src/Sonarr.Api.V3/Queue/QueueResource.cs
+++ b/src/Sonarr.Api.V3/Queue/QueueResource.cs
@@ -32,6 +32,7 @@ namespace Sonarr.Api.V3.Queue
         public DownloadProtocol Protocol { get; set; }
         public string DownloadClient { get; set; }
         public string Indexer { get; set; }
+        public string OutputPath { get; set; }
     }
 
     public static class QueueResourceMapper
@@ -61,7 +62,8 @@ namespace Sonarr.Api.V3.Queue
                 DownloadId = model.DownloadId,
                 Protocol = model.Protocol,
                 DownloadClient = model.DownloadClient,
-                Indexer = model.Indexer
+                Indexer = model.Indexer,
+                OutputPath = model.OutputPath
             };
         }