New: Show download protocol in Queue

src/NzbDrone.Api/Indexers/ReleaseModule.cs

@@ -142,7 +142,6 @@ private List<ReleaseResource> MapDecisions(IEnumerable<DownloadDecision> decisio
                 release.QualityWeight += release.Quality.Revision.Real * 10;
                 release.QualityWeight += release.Quality.Revision.Version;
                 
-
                 var torrentRelease = downloadDecision.RemoteEpisode.Release as TorrentInfo;
 
                 if (torrentRelease != null)

src/NzbDrone.Api/Indexers/ReleaseResource.cs

@@ -39,7 +39,6 @@ public class ReleaseResource : RestResource
         public String DownloadUrl { get; set; }
         public String InfoUrl { get; set; }
         public Boolean DownloadAllowed { get; set; }
-        public DownloadProtocol DownloadProtocol { get; set; }
         public Int32 ReleaseWeight { get; set; }
 
 

src/NzbDrone.Api/Queue/QueueResource.cs

@@ -5,6 +5,7 @@
 using NzbDrone.Api.Series;
 using NzbDrone.Api.Episodes;
 using NzbDrone.Core.Download.TrackedDownloads;
+using NzbDrone.Core.Indexers;
 
 namespace NzbDrone.Api.Queue
 {
@@ -22,5 +23,6 @@ public class QueueResource : RestResource
         public String TrackedDownloadStatus { get; set; }
         public List<TrackedDownloadStatusMessage> StatusMessages { get; set; }
         public String DownloadId { get; set; }
+        public DownloadProtocol Protocol { get; set; }
     }
 }

src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs

@@ -7,6 +7,7 @@
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
 using NzbDrone.Core.Configuration;
+using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Validation;
 using NzbDrone.Core.RemotePathMappings;

src/NzbDrone.Core/Download/DownloadClientProvider.cs

@@ -27,11 +27,18 @@ public IDownloadClient GetDownloadClient(DownloadProtocol downloadProtocol)
 
         public IEnumerable<IDownloadClient> GetDownloadClients()
         {
-            return _downloadClientFactory.GetAvailableProviders();
+            return _downloadClientFactory.GetAvailableProviders();//.Select(MapDownloadClient);
         }
+
         public IDownloadClient Get(int id)
         {
             return _downloadClientFactory.GetAvailableProviders().Single(d => d.Definition.Id == id);
         }
+
+        public IDownloadClient MapDownloadClient(IDownloadClient downloadClient)
+        {
+            downloadClient.Definition = _downloadClientFactory.GetProviderCharacteristics(downloadClient, (DownloadClientDefinition)downloadClient.Definition);
+            return downloadClient;
+        }
     }
 }

src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs

@@ -112,7 +112,8 @@ public List<RemoteEpisode> GetPendingRemoteEpisodes(int seriesId)
                                     RemoteEpisode = pendingRelease.RemoteEpisode,
                                     Timeleft = ect.Subtract(DateTime.UtcNow),
                                     EstimatedCompletionTime = ect,
-                                    Status = "Pending"
+                                    Status = "Pending",
+                                    Protocol = pendingRelease.RemoteEpisode.Release.DownloadProtocol
                                 };
                     queued.Add(queue);
                 }

src/NzbDrone.Core/Queue/Queue.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using NzbDrone.Core.Datastore;
 using NzbDrone.Core.Download.TrackedDownloads;
+using NzbDrone.Core.Indexers;
 using NzbDrone.Core.Parser.Model;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Tv;
@@ -23,5 +24,6 @@ public class Queue : ModelBase
         public List<TrackedDownloadStatusMessage> StatusMessages { get; set; }
         public String DownloadId { get; set; }
         public RemoteEpisode RemoteEpisode { get; set; }
+        public DownloadProtocol Protocol { get; set; }
     }
 }

src/NzbDrone.Core/Queue/QueueService.cs

@@ -59,7 +59,8 @@ private IEnumerable<Queue> MapQueue(TrackedDownload trackedDownload)
                     TrackedDownloadStatus = trackedDownload.Status.ToString(),
                     StatusMessages = trackedDownload.StatusMessages.ToList(),
                     RemoteEpisode = trackedDownload.RemoteEpisode,
-                    DownloadId = trackedDownload.DownloadItem.DownloadId
+                    DownloadId = trackedDownload.DownloadItem.DownloadId,
+                    Protocol = trackedDownload.Protocol
                 };
 
                 if (queue.Timeleft.HasValue)

src/NzbDrone.Core/ThingiProvider/ProviderFactory.cs

@@ -111,7 +111,7 @@ public TProvider GetInstance(TProviderDefinition definition)
         {
             var type = GetImplementation(definition);
             var instance = (TProvider)_container.Resolve(type);
-            instance.Definition = definition;
+            instance.Definition = GetProviderCharacteristics(instance, definition);
             return instance;
         }
 

src/UI/Activity/Queue/QueueActionsCell.js

@@ -16,6 +16,10 @@ define(
                 'click .x-grab'   : '_grab'
             },
 
+            ui: {
+                'import' : '.x-import'
+            },
+
             render: function () {
                 this.$el.empty();
 
@@ -69,6 +73,8 @@ define(
                     data: JSON.stringify(this.model.toJSON())
                 });
 
+                $(this.ui.import).spinForPromise(promise);
+
                 promise.success(function () {
                     //find models that have the same series id and episode ids and remove them
                     self.model.trigger('destroy', self.model);

src/UI/Activity/Queue/QueueLayout.js

@@ -12,6 +12,7 @@ define(
         'Activity/Queue/QueueActionsCell',
         'Activity/Queue/TimeleftCell',
         'Activity/Queue/ProgressCell',
+        'Release/ProtocolCell',
         'Shared/Grid/Pager'
     ], function (Marionette,
                  Backgrid,
@@ -24,6 +25,7 @@ define(
                  QueueActionsCell,
                  TimeleftCell,
                  ProgressCell,
+                 ProtocolCell,
                  GridPager) {
         return Marionette.Layout.extend({
             template: 'Activity/Queue/QueueLayoutTemplate',
@@ -65,6 +67,11 @@ define(
                         cell      : QualityCell,
                         sortable  : false
                     },
+                    {
+                        name      : 'protocol',
+                        label     : 'Protocol',
+                        cell      : ProtocolCell
+                    },
                     {
                         name      : 'timeleft',
                         label     : 'Timeleft',

src/UI/Activity/Queue/QueueLayoutTemplate.hbs

@@ -1,6 +1,6 @@
-<div class="row">
+<div class="row">
     <div class="col-md-12 table-responsive">
-        <div id="x-queue"/>
+        <div id="x-queue" class="queue"/>
     </div>
 </div>
 

src/UI/Activity/activity.less

@@ -1,4 +1,11 @@
 
 .queue-status-cell .popover {
-  max-width: 800px;
+  max-width : 800px;
+}
+
+.queue {
+  .protocol-cell {
+    text-align : center;
+    width : 80px;
+  }
 }