diff --git a/frontend/src/Activity/Queue/QueueRow.js b/frontend/src/Activity/Queue/QueueRow.js
index 3f53870e5..514488bab 100644
--- a/frontend/src/Activity/Queue/QueueRow.js
+++ b/frontend/src/Activity/Queue/QueueRow.js
@@ -97,6 +97,7 @@ class QueueRow extends Component {
outputPath,
downloadClient,
estimatedCompletionTime,
+ added,
timeleft,
size,
sizeleft,
@@ -315,6 +316,15 @@ class QueueRow extends Component {
);
}
+ if (name === 'added') {
+ return (
+
+ );
+ }
+
if (name === 'actions') {
return (
translate('Added'),
+ isSortable: true,
+ isVisible: false
+ },
{
name: 'progress',
label: () => translate('Progress'),
diff --git a/frontend/src/typings/Queue.ts b/frontend/src/typings/Queue.ts
index c95350c71..c5f7eb962 100644
--- a/frontend/src/typings/Queue.ts
+++ b/frontend/src/typings/Queue.ts
@@ -28,6 +28,7 @@ interface Queue extends ModelBase {
sizeleft: number;
timeleft: string;
estimatedCompletionTime: string;
+ added?: string;
status: string;
trackedDownloadStatus: QueueTrackedDownloadStatus;
trackedDownloadState: QueueTrackedDownloadState;
diff --git a/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs b/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs
index 035db0b2d..c0bcd07ba 100644
--- a/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs
+++ b/src/NzbDrone.Core/Download/Pending/PendingReleaseService.cs
@@ -203,6 +203,7 @@ namespace NzbDrone.Core.Download.Pending
RemoteMovie = pendingRelease.RemoteMovie,
Timeleft = timeleft,
EstimatedCompletionTime = ect,
+ Added = pendingRelease.Added,
Status = pendingRelease.Reason.ToString(),
Protocol = pendingRelease.RemoteMovie.Release.DownloadProtocol,
Indexer = pendingRelease.RemoteMovie.Release.Indexer
diff --git a/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownload.cs b/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownload.cs
index df6ea4280..977461bf7 100644
--- a/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownload.cs
+++ b/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownload.cs
@@ -15,6 +15,7 @@ namespace NzbDrone.Core.Download.TrackedDownloads
public TrackedDownloadStatusMessage[] StatusMessages { get; private set; }
public DownloadProtocol Protocol { get; set; }
public string Indexer { get; set; }
+ public DateTime? Added { get; set; }
public bool IsTrackable { get; set; }
public bool HasNotifiedManualInteractionRequired { get; set; }
diff --git a/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownloadService.cs b/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownloadService.cs
index 4aaa4e9f3..3c395484d 100644
--- a/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownloadService.cs
+++ b/src/NzbDrone.Core/Download/TrackedDownloads/TrackedDownloadService.cs
@@ -141,6 +141,7 @@ namespace NzbDrone.Core.Download.TrackedDownloads
var grabbedEvent = historyItems.FirstOrDefault(v => v.EventType == MovieHistoryEventType.Grabbed);
trackedDownload.Indexer = grabbedEvent?.Data["indexer"];
+ trackedDownload.Added = grabbedEvent?.Date;
if (parsedMovieInfo == null ||
trackedDownload.RemoteMovie == null ||
diff --git a/src/NzbDrone.Core/Queue/EstimatedCompletionTimeComparer.cs b/src/NzbDrone.Core/Queue/DatetimeComparer.cs
similarity index 90%
rename from src/NzbDrone.Core/Queue/EstimatedCompletionTimeComparer.cs
rename to src/NzbDrone.Core/Queue/DatetimeComparer.cs
index e8c52e1ab..e851d5a5f 100644
--- a/src/NzbDrone.Core/Queue/EstimatedCompletionTimeComparer.cs
+++ b/src/NzbDrone.Core/Queue/DatetimeComparer.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
namespace NzbDrone.Core.Queue
{
- public class EstimatedCompletionTimeComparer : IComparer
+ public class DatetimeComparer : IComparer
{
public int Compare(DateTime? x, DateTime? y)
{
diff --git a/src/NzbDrone.Core/Queue/Queue.cs b/src/NzbDrone.Core/Queue/Queue.cs
index 22723bd63..08b8d4611 100644
--- a/src/NzbDrone.Core/Queue/Queue.cs
+++ b/src/NzbDrone.Core/Queue/Queue.cs
@@ -20,6 +20,7 @@ namespace NzbDrone.Core.Queue
public decimal Sizeleft { get; set; }
public TimeSpan? Timeleft { get; set; }
public DateTime? EstimatedCompletionTime { get; set; }
+ public DateTime? Added { get; set; }
public string Status { get; set; }
public TrackedDownloadStatus? TrackedDownloadStatus { get; set; }
public TrackedDownloadState? TrackedDownloadState { get; set; }
diff --git a/src/NzbDrone.Core/Queue/QueueService.cs b/src/NzbDrone.Core/Queue/QueueService.cs
index 1cf48fa94..395f11a92 100644
--- a/src/NzbDrone.Core/Queue/QueueService.cs
+++ b/src/NzbDrone.Core/Queue/QueueService.cs
@@ -75,7 +75,8 @@ namespace NzbDrone.Core.Queue
Movie = movie,
DownloadClient = trackedDownload.DownloadItem.DownloadClientInfo.Name,
Indexer = trackedDownload.Indexer,
- OutputPath = trackedDownload.DownloadItem.OutputPath.ToString()
+ OutputPath = trackedDownload.DownloadItem.OutputPath.ToString(),
+ Added = trackedDownload.Added
};
queue.Id = HashConverter.GetHashInt31($"trackedDownload-{trackedDownload.DownloadClient}-{trackedDownload.DownloadItem.DownloadId}");
diff --git a/src/Radarr.Api.V3/Queue/QueueController.cs b/src/Radarr.Api.V3/Queue/QueueController.cs
index a2af42514..5e9b579ae 100644
--- a/src/Radarr.Api.V3/Queue/QueueController.cs
+++ b/src/Radarr.Api.V3/Queue/QueueController.cs
@@ -188,9 +188,16 @@ namespace Radarr.Api.V3.Queue
else if (pagingSpec.SortKey == "estimatedCompletionTime")
{
ordered = ascending
- ? fullQueue.OrderBy(q => q.EstimatedCompletionTime, new EstimatedCompletionTimeComparer())
+ ? fullQueue.OrderBy(q => q.EstimatedCompletionTime, new DatetimeComparer())
: fullQueue.OrderByDescending(q => q.EstimatedCompletionTime,
- new EstimatedCompletionTimeComparer());
+ new DatetimeComparer());
+ }
+ else if (pagingSpec.SortKey == "added")
+ {
+ ordered = ascending
+ ? fullQueue.OrderBy(q => q.Added, new DatetimeComparer())
+ : fullQueue.OrderByDescending(q => q.Added,
+ new DatetimeComparer());
}
else if (pagingSpec.SortKey == "protocol")
{
diff --git a/src/Radarr.Api.V3/Queue/QueueResource.cs b/src/Radarr.Api.V3/Queue/QueueResource.cs
index d3b4c1ce5..2ba1ea5bd 100644
--- a/src/Radarr.Api.V3/Queue/QueueResource.cs
+++ b/src/Radarr.Api.V3/Queue/QueueResource.cs
@@ -25,6 +25,7 @@ namespace Radarr.Api.V3.Queue
public decimal Sizeleft { get; set; }
public TimeSpan? Timeleft { get; set; }
public DateTime? EstimatedCompletionTime { get; set; }
+ public DateTime? Added { get; set; }
public string Status { get; set; }
public TrackedDownloadStatus? TrackedDownloadStatus { get; set; }
public TrackedDownloadState? TrackedDownloadState { get; set; }
@@ -63,6 +64,7 @@ namespace Radarr.Api.V3.Queue
Sizeleft = model.Sizeleft,
Timeleft = model.Timeleft,
EstimatedCompletionTime = model.EstimatedCompletionTime,
+ Added = model.Added,
Status = model.Status.FirstCharToLower(),
TrackedDownloadStatus = model.TrackedDownloadStatus,
TrackedDownloadState = model.TrackedDownloadState,