From 4be83a3367e5a4428447541b368d7229cc5390d6 Mon Sep 17 00:00:00 2001
From: Qstick <qstick@gmail.com>
Date: Fri, 11 Sep 2020 22:27:29 -0400
Subject: [PATCH] Mark completed imports based on history as imported to remove
 from queue

Fixes #4994
---
 .../Download/CompletedDownloadService.cs      | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/NzbDrone.Core/Download/CompletedDownloadService.cs b/src/NzbDrone.Core/Download/CompletedDownloadService.cs
index 7008dee2b..b6e3921be 100644
--- a/src/NzbDrone.Core/Download/CompletedDownloadService.cs
+++ b/src/NzbDrone.Core/Download/CompletedDownloadService.cs
@@ -170,23 +170,28 @@ namespace NzbDrone.Core.Download
 
             if (allMoviesImportedInHistory)
             {
+                // Log different error messages depending on the circumstances, but treat both as fully imported, because that's the reality.
+                // The second message shouldn't be logged in most cases, but continued reporting would indicate an ongoing issue.
                 if (atLeastOneMovieImported)
                 {
                     _logger.Debug("All movies were imported in history for {0}", trackedDownload.DownloadItem.Title);
-                    trackedDownload.State = TrackedDownloadState.Imported;
-                    _eventAggregator.PublishEvent(new DownloadCompletedEvent(trackedDownload, trackedDownload.RemoteMovie.Movie.Id));
-
-                    return true;
+                }
+                else
+                {
+                    _logger.Debug()
+                           .Message("No Movies were just imported, but all movies were previously imported, possible issue with download history.")
+                           .Property("MovieId", trackedDownload.RemoteMovie.Movie.Id)
+                           .Property("DownloadId", trackedDownload.DownloadItem.DownloadId)
+                           .Property("Title", trackedDownload.DownloadItem.Title)
+                           .Property("Path", trackedDownload.DownloadItem.OutputPath.ToString())
+                           .WriteSentryWarn("DownloadHistoryIncomplete")
+                           .Write();
                 }
 
-                _logger.Debug()
-                       .Message("No Movies were just imported, but all movies were previously imported, possible issue with download history.")
-                       .Property("MovieId", trackedDownload.RemoteMovie.Movie.Id)
-                       .Property("DownloadId", trackedDownload.DownloadItem.DownloadId)
-                       .Property("Title", trackedDownload.DownloadItem.Title)
-                       .Property("Path", trackedDownload.DownloadItem.OutputPath.ToString())
-                       .WriteSentryWarn("DownloadHistoryIncomplete")
-                       .Write();
+                trackedDownload.State = TrackedDownloadState.Imported;
+                _eventAggregator.PublishEvent(new DownloadCompletedEvent(trackedDownload, trackedDownload.RemoteMovie.Movie.Id));
+
+                return true;
             }
 
             _logger.Debug("Not all movies have been imported for {0}", trackedDownload.DownloadItem.Title);