Mark completed imports based on history as imported to remove from queue

src/NzbDrone.Core/Download/CompletedDownloadService.cs

@@ -159,27 +159,32 @@ namespace NzbDrone.Core.Download
 
             if (allEpisodesImportedInHistory)
             {
+                // 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 (atLeastOneEpisodeImported)
                 {
                     _logger.Debug("All books were imported in history for {0}", trackedDownload.DownloadItem.Title);
-                    trackedDownload.State = TrackedDownloadState.Imported;
+                }
+                else
+                {
+                    _logger.Debug()
+                           .Message("No books were just imported, but all books were previously imported, possible issue with download history.")
+                           .Property("AuthorId", trackedDownload.RemoteBook.Author.Id)
+                           .Property("DownloadId", trackedDownload.DownloadItem.DownloadId)
+                           .Property("Title", trackedDownload.DownloadItem.Title)
+                           .Property("Path", trackedDownload.DownloadItem.OutputPath.ToString())
+                           .WriteSentryWarn("DownloadHistoryIncomplete")
+                           .Write();
+                }
 
-                    var importedAuthorId = historyItems.Where(x => x.EventType == EntityHistoryEventType.BookFileImported)
-                        .Select(x => x.AuthorId)
-                        .MostCommon();
-                    _eventAggregator.PublishEvent(new DownloadCompletedEvent(trackedDownload, trackedDownload.RemoteBook?.Author.Id ?? importedAuthorId));
+                trackedDownload.State = TrackedDownloadState.Imported;
 
-                    return true;
-                }
+                var importedAuthorId = historyItems.Where(x => x.EventType == EntityHistoryEventType.BookFileImported)
+                    .Select(x => x.AuthorId)
+                    .MostCommon();
+                _eventAggregator.PublishEvent(new DownloadCompletedEvent(trackedDownload, trackedDownload.RemoteBook?.Author.Id ?? importedAuthorId));
 
-                _logger.Debug()
-                       .Message("No Episodes were just imported, but all episodes were previously imported, possible issue with download history.")
-                       .Property("AuthorId", trackedDownload.RemoteBook.Author.Id)
-                       .Property("DownloadId", trackedDownload.DownloadItem.DownloadId)
-                       .Property("Title", trackedDownload.DownloadItem.Title)
-                       .Property("Path", trackedDownload.DownloadItem.OutputPath.ToString())
-                       .WriteSentryWarn("DownloadHistoryIncomplete")
-                       .Write();
+                return true;
             }
 
             _logger.Debug("Not all books have been imported for {0}", trackedDownload.DownloadItem.Title);