github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-23 06:45:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix for sql error. Did not think everything through exactly.

Browse source 
Fixes #1390.
This commit is contained in:
Leonardo Galli 2017-04-16 00:48:39 +02:00
commit 8bb4b02be7
1 changed files with 27 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/NzbDrone.Core/Tv/MovieRepository.cs
View file

@ -238,29 +238,41 @@ namespace NzbDrone.Core.Tv
cleanTitleWithArabicNumbers = cleanTitleWithArabicNumbers.Replace(romanNumber, arabicNumber); cleanTitleWithArabicNumbers = cleanTitleWithArabicNumbers.Replace(romanNumber, arabicNumber);
} }
IEnumerable<Movie> results = Query.Where(s => s.CleanTitle == cleanTitle); Movie result = year.HasValue
? Query.Where(s => s.CleanTitle == cleanTitle).FirstOrDefault(movie => movie.Year == year.Value)
: Query.Where(s => s.CleanTitle == cleanTitle).FirstOrDefault();
if (results == null || results.Count() == 0) if (result == null)
{ {
results = Query.Where(movie => movie.CleanTitle == cleanTitleWithArabicNumbers) ?? result = year.HasValue ? Query.Where(movie => movie.CleanTitle == cleanTitleWithArabicNumbers).FirstOrDefault(movie => movie.Year == year.Value)
Query.Where(movie => movie.CleanTitle == cleanTitleWithRomanNumbers); : Query.Where(movie => movie.CleanTitle == cleanTitleWithArabicNumbers).FirstOrDefault(); ;
if (results == null || results.Count() == 0) if (result == null)
{ {
IEnumerable<Movie> movies = All(); result = year.HasValue ? Query.Where(movie => movie.CleanTitle == cleanTitleWithRomanNumbers).FirstOrDefault(movie => movie.Year == year.Value)
Func<string, string> titleCleaner = title => CoreParser.CleanSeriesTitle(title.ToLower()); : Query.Where(movie => movie.CleanTitle == cleanTitleWithRomanNumbers).FirstOrDefault();
Func<IEnumerable<string>, string, bool> altTitleComparer =
(alternativeTitles, atitle) =>
alternativeTitles.Any(altTitle => titleCleaner(altTitle) == atitle);
results = movies.Where(m => altTitleComparer(m.AlternativeTitles, cleanTitle) || if (result == null)
altTitleComparer(m.AlternativeTitles, cleanTitleWithRomanNumbers) || {
altTitleComparer(m.AlternativeTitles, cleanTitleWithArabicNumbers)); IEnumerable<Movie> movies = All();
Func<string, string> titleCleaner = title => CoreParser.CleanSeriesTitle(title.ToLower());
Func<IEnumerable<string>, string, bool> altTitleComparer =
(alternativeTitles, atitle) =>
alternativeTitles.Any(altTitle => titleCleaner(altTitle) == atitle);
result = year.HasValue ? movies.Where(m => altTitleComparer(m.AlternativeTitles, cleanTitle) ||
altTitleComparer(m.AlternativeTitles, cleanTitleWithRomanNumbers) ||
altTitleComparer(m.AlternativeTitles, cleanTitleWithArabicNumbers)).FirstOrDefault(movie => movie.Year == year)
: movies.Where(m => altTitleComparer(m.AlternativeTitles, cleanTitle) ||
altTitleComparer(m.AlternativeTitles, cleanTitleWithRomanNumbers) ||
altTitleComparer(m.AlternativeTitles, cleanTitleWithArabicNumbers)).FirstOrDefault();
}
} }
} }
return year.HasValue return result;
/*return year.HasValue
? results?.FirstOrDefault(movie => movie.Year == year.Value) ? results?.FirstOrDefault(movie => movie.Year == year.Value)
: results?.FirstOrDefault(); : results?.FirstOrDefault();*/
} }
public Movie FindByTmdbId(int tmdbid) public Movie FindByTmdbId(int tmdbid)