mirror
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Releases Wiki Activity

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

This commit is contained in:
Leonardo Galli 2017-06-06 19:51:00 +02:00
parent 7bbebe53a3 d81e3a79cf
commit cff4578c66
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/NzbDrone.Core/Indexers/Newznab/NewznabRequestGenerator.cs
View File

@ -59,7 +59,18 @@ namespace NzbDrone.Core.Indexers.Newznab
else
{
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;

6
src/NzbDrone.Core/Notifications/Twitter/Twitter.cs
View File

@ -21,18 +21,18 @@ namespace NzbDrone.Core.Notifications.Twitter
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)
{
_twitterService.SendNotification($"Imported: {message.Message}", Settings);
_twitterService.SendNotification($"[Radarr] Imported: {message.Message}", Settings);
}
public override void OnMovieRename(Movie movie)
{
}
public override void OnRename(Series series)
{
}