open-source-mirrors
/
Lidarr
mirror of https://github.com/Lidarr/Lidarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Correct DownloadDescisionMaker to use ImdbId, and update the ui a little. (#1068)

Browse Source 
* Update variable names, also pass imdb to parsing service from downloaddescisionmaker

* Changes to the DownloadDescisionMaker to use ImdbId when looking for movie. Should fix a lot of Unknown Movie errors.

* Add movie link to nav bar, update Movies image to be fa-film :) Minor UI change.
Devin Buhl 8 years ago committed by GitHub
parent 73f0916fa0
commit b81d8c4678
9 changed files with 94 additions and 86 deletions
Show Stats Download Patch File Download Diff File

39
src/NzbDrone.Core/DecisionEngine/DownloadDecisionMaker.cs
Unescape View File

@ -66,31 +66,28 @@ namespace NzbDrone.Core.DecisionEngine
try try
{ {
var parsedEpisodeInfo = Parser.Parser.ParseMovieTitle(report.Title); var parsedMovieInfo = Parser.Parser.ParseMovieTitle(report.Title);
if (parsedEpisodeInfo != null && !parsedEpisodeInfo.MovieTitle.IsNullOrWhiteSpace()) if (parsedMovieInfo != null && !parsedMovieInfo.MovieTitle.IsNullOrWhiteSpace())
{ {
RemoteMovie remoteEpisode = _parsingService.Map(parsedEpisodeInfo, "", searchCriteria); RemoteMovie remoteMovie = _parsingService.Map(parsedMovieInfo, report.ImdbId.ToString(), searchCriteria);
remoteEpisode.Release = report; remoteMovie.Release = report;
if (remoteEpisode.Movie == null) if (remoteMovie.Movie == null)
{ {
//remoteEpisode.DownloadAllowed = true; //Fuck you :) decision = new DownloadDecision(remoteMovie, new Rejection("Unknown movie. Cannot parse release name."));
//decision = GetDecisionForReport(remoteEpisode, searchCriteria);
decision = new DownloadDecision(remoteEpisode, new Rejection("Unknown release. Movie not Found."));
} }
else else
{ {
if (parsedEpisodeInfo.Quality.HardcodedSubs.IsNotNullOrWhiteSpace()) if (parsedMovieInfo.Quality.HardcodedSubs.IsNotNullOrWhiteSpace())
{ {
remoteEpisode.DownloadAllowed = true; remoteMovie.DownloadAllowed = true;
decision = new DownloadDecision(remoteEpisode, new Rejection("Hardcoded subs found: " + parsedEpisodeInfo.Quality.HardcodedSubs)); decision = new DownloadDecision(remoteMovie, new Rejection("Hardcoded subs found: " + parsedMovieInfo.Quality.HardcodedSubs));
} }
else else
{ {
remoteEpisode.DownloadAllowed = true; remoteMovie.DownloadAllowed = true;
decision = GetDecisionForReport(remoteEpisode, searchCriteria); decision = GetDecisionForReport(remoteMovie, searchCriteria);
//decision = new DownloadDecision(remoteEpisode);
} }
} }
@ -100,8 +97,8 @@ namespace NzbDrone.Core.DecisionEngine
{ {
_logger.Error(e, "Couldn't process release."); _logger.Error(e, "Couldn't process release.");
var remoteEpisode = new RemoteEpisode { Release = report }; var remoteMovie = new RemoteMovie { Release = report };
decision = new DownloadDecision(remoteEpisode, new Rejection("Unexpected error processing release")); decision = new DownloadDecision(remoteMovie, new Rejection("Unexpected error processing release"));
} }
reportNumber++; reportNumber++;
@ -244,11 +241,11 @@ namespace NzbDrone.Core.DecisionEngine
return null; return null;
} }
private Rejection EvaluateSpec(IDecisionEngineSpecification spec, RemoteMovie remoteEpisode, SearchCriteriaBase searchCriteriaBase = null) private Rejection EvaluateSpec(IDecisionEngineSpecification spec, RemoteMovie remoteMovie, SearchCriteriaBase searchCriteriaBase = null)
{ {
try try
{ {
var result = spec.IsSatisfiedBy(remoteEpisode, searchCriteriaBase); var result = spec.IsSatisfiedBy(remoteMovie, searchCriteriaBase);
if (!result.Accepted) if (!result.Accepted)
{ {
@ -261,9 +258,9 @@ namespace NzbDrone.Core.DecisionEngine
} }
catch (Exception e) catch (Exception e)
{ {
e.Data.Add("report", remoteEpisode.Release.ToJson()); e.Data.Add("report", remoteMovie.Release.ToJson());
e.Data.Add("parsed", remoteEpisode.ParsedEpisodeInfo.ToJson()); e.Data.Add("parsed", remoteMovie.ParsedMovieInfo.ToJson());
_logger.Error(e, "Couldn't evaluate decision on " + remoteEpisode.Release.Title + ", with spec: " + spec.GetType().Name); _logger.Error(e, "Couldn't evaluate decision on " + remoteMovie.Release.Title + ", with spec: " + spec.GetType().Name);
return new Rejection(string.Format("{0}: {1}", spec.GetType().Name, e.Message));//TODO UPDATE SPECS! return new Rejection(string.Format("{0}: {1}", spec.GetType().Name, e.Message));//TODO UPDATE SPECS!
} }

28
src/NzbDrone.Core/Indexers/Newznab/NewznabRssParser.cs
Unescape View File

@ -57,20 +57,22 @@ namespace NzbDrone.Core.Indexers.Newznab
releaseInfo = base.ProcessItem(item, releaseInfo); releaseInfo = base.ProcessItem(item, releaseInfo);
releaseInfo.ImdbId = GetImdbId(item); releaseInfo.ImdbId = GetImdbId(item);
var imdbMovieTitle = GetImdbTitle(item);
var imdbYear = GetImdbYear(item);
// Fun, lets try to add year to the releaseTitle for our foriegn friends :) //// This shouldn't be needed with changes to the DownloadDecisionMaker
// if (!releaseInfo.Title.ContainsIgnoreCase(imdbMovieTitle + "." + imdbYear)) //var imdbMovieTitle = GetImdbTitle(item);
var isMatch = Regex.IsMatch(releaseInfo.Title, $@"^{imdbMovieTitle}.*{imdbYear}", RegexOptions.IgnoreCase); //var imdbYear = GetImdbYear(item);
if (!isMatch)
{ //// Fun, lets try to add year to the releaseTitle for our foriegn friends :)
if (imdbYear != 1900 && imdbMovieTitle != string.Empty) //// if (!releaseInfo.Title.ContainsIgnoreCase(imdbMovieTitle + "." + imdbYear))
{ //var isMatch = Regex.IsMatch(releaseInfo.Title, $@"^{imdbMovieTitle}.*{imdbYear}", RegexOptions.IgnoreCase);
// releaseInfo.Title = releaseInfo.Title.Replace(imdbMovieTitle, imdbMovieTitle + "." + imdbYear); //if (!isMatch)
releaseInfo.Title = Regex.Replace(releaseInfo.Title, imdbMovieTitle, imdbMovieTitle + "." + imdbYear, RegexOptions.IgnoreCase); //{
} // if (imdbYear != 1900 && imdbMovieTitle != string.Empty)
} // {
// // releaseInfo.Title = releaseInfo.Title.Replace(imdbMovieTitle, imdbMovieTitle + "." + imdbYear);
// releaseInfo.Title = Regex.Replace(releaseInfo.Title, imdbMovieTitle, imdbMovieTitle + "." + imdbYear, RegexOptions.IgnoreCase);
// }
//}
return releaseInfo; return releaseInfo;
} }

25
src/NzbDrone.Core/Parser/Parser.cs
Unescape View File

@ -20,23 +20,22 @@ namespace NzbDrone.Core.Parser
//Special, Despecialized, etc. Edition Movies, e.g: Mission.Impossible.3.Special.Edition.2011 //Special, Despecialized, etc. Edition Movies, e.g: Mission.Impossible.3.Special.Edition.2011
new Regex(@"^(?<title>(?![(\[]).+?)?(?:(?:[-_\W](?<![)\[!]))*(?<edition>(\.?((Extended.|Ultimate.)?(Director.?s|Collector.?s|Theatrical|Ultimate|Final|Extended|Rogue|Special|Despecialized).(Cut|Edition|Version)|Extended|Uncensored|Remastered|Unrated|Uncut|IMAX)))\.(?<year>(19|20)\d{2}(?!p|i|\d+|\]|\W\d+)))+(\W+|_|$)(?!\\)", new Regex(@"^(?<title>(?![(\[]).+?)?(?:(?:[-_\W](?<![)\[!]))*(?<edition>(\.?((Extended.|Ultimate.)?(Director.?s|Collector.?s|Theatrical|Ultimate|Final|Extended|Rogue|Special|Despecialized).(Cut|Edition|Version)|Extended|Uncensored|Remastered|Unrated|Uncut|IMAX)))\.(?<year>(19|20)\d{2}(?!p|i|\d+|\]|\W\d+)))+(\W+|_|$)(?!\\)",
RegexOptions.IgnoreCase | RegexOptions.Compiled), RegexOptions.IgnoreCase | RegexOptions.Compiled),
//Special, Despecialized, etc. Edition Movies, e.g: Mission.Impossible.3.2011.Special.Edition //TODO: Seems to slow down parsing heavily! //Special, Despecialized, etc. Edition Movies, e.g: Mission.Impossible.3.2011.Special.Edition //TODO: Seems to slow down parsing heavily!
new Regex(@"^(?<title>(?![(\[]).+?)?(?:(?:[-_\W](?<![)\[!]))*(?<year>(19|20)\d{2}(?!p|i|\d+|\]|\W\d+)))+(\W+|_|$)(?!\\)(?<edition>((Extended.|Ultimate.)?(Director.?s|Collector.?s|Theatrical|Ultimate|Final|Extended|Rogue|Special|Despecialized).(Cut|Edition|Version)|Extended|Uncensored|Remastered|Unrated|Uncut|IMAX))", new Regex(@"^(?<title>(?![(\[]).+?)?(?:(?:[-_\W](?<![)\[!]))*(?<year>(19|20)\d{2}(?!p|i|\d+|\]|\W\d+)))+(\W+|_|$)(?!\\)(?<edition>((Extended.|Ultimate.)?(Director.?s|Collector.?s|Theatrical|Ultimate|Final|Extended|Rogue|Special|Despecialized).(Cut|Edition|Version)|Extended|Uncensored|Remastered|Unrated|Uncut|IMAX))",
RegexOptions.IgnoreCase | RegexOptions.Compiled), RegexOptions.IgnoreCase | RegexOptions.Compiled),
//Normal movie format, e.g: Mission.Impossible.3.2011 //Normal movie format, e.g: Mission.Impossible.3.2011
new Regex(@"^(?<title>(?![(\[]).+?)?(?:(?:[-_\W](?<![)\[!]))*(?<year>(19|20)\d{2}(?!p|i|\d+|\]|\W\d+)))+(\W+|_|$)(?!\\)", new Regex(@"^(?<title>(?![(\[]).+?)?(?:(?:[-_\W](?<![)\[!]))*(?<year>(19|20)\d{2}(?!p|i|\d+|\]|\W\d+)))+(\W+|_|$)(?!\\)", RegexOptions.IgnoreCase | RegexOptions.Compiled),
RegexOptions.IgnoreCase | RegexOptions.Compiled),
//PassThePopcorn Torrent names: Star.Wars[PassThePopcorn] //PassThePopcorn Torrent names: Star.Wars[PassThePopcorn]
new Regex(@"^(?<title>.+?)?(?:(?:[-_\W](?<![()\[!]))*(?<year>(\[\w *\])))+(\W+|_|$)(?!\\)", new Regex(@"^(?<title>.+?)?(?:(?:[-_\W](?<![()\[!]))*(?<year>(\[\w *\])))+(\W+|_|$)(?!\\)", RegexOptions.IgnoreCase | RegexOptions.Compiled),
RegexOptions.IgnoreCase | RegexOptions.Compiled),
//That did not work? Maybe some tool uses [] for years. Who would do that? //That did not work? Maybe some tool uses [] for years. Who would do that?
new Regex(@"^(?<title>(?![(\[]).+?)?(?:(?:[-_\W](?<![)!]))*(?<year>(19|20)\d{2}(?!p|i|\d+|\W\d+)))+(\W+|_|$)(?!\\)", new Regex(@"^(?<title>(?![(\[]).+?)?(?:(?:[-_\W](?<![)!]))*(?<year>(19|20)\d{2}(?!p|i|\d+|\W\d+)))+(\W+|_|$)(?!\\)", RegexOptions.IgnoreCase | RegexOptions.Compiled),
RegexOptions.IgnoreCase | RegexOptions.Compiled),
//As a last resort for movies that have ( or [ in their title. //As a last resort for movies that have ( or [ in their title.
new Regex(@"^(?<title>.+?)?(?:(?:[-_\W](?<![)\[!]))*(?<year>(19|20)\d{2}(?!p|i|\d+|\]|\W\d+)))+(\W+|_|$)(?!\\)", new Regex(@"^(?<title>.+?)?(?:(?:[-_\W](?<![)\[!]))*(?<year>(19|20)\d{2}(?!p|i|\d+|\]|\W\d+)))+(\W+|_|$)(?!\\)", RegexOptions.IgnoreCase | RegexOptions.Compiled),
RegexOptions.IgnoreCase | RegexOptions.Compiled),
}; };
@ -599,6 +598,16 @@ namespace NzbDrone.Core.Parser
return t; return t;
} }
public static string NormalizeImdbId(string imdbId)
{
if (imdbId.Length > 2)
{
return (imdbId.Substring(2) != "tt" ? $"tt{imdbId}" : imdbId);
}
return null;
}
public static string ParseSeriesName(string title) public static string ParseSeriesName(string title)
{ {
Logger.Debug("Parsing string '{0}'", title); Logger.Debug("Parsing string '{0}'", title);

54
src/NzbDrone.Core/Parser/ParsingService.cs
Unescape View File

@ -177,27 +177,26 @@ namespace NzbDrone.Core.Parser
public Movie GetMovie(string title) public Movie GetMovie(string title)
{ {
var parsedEpisodeInfo = Parser.ParseMovieTitle(title); var parsedMovieInfo = Parser.ParseMovieTitle(title);
if (parsedEpisodeInfo == null) if (parsedMovieInfo == null)
{ {
return _movieService.FindByTitle(title); return _movieService.FindByTitle(title);
} }
var series = _movieService.FindByTitle(parsedEpisodeInfo.MovieTitle); var movies = _movieService.FindByTitle(parsedMovieInfo.MovieTitle);
if (series == null) if (movies == null)
{ {
series = _movieService.FindByTitle(parsedEpisodeInfo.MovieTitleInfo.TitleWithoutYear, movies = _movieService.FindByTitle(parsedMovieInfo.MovieTitleInfo.TitleWithoutYear, parsedMovieInfo.MovieTitleInfo.Year);
parsedEpisodeInfo.MovieTitleInfo.Year);
} }
if (series == null) if (movies == null)
{ {
series = _movieService.FindByTitle(parsedEpisodeInfo.MovieTitle.Replace("DC", "").Trim()); movies = _movieService.FindByTitle(parsedMovieInfo.MovieTitle.Replace("DC", "").Trim());
} }
return series; return movies;
} }
public RemoteEpisode Map(ParsedEpisodeInfo parsedEpisodeInfo, int tvdbId, int tvRageId, SearchCriteriaBase searchCriteria = null) public RemoteEpisode Map(ParsedEpisodeInfo parsedEpisodeInfo, int tvdbId, int tvRageId, SearchCriteriaBase searchCriteria = null)
@ -220,23 +219,23 @@ namespace NzbDrone.Core.Parser
return remoteEpisode; return remoteEpisode;
} }
public RemoteMovie Map(ParsedMovieInfo parsedEpisodeInfo, string imdbId, SearchCriteriaBase searchCriteria = null) public RemoteMovie Map(ParsedMovieInfo parsedMovieInfo, string imdbId, SearchCriteriaBase searchCriteria = null)
{ {
var remoteEpisode = new RemoteMovie var remoteMovie = new RemoteMovie
{ {
ParsedMovieInfo = parsedEpisodeInfo, ParsedMovieInfo = parsedMovieInfo,
}; };
var movie = GetMovie(parsedEpisodeInfo, imdbId, searchCriteria); var movie = GetMovie(parsedMovieInfo, imdbId, searchCriteria);
if (movie == null) if (movie == null)
{ {
return remoteEpisode; return remoteMovie;
} }
remoteEpisode.Movie = movie; remoteMovie.Movie = movie;
return remoteEpisode; return remoteMovie;
} }
public RemoteEpisode Map(ParsedEpisodeInfo parsedEpisodeInfo, int seriesId, IEnumerable<int> episodeIds) public RemoteEpisode Map(ParsedEpisodeInfo parsedEpisodeInfo, int seriesId, IEnumerable<int> episodeIds)
@ -353,7 +352,7 @@ namespace NzbDrone.Core.Parser
return null; return null;
} }
private Movie GetMovie(ParsedMovieInfo parsedEpisodeInfo, string imdbId, SearchCriteriaBase searchCriteria) private Movie GetMovie(ParsedMovieInfo parsedMovieInfo, string imdbId, SearchCriteriaBase searchCriteria)
{ {
if (searchCriteria != null) if (searchCriteria != null)
{ {
@ -370,7 +369,7 @@ namespace NzbDrone.Core.Parser
foreach (string title in possibleTitles) foreach (string title in possibleTitles)
{ {
if (title == parsedEpisodeInfo.MovieTitle.CleanSeriesTitle()) if (title == parsedMovieInfo.MovieTitle.CleanSeriesTitle())
{ {
possibleMovie = searchCriteria.Movie; possibleMovie = searchCriteria.Movie;
} }
@ -380,19 +379,19 @@ namespace NzbDrone.Core.Parser
string num = entry.Key; string num = entry.Key;
string roman = entry.Value.ToLower(); string roman = entry.Value.ToLower();
if (title.Replace(num, roman) == parsedEpisodeInfo.MovieTitle.CleanSeriesTitle()) if (title.Replace(num, roman) == parsedMovieInfo.MovieTitle.CleanSeriesTitle())
{ {
possibleMovie = searchCriteria.Movie; possibleMovie = searchCriteria.Movie;
} }
if (title.Replace(roman, num) == parsedEpisodeInfo.MovieTitle.CleanSeriesTitle()) if (title.Replace(roman, num) == parsedMovieInfo.MovieTitle.CleanSeriesTitle())
{ {
possibleMovie = searchCriteria.Movie; possibleMovie = searchCriteria.Movie;
} }
} }
} }
if (possibleMovie != null && (parsedEpisodeInfo.Year < 1800 || possibleMovie.Year == parsedEpisodeInfo.Year)) if (possibleMovie != null && (parsedMovieInfo.Year < 1800 || possibleMovie.Year == parsedMovieInfo.Year))
{ {
return possibleMovie; return possibleMovie;
} }
@ -404,21 +403,20 @@ namespace NzbDrone.Core.Parser
if (searchCriteria == null) if (searchCriteria == null)
{ {
if (parsedEpisodeInfo.Year > 1900) if (parsedMovieInfo.Year > 1900)
{ {
movie = _movieService.FindByTitle(parsedEpisodeInfo.MovieTitle, parsedEpisodeInfo.Year); movie = _movieService.FindByTitle(parsedMovieInfo.MovieTitle, parsedMovieInfo.Year);
} }
else else
{ {
movie = _movieService.FindByTitle(parsedEpisodeInfo.MovieTitle); movie = _movieService.FindByTitle(parsedMovieInfo.MovieTitle);
} }
if (movie == null) if (movie == null)
{ {
movie = _movieService.FindByTitle(parsedEpisodeInfo.MovieTitle); movie = _movieService.FindByTitle(parsedMovieInfo.MovieTitle);
} }
return movie; // return movie;
} }
@ -430,7 +428,7 @@ namespace NzbDrone.Core.Parser
if (movie == null) if (movie == null)
{ {
_logger.Debug("No matching movie {0}", parsedEpisodeInfo.MovieTitle); _logger.Debug($"No matching movie {parsedMovieInfo.MovieTitle}");
return null; return null;
} }

3
src/NzbDrone.Core/Tv/MovieRepository.cs
Unescape View File

@ -150,7 +150,8 @@ namespace NzbDrone.Core.Tv
public Movie FindByImdbId(string imdbid) public Movie FindByImdbId(string imdbid)
{ {
return Query.Where(s => s.ImdbId == imdbid).SingleOrDefault(); var imdbIdWithPrefix = Parser.Parser.NormalizeImdbId(imdbid);
return Query.Where(s => s.ImdbId == imdbIdWithPrefix).SingleOrDefault();
} }
public List<Movie> GetMoviesByFileId(int fileId) public List<Movie> GetMoviesByFileId(int fileId)

2
src/UI/Content/icons.less
Unescape View File

@ -336,7 +336,7 @@
} }
.icon-sonarr-navbar-series { .icon-sonarr-navbar-series {
.fa-icon-content(@fa-var-play); .fa-icon-content(@fa-var-film);
} }
.icon-sonarr-navbar-calendar { .icon-sonarr-navbar-calendar {

12
src/UI/Content/navbar.less
Unescape View File

@ -98,24 +98,24 @@
border-radius : 6px; border-radius : 6px;
padding : 5px 0px 5px; padding : 5px 0px 5px;
min-height : 76px; min-height : 76px;
min-width : 64px; min-width : 50px;
margin : 20px 5px 5px; margin : 20px 5px 5px;
} }
@media (min-width: @screen-md-min) and (max-width: @screen-md-max) { @media (min-width: @screen-md-min) and (max-width: @screen-md-max) {
border-radius : 6px; border-radius : 6px;
padding : 15px 10px 5px; padding : 15px 5px 5px;
min-height : 76px; min-height : 76px;
min-width : 64px; min-width : 50px;
margin : 20px 10px 5px; margin : 20px 5px 5px;
} }
@media (min-width: @screen-lg-min) { @media (min-width: @screen-lg-min) {
border-radius : 6px; border-radius : 6px;
padding : 15px 10px 5px; padding : 15px 5px 5px;
min-height : 76px; min-height : 76px;
min-width : 84px; min-width : 84px;
margin : 20px 10px 5px; margin : 20px 5px 5px;
} }
} }

1
src/UI/Navbar/NavbarLayoutTemplate.hbs
Unescape View File

@ -20,6 +20,7 @@
<div class="navbar-collapse collapse x-navbar-collapse"> <div class="navbar-collapse collapse x-navbar-collapse">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
<li><a href="{{UrlBase}}/" class="x-series-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-series"></i> Movies</a></li> <li><a href="{{UrlBase}}/" class="x-series-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-series"></i> Movies</a></li>
<li><a href="{{UrlBase}}/addmovies" class="x-series-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-add"></i> Add Movies</a></li>
<li><a href="{{UrlBase}}/calendar" class="x-calendar-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-calendar"></i> Calendar</a></li> <li><a href="{{UrlBase}}/calendar" class="x-calendar-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-calendar"></i> Calendar</a></li>
<li><a href="{{UrlBase}}/activity" class="x-activity-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-activity"></i> Activity<span id="x-queue-count" class="navbar-info"></span></a></li> <li><a href="{{UrlBase}}/activity" class="x-activity-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-activity"></i> Activity<span id="x-queue-count" class="navbar-info"></span></a></li>
<li><a href="{{UrlBase}}/wanted" class="x-wanted-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-wanted"></i> Wanted</a></li> <li><a href="{{UrlBase}}/wanted" class="x-wanted-nav"><i class="icon-sonarr-navbar-icon icon-sonarr-navbar-wanted"></i> Wanted</a></li>

Write Preview
Loading…
Cancel
Save