mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Improve messaging if release is in queue because all movies in release were not imported 

Sync with upstream

(cherry picked from commit 2728bf79ca41bc372de515cb09e1034a8c006c2b)
This commit is contained in:
Mark McDowall 2021-02-23 18:39:24 -08:00 committed by Bogdan
parent 2f1e077e0d
commit f704ab1512
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/Store/Actions/interactiveImportActions.js
View File

@ -56,6 +56,8 @@ export const defaultState = {
};
export const persistState = [
'interactiveImport.sortKey',
'interactiveImport.sortDirection',
'interactiveImport.recentFolders',
'interactiveImport.importMode'
];

20
src/NzbDrone.Core/Download/CompletedDownloadService.cs
View File

@ -155,6 +155,8 @@ namespace NzbDrone.Core.Download
if (importResults.Empty())
{
trackedDownload.Warn("No files found are eligible for import in {0}", outputPath);
return;
}
if (importResults.Count == 1)
@ -176,14 +178,18 @@ namespace NzbDrone.Core.Download
if (importResults.Any(c => c.Result != ImportResultType.Imported))
{
statusMessages.AddRange(importResults
.Where(v => v.Result != ImportResultType.Imported && v.ImportDecision.LocalMovie != null)
.Select(v => new TrackedDownloadStatusMessage(Path.GetFileName(v.ImportDecision.LocalMovie.Path), v.Errors)));
statusMessages.AddRange(
importResults
.Where(v => v.Result != ImportResultType.Imported && v.ImportDecision.LocalMovie != null)
.OrderBy(v => v.ImportDecision.LocalMovie.Path)
.Select(v =>
new TrackedDownloadStatusMessage(Path.GetFileName(v.ImportDecision.LocalMovie.Path),
v.Errors)));
}
if (statusMessages.Any())
{
trackedDownload.Warn(statusMessages.ToArray());
}
if (statusMessages.Any())
{
trackedDownload.Warn(statusMessages.ToArray());
}
}