From 9df45199d09edaa8d5c01ad5f387dd27276da812 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Mon, 16 Sep 2024 21:45:09 -0700 Subject: [PATCH] Reprocessing manual import items unable to detect sample (cherry picked from commit 27da0413882dc87e1617a5d091ac5111589e61a6) Closes #10463 --- .../MovieImport/Manual/ManualImportService.cs | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/src/NzbDrone.Core/MediaFiles/MovieImport/Manual/ManualImportService.cs b/src/NzbDrone.Core/MediaFiles/MovieImport/Manual/ManualImportService.cs index 0db199310..4bc6fe16c 100644 --- a/src/NzbDrone.Core/MediaFiles/MovieImport/Manual/ManualImportService.cs +++ b/src/NzbDrone.Core/MediaFiles/MovieImport/Manual/ManualImportService.cs @@ -102,8 +102,6 @@ public ManualImportItem ReprocessItem(string path, string downloadId, int movieI var rootFolder = Path.GetDirectoryName(path); var movie = _movieService.GetMovie(movieId); - var downloadClientItem = GetTrackedDownload(downloadId)?.DownloadItem; - var languageParse = LanguageParser.ParseLanguages(path); if (languageParse.Count <= 1 && languageParse.First() == Language.Unknown && movie != null) @@ -112,6 +110,16 @@ public ManualImportItem ReprocessItem(string path, string downloadId, int movieI _logger.Debug("Language couldn't be parsed from release, fallback to movie original language: {0}", movie.MovieMetadata.Value.OriginalLanguage.Name); } + var downloadClientItem = GetTrackedDownload(downloadId)?.DownloadItem; + var finalReleaseGroup = releaseGroup.IsNullOrWhiteSpace() + ? Parser.Parser.ParseReleaseGroup(path) + : releaseGroup; + var finalQuality = (quality?.Quality ?? Quality.Unknown) == Quality.Unknown ? QualityParser.ParseQuality(path) : quality; + var finalLanguages = + languages?.Count <= 1 && (languages?.SingleOrDefault() ?? Language.Unknown) == Language.Unknown + ? languageParse + : languages; + var localMovie = new LocalMovie(); localMovie.Movie = movie; localMovie.FileMovieInfo = Parser.Parser.ParseMoviePath(path); @@ -121,13 +129,24 @@ public ManualImportItem ReprocessItem(string path, string downloadId, int movieI localMovie.SceneSource = SceneSource(movie, rootFolder); localMovie.ExistingFile = movie.Path.IsParentPath(path); localMovie.Size = _diskProvider.GetFileSize(path); - localMovie.ReleaseGroup = releaseGroup.IsNullOrWhiteSpace() ? Parser.Parser.ParseReleaseGroup(path) : releaseGroup; - localMovie.Languages = languages?.Count <= 1 && (languages?.SingleOrDefault() ?? Language.Unknown) == Language.Unknown ? languageParse : languages; - localMovie.Quality = (quality?.Quality ?? Quality.Unknown) == Quality.Unknown ? QualityParser.ParseQuality(path) : quality; + localMovie.ReleaseGroup = finalReleaseGroup; + localMovie.Languages = finalLanguages; + localMovie.Quality = finalQuality; localMovie.IndexerFlags = (IndexerFlags)indexerFlags; + localMovie.CustomFormats = _formatCalculator.ParseCustomFormat(localMovie); localMovie.CustomFormatScore = localMovie.Movie?.QualityProfile?.CalculateCustomFormatScore(localMovie.CustomFormats) ?? 0; + // Augment movie file so imported files have all additional information an automatic import would + localMovie = _aggregationService.Augment(localMovie, downloadClientItem); + + // Reapply the user-chosen values. + localMovie.Movie = movie; + localMovie.ReleaseGroup = finalReleaseGroup; + localMovie.Quality = finalQuality; + localMovie.Languages = finalLanguages; + localMovie.IndexerFlags = (IndexerFlags)indexerFlags; + return MapItem(_importDecisionMaker.GetDecision(localMovie, downloadClientItem), rootFolder, downloadId, null); }