1
0
Fork 0
mirror of https://github.com/Radarr/Radarr synced 2024-12-27 18:30:45 +00:00

Fixed: Hopefully fixed sqlite errors when finding by title.

This commit is contained in:
Leonardo Galli 2019-01-10 16:07:41 +01:00
parent 420cbf6dd0
commit e7ad09cf62

View file

@ -234,15 +234,16 @@ private Movie FindByTitle(string cleanTitle, int? year)
cleanTitleWithArabicNumbers = cleanTitleWithArabicNumbers.Replace(romanNumber, arabicNumber); cleanTitleWithArabicNumbers = cleanTitleWithArabicNumbers.Replace(romanNumber, arabicNumber);
} }
return Query(q => Movie result = Query(q =>
{ {
Movie result = q.Where(s => s.CleanTitle == cleanTitle).FirstWithYear(year); return q.Where(s => s.CleanTitle == cleanTitle).FirstWithYear(year);
});
if (result == null) if (result == null)
{ {
result = result =
q.Where(movie => movie.CleanTitle == cleanTitleWithArabicNumbers).FirstWithYear(year) ?? Query(q => q.Where(movie => movie.CleanTitle == cleanTitleWithArabicNumbers).FirstWithYear(year)) ??
q.Where(movie => movie.CleanTitle == cleanTitleWithRomanNumbers).FirstWithYear(year); Query(q => q.Where(movie => movie.CleanTitle == cleanTitleWithRomanNumbers).FirstWithYear(year));
if (result == null) if (result == null)
{ {
@ -258,16 +259,15 @@ private Movie FindByTitle(string cleanTitle, int? year)
//result = Query.Join<Movie, AlternativeTitle>(JoinType.Inner, m => m._newAltTitles, //result = Query.Join<Movie, AlternativeTitle>(JoinType.Inner, m => m._newAltTitles,
//(m, t) => m.Id == t.MovieId && (t.CleanTitle == cleanTitle)).FirstWithYear(year); //(m, t) => m.Id == t.MovieId && (t.CleanTitle == cleanTitle)).FirstWithYear(year);
result = q.Where<AlternativeTitle>(t => result = Query(q => q.Where<AlternativeTitle>(t =>
t.CleanTitle == cleanTitle || t.CleanTitle == cleanTitleWithArabicNumbers t.CleanTitle == cleanTitle || t.CleanTitle == cleanTitleWithArabicNumbers
|| t.CleanTitle == cleanTitleWithRomanNumbers) || t.CleanTitle == cleanTitleWithRomanNumbers)
.FirstWithYear(year); .FirstWithYear(year));
} }
} }
return result; return result;
});
/*return year.HasValue /*return year.HasValue
? results?.FirstOrDefault(movie => movie.Year == year.Value) ? results?.FirstOrDefault(movie => movie.Year == year.Value)