Merge remote-tracking branch 'origin/develop' into develop

pull/1627/head
Leonardo Galli 7 years ago
commit cff4578c66

@ -59,7 +59,18 @@ namespace NzbDrone.Core.Indexers.Newznab
else else
{ {
var searchTitle = System.Web.HttpUtility.UrlPathEncode(Parser.Parser.ReplaceGermanUmlauts(Parser.Parser.NormalizeTitle(searchCriteria.Movie.Title))); var searchTitle = System.Web.HttpUtility.UrlPathEncode(Parser.Parser.ReplaceGermanUmlauts(Parser.Parser.NormalizeTitle(searchCriteria.Movie.Title)));
pageableRequests.Add(GetPagedRequests(MaxPages, Settings.Categories, "search", $"&q={searchTitle}%20{searchCriteria.Movie.Year}")); var altTitles = searchCriteria.Movie.AlternativeTitles.DistinctBy(t => Parser.Parser.CleanSeriesTitle(t)).Take(5).ToList();
var realMaxPages = (int)MaxPages / (altTitles.Count() + 1);
pageableRequests.Add(GetPagedRequests(MaxPages - (altTitles.Count() * realMaxPages), Settings.Categories, "search", $"&q={searchTitle}%20{searchCriteria.Movie.Year}"));
//Also use alt titles for searching.
foreach (String altTitle in altTitles)
{
var searchAltTitle = System.Web.HttpUtility.UrlPathEncode(Parser.Parser.ReplaceGermanUmlauts(Parser.Parser.NormalizeTitle(altTitle)));
pageableRequests.Add(GetPagedRequests(realMaxPages, Settings.Categories, "search", $"&q={searchAltTitle}%20{searchCriteria.Movie.Year}"));
}
} }
return pageableRequests; return pageableRequests;

@ -21,12 +21,12 @@ namespace NzbDrone.Core.Notifications.Twitter
public override void OnGrab(GrabMessage message) public override void OnGrab(GrabMessage message)
{ {
_twitterService.SendNotification($"Grabbed: {message.Message}", Settings); _twitterService.SendNotification($"[Radarr] Grabbed: {message.Message}", Settings);
} }
public override void OnDownload(DownloadMessage message) public override void OnDownload(DownloadMessage message)
{ {
_twitterService.SendNotification($"Imported: {message.Message}", Settings); _twitterService.SendNotification($"[Radarr] Imported: {message.Message}", Settings);
} }
public override void OnMovieRename(Movie movie) public override void OnMovieRename(Movie movie)

Loading…
Cancel
Save