Mirrors/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2024-10-27 06:02:33 +01:00
Code Issues Releases Wiki Activity

Fixed: Matching of custom formats during movie file import

Browse Source 
Closes #8287
This commit is contained in:
Qstick 2023-05-06 23:33:03 -05:00
parent 836017c01b
commit 2a72a32d28
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/NzbDrone.Core/CustomFormats/CustomFormatCalculationService.cs
View File

@ -117,7 +117,7 @@ public List<CustomFormat> ParseCustomFormat(LocalMovie localMovie)
var episodeInfo = new ParsedMovieInfo var episodeInfo = new ParsedMovieInfo
{ {
MovieTitles = new List<string>() { localMovie.Movie.Title }, MovieTitles = new List<string>() { localMovie.Movie.Title },
SimpleReleaseTitle = localMovie.SceneName?.SimplifyReleaseTitle(), SimpleReleaseTitle = localMovie.SceneName.IsNotNullOrWhiteSpace() ? localMovie.SceneName.SimplifyReleaseTitle() : Path.GetFileName(localMovie.Path).SimplifyReleaseTitle(),
ReleaseTitle = localMovie.SceneName, ReleaseTitle = localMovie.SceneName,
Quality = localMovie.Quality, Quality = localMovie.Quality,
Edition = localMovie.Edition, Edition = localMovie.Edition,
@ -130,7 +130,8 @@ public List<CustomFormat> ParseCustomFormat(LocalMovie localMovie)
MovieInfo = episodeInfo, MovieInfo = episodeInfo,
Movie = localMovie.Movie, Movie = localMovie.Movie,
Size = localMovie.Size, Size = localMovie.Size,
Languages = localMovie.Languages Languages = localMovie.Languages,
Filename = Path.GetFileName(localMovie.Path)
}; };
return ParseCustomFormat(input); return ParseCustomFormat(input);
@ -166,24 +167,24 @@ private static List<CustomFormat> ParseCustomFormat(CustomFormatInput input, Lis
private static List<CustomFormat> ParseCustomFormat(MovieFile movieFile, Movie movie, List<CustomFormat> allCustomFormats) private static List<CustomFormat> ParseCustomFormat(MovieFile movieFile, Movie movie, List<CustomFormat> allCustomFormats)
{ {
var sceneName = string.Empty; var releaseTitle = string.Empty;
if (movieFile.SceneName.IsNotNullOrWhiteSpace()) if (movieFile.SceneName.IsNotNullOrWhiteSpace())
{ {
sceneName = movieFile.SceneName; releaseTitle = movieFile.SceneName;
} }
else if (movieFile.OriginalFilePath.IsNotNullOrWhiteSpace()) else if (movieFile.OriginalFilePath.IsNotNullOrWhiteSpace())
{ {
sceneName = movieFile.OriginalFilePath; releaseTitle = movieFile.OriginalFilePath;
} }
else if (movieFile.RelativePath.IsNotNullOrWhiteSpace()) else if (movieFile.RelativePath.IsNotNullOrWhiteSpace())
{ {
sceneName = Path.GetFileName(movieFile.RelativePath); releaseTitle = Path.GetFileName(movieFile.RelativePath);
} }
var movieInfo = new ParsedMovieInfo var movieInfo = new ParsedMovieInfo
{ {
MovieTitles = new List<string>() { movie.Title }, MovieTitles = new List<string>() { movie.Title },
SimpleReleaseTitle = sceneName.SimplifyReleaseTitle(), SimpleReleaseTitle = releaseTitle.SimplifyReleaseTitle(),
Quality = movieFile.Quality, Quality = movieFile.Quality,
Languages = movieFile.Languages, Languages = movieFile.Languages,
ReleaseGroup = movieFile.ReleaseGroup, ReleaseGroup = movieFile.ReleaseGroup,