mirror of
https://github.com/Radarr/Radarr
synced 2024-12-27 02:09:59 +00:00
Fixed: Hopefully fixed sqlite errors when finding by title.
This commit is contained in:
parent
420cbf6dd0
commit
e7ad09cf62
1 changed files with 25 additions and 25 deletions
|
@ -234,15 +234,16 @@ private Movie FindByTitle(string cleanTitle, int? year)
|
|||
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)
|
||||
{
|
||||
result =
|
||||
q.Where(movie => movie.CleanTitle == cleanTitleWithArabicNumbers).FirstWithYear(year) ??
|
||||
q.Where(movie => movie.CleanTitle == cleanTitleWithRomanNumbers).FirstWithYear(year);
|
||||
Query(q => q.Where(movie => movie.CleanTitle == cleanTitleWithArabicNumbers).FirstWithYear(year)) ??
|
||||
Query(q => q.Where(movie => movie.CleanTitle == cleanTitleWithRomanNumbers).FirstWithYear(year));
|
||||
|
||||
if (result == null)
|
||||
{
|
||||
|
@ -258,16 +259,15 @@ private Movie FindByTitle(string cleanTitle, int? year)
|
|||
|
||||
//result = Query.Join<Movie, AlternativeTitle>(JoinType.Inner, m => m._newAltTitles,
|
||||
//(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 == cleanTitleWithRomanNumbers)
|
||||
.FirstWithYear(year);
|
||||
.FirstWithYear(year));
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
});
|
||||
|
||||
/*return year.HasValue
|
||||
? results?.FirstOrDefault(movie => movie.Year == year.Value)
|
||||
|
|
Loading…
Reference in a new issue