Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New: Adding new series by tvdbid: or slug: is now possible.

This commit is contained in:
Taloth Saldono 2014-05-31 17:53:04 +02:00
parent e28123eefd
commit 6d2fac5cd0
1 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/NzbDrone.Core/MetadataSource/TraktProxy.cs
View File

@ -20,7 +20,7 @@ namespace NzbDrone.Core.MetadataSource
{ {
private readonly Logger _logger; private readonly Logger _logger;
private static readonly Regex CollapseSpaceRegex = new Regex(@"\s+", RegexOptions.Compiled); private static readonly Regex CollapseSpaceRegex = new Regex(@"\s+", RegexOptions.Compiled);
private static readonly Regex InvalidSearchCharRegex = new Regex(@"(?:\*|\(|\)|'|!|@)", RegexOptions.Compiled); private static readonly Regex InvalidSearchCharRegex = new Regex(@"(?:\*|\(|\)|'|!|@|\+)", RegexOptions.Compiled);
public TraktProxy(Logger logger) public TraktProxy(Logger logger)
{ {
@ -31,13 +31,43 @@ namespace NzbDrone.Core.MetadataSource
{ {
try try
{ {
var client = BuildClient("search", "shows"); if (title.StartsWith("tvdb:") || title.StartsWith("tvdbid:") || title.StartsWith("slug:"))
var restRequest = new RestRequest(GetSearchTerm(title) + "/30/seasons"); {
var response = client.ExecuteAndValidate<List<Show>>(restRequest); try
{
var slug = title.Split(':')[1];
return response.Select(MapSeries) if (slug.IsNullOrWhiteSpace() || slug.Any(char.IsWhiteSpace))
.OrderBy(v => title.LevenshteinDistanceClean(v.Title)) {
.ToList(); return new List<Series>();
}
var client = BuildClient("show", "summary");
var restRequest = new RestRequest(GetSearchTerm(slug) + "/extended");
var response = client.ExecuteAndValidate<Show>(restRequest);
return new List<Series> { MapSeries(response) };
}
catch (RestException ex)
{
if (ex.Response.StatusCode == HttpStatusCode.NotFound)
{
return new List<Series>();
}
throw;
}
}
else
{
var client = BuildClient("search", "shows");
var restRequest = new RestRequest(GetSearchTerm(title) + "/30/seasons");
var response = client.ExecuteAndValidate<List<Show>>(restRequest);
return response.Select(MapSeries)
.OrderBy(v => title.LevenshteinDistanceClean(v.Title))
.ToList();
}
} }
catch (WebException ex) catch (WebException ex)
{ {
@ -172,7 +202,6 @@ namespace NzbDrone.Core.MetadataSource
phrase = CollapseSpaceRegex.Replace(phrase, " ").Trim().ToLower(); phrase = CollapseSpaceRegex.Replace(phrase, " ").Trim().ToLower();
phrase = phrase.Trim('-'); phrase = phrase.Trim('-');
phrase = HttpUtility.UrlEncode(phrase); phrase = HttpUtility.UrlEncode(phrase);
return phrase; return phrase;
} }