Use skyhook for searching

2026-04-20 21:54:58 -04:00 · 2015-05-07 08:43:52 -07:00
parent 23c6da4746
commit a8aac36379
27 changed files with 90 additions and 1444 deletions
@@ -0,0 +1,17 @@
+using System.Net;
+using NzbDrone.Core.Exceptions;
+
+namespace NzbDrone.Core.MetadataSource.SkyHook
+{
+    public class SkyHookException : NzbDroneClientException
+    {
+        public SkyHookException(string message) : base(HttpStatusCode.ServiceUnavailable, message)
+        {
+        }
+
+        public SkyHookException(string message, params object[] args)
+            : base(HttpStatusCode.ServiceUnavailable, message, args)
+        {
+        }
+    }
+}
@@ -1,6 +1,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Net;
+using System.Text.RegularExpressions;
+using System.Web;
 using NLog;
 using NzbDrone.Common.Extensions;
 using NzbDrone.Common.Http;
@@ -10,23 +13,25 @@ using NzbDrone.Core.Tv;

 namespace NzbDrone.Core.MetadataSource.SkyHook
 {
-    public class SkyHookProxy : IProvideSeriesInfo
+    public class SkyHookProxy : IProvideSeriesInfo, ISearchForNewSeries
    {
-        private readonly Logger _logger;
        private readonly IHttpClient _httpClient;
+        private readonly Logger _logger;
        private readonly HttpRequestBuilder _requestBuilder;

-        public SkyHookProxy(Logger logger, IHttpClient httpClient)
+        public SkyHookProxy(IHttpClient httpClient, Logger logger)
        {
-            _logger = logger;
            _httpClient = httpClient;
+            _logger = logger;

-            _requestBuilder = new HttpRequestBuilder("http://skyhook.sonarr.tv/v1/tvdb/shows/en/");
+            _requestBuilder = new HttpRequestBuilder("http://skyhook.sonarr.tv/v1/tvdb/{route}/en/");
        }

        public Tuple<Series, List<Episode>> GetSeriesInfo(int tvdbSeriesId)
        {
            var httpRequest = _requestBuilder.Build(tvdbSeriesId.ToString());
+            httpRequest.AddSegment("route", "shows");
+
            var httpResponse = _httpClient.Get<ShowResource>(httpRequest);
            var episodes = httpResponse.Resource.Episodes.Select(MapEpisode);
            var series = MapSeries(httpResponse.Resource);
@@ -34,6 +39,58 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
            return new Tuple<Series, List<Episode>>(series, episodes.ToList());
        }

+        public List<Series> SearchForNewSeries(string title)
+        {
+            try
+            {
+                var lowerTitle = title.ToLowerInvariant();
+
+                if (lowerTitle.StartsWith("tvdb:") || lowerTitle.StartsWith("tvdbid:"))
+                {
+                    var slug = lowerTitle.Split(':')[1].Trim();
+
+                    int tvdbId;
+
+                    if (slug.IsNullOrWhiteSpace() || slug.Any(char.IsWhiteSpace) || !Int32.TryParse(slug, out tvdbId) || tvdbId <= 0)
+                    {
+                        return new List<Series>();
+                    }
+
+                    try
+                    {
+                        return new List<Series> { GetSeriesInfo(tvdbId).Item1 };
+                    }
+                    catch (Common.Http.HttpException ex)
+                    {
+                        if (ex.Response.StatusCode == HttpStatusCode.NotFound)
+                        {
+                            return new List<Series>();
+                        }
+
+                        throw;
+                    }
+                }
+
+                var term = HttpUtility.UrlEncode((title.ToLower().Trim()));
+                var httpRequest = _requestBuilder.Build("?term={term}");
+                httpRequest.AddSegment("route", "search");
+                httpRequest.AddSegment("term", term);
+
+                var httpResponse = _httpClient.Get<List<ShowResource>>(httpRequest);
+
+                return httpResponse.Resource.SelectList(MapSeries);
+            }
+            catch (Common.Http.HttpException)
+            {
+                throw new SkyHookException("Search for '{0}' failed. Unable to communicate with SkyHook.", title);
+            }
+            catch (Exception ex)
+            {
+                _logger.WarnException(ex.Message, ex);
+                throw new SkyHookException("Search for '{0}' failed. Invalid response received from SkyHook.", title);
+            }
+        }
+
        private static Series MapSeries(ShowResource show)
        {
            var series = new Series();
@@ -91,8 +148,7 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
            var newActor = new Actor
            {
                Name = arg.Name,
-                Character = arg.Character,
-
+                Character = arg.Character
            };

            if (arg.Image != null)
@@ -185,6 +241,5 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
                    return MediaCoverTypes.Unknown;
            }
        }
-
    }
 }
@@ -1,272 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net;
-using System.Text.RegularExpressions;
-using System.Web;
-using NLog;
-using NzbDrone.Common.Extensions;
-using NzbDrone.Core.MediaCover;
-using NzbDrone.Core.MetadataSource.Tvdb;
-using NzbDrone.Core.Tv;
-using TVDBSharp;
-using TVDBSharp.Models.Enums;
-
-namespace NzbDrone.Core.MetadataSource
-{
-    public class TvDbProxy : ISearchForNewSeries
-    {
-        private readonly Logger _logger;
-        private static readonly Regex CollapseSpaceRegex = new Regex(@"\s+", RegexOptions.Compiled);
-        private static readonly Regex InvalidSearchCharRegex = new Regex(@"(?:\*|\(|\)|'|!|@|\+)", RegexOptions.Compiled);
-
-        private readonly TVDB _tvdb;
-
-        public TvDbProxy(Logger logger)
-        {
-            _logger = logger;
-            _tvdb = new TVDB("5D2D188E86E07F4F");
-        }
-
-        private IEnumerable<TVDBSharp.Models.Show> SearchTvdb(string title)
-        {
-            var lowerTitle = title.ToLowerInvariant();
-
-            if (lowerTitle.StartsWith("tvdb:") || lowerTitle.StartsWith("tvdbid:"))
-            {
-                var slug = lowerTitle.Split(':')[1].Trim();
-
-                int tvdbId;
-
-                if (slug.IsNullOrWhiteSpace() || slug.Any(char.IsWhiteSpace) || !Int32.TryParse(slug, out tvdbId) || tvdbId <= 0)
-                {
-                    return Enumerable.Empty<TVDBSharp.Models.Show>();
-                }
-
-                try
-                {
-                    return new[] { _tvdb.GetShow(tvdbId) };
-                }
-                catch (Common.Http.HttpException ex)
-                {
-                    if (ex.Response.StatusCode == HttpStatusCode.NotFound)
-                    {
-                        return Enumerable.Empty<TVDBSharp.Models.Show>();
-                    }
-
-                    throw;
-                }
-            }
-
-            return _tvdb.Search(GetSearchTerm(lowerTitle), 10);
-        }
-
-        public List<Series> SearchForNewSeries(string title)
-        {
-            try
-            {
-                var tvdbSeries = SearchTvdb(title.Trim());
-
-                var series = tvdbSeries.Select(MapSeries).ToList();
-
-                series.Sort(new SearchSeriesComparer(title));
-
-                return series;
-            }
-            catch (Common.Http.HttpException)
-            {
-                throw new TvdbException("Search for '{0}' failed. Unable to communicate with TVDB.", title);
-            }
-            catch (Exception ex)
-            {
-                _logger.WarnException(ex.Message, ex);
-                throw new TvdbException("Search for '{0}' failed. Invalid response received from TVDB.", title);
-            }
-        }
-
-        public Tuple<Series, List<Tv.Episode>> GetSeriesInfo(int tvdbSeriesId)
-        {
-            var tvdbSeries = _tvdb.GetShow(tvdbSeriesId);
-
-            var episodes = tvdbSeries.Episodes.Select(MapEpisode);
-
-            episodes = RemoveDuplicates(episodes);
-
-            var series = MapSeries(tvdbSeries);
-
-            return new Tuple<Series, List<Tv.Episode>>(series, episodes.ToList());
-        }
-
-        private static IEnumerable<Tv.Episode> RemoveDuplicates(IEnumerable<Tv.Episode> episodes)
-        {
-            //http://support.trakt.tv/forums/188762-general/suggestions/4430690-anger-management-duplicate-episode
-            var episodeGroup = episodes.GroupBy(e => e.SeasonNumber.ToString("0000") + e.EpisodeNumber.ToString("0000"));
-            return episodeGroup.Select(g => g.First());
-        }
-
-        private static Series MapSeries(TVDBSharp.Models.Show show)
-        {
-            var series = new Series();
-            series.TvdbId = show.Id;
-            //series.TvRageId = show.tvrage_id;
-            series.ImdbId = show.ImdbId;
-            series.Title = show.Name;
-            series.CleanTitle = Parser.Parser.CleanSeriesTitle(show.Name);
-            series.SortTitle = SeriesTitleNormalizer.Normalize(show.Name, show.Id);
-
-            if (show.FirstAired != null)
-            {
-                series.Year = show.FirstAired.Value.Year;
-                series.FirstAired = show.FirstAired.Value.ToUniversalTime();
-            }
-
-            series.Overview = show.Description;
-
-            if (show.Runtime != null)
-            {
-                series.Runtime = show.Runtime.Value;
-            }
-
-            series.Network = show.Network;
-
-            if (show.AirTime != null)
-            {
-                series.AirTime = show.AirTime.Value.ToString();
-            }
-
-            series.TitleSlug = GenerateSlug(show.Name);
-            series.Status = GetSeriesStatus(show.Status);
-            series.Ratings = GetRatings(show.RatingCount, show.Rating);
-            series.Genres = show.Genres;
-            series.Certification = show.ContentRating.ToString().ToUpper();
-            series.Actors = new List<Tv.Actor>();
-            series.Seasons = GetSeasons(show);
-
-            if (show.Banner != null)
-            {
-                series.Images.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Banner, Url = show.Banner.ToString() });                
-            }
-
-            if (show.Poster != null)
-            {
-                series.Images.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Poster, Url = show.Poster.ToString() });
-            }
-
-            if (show.Fanart != null)
-            {
-                series.Images.Add(new MediaCover.MediaCover { CoverType = MediaCoverTypes.Fanart, Url = show.Fanart.ToString() });
-            }
-
-            return series;
-        }
-
-        private static Episode MapEpisode(TVDBSharp.Models.Episode traktEpisode)
-        {
-            var episode = new Episode();
-            episode.Overview = traktEpisode.Description;
-            episode.SeasonNumber = traktEpisode.SeasonNumber;
-            episode.EpisodeNumber = traktEpisode.EpisodeNumber;
-            episode.AbsoluteEpisodeNumber = traktEpisode.AbsoluteEpisodeNumber;
-            episode.Title = traktEpisode.Title;
-
-            if (traktEpisode.FirstAired != null)
-            {
-                episode.AirDate = traktEpisode.FirstAired.Value.ToString("yyyy-MM-dd");
-                episode.AirDateUtc = traktEpisode.FirstAired.Value.ToUniversalTime();
-            }
-
-            episode.Ratings = GetRatings(traktEpisode.RatingCount, traktEpisode.Rating);
-
-            //Don't include series fanart images as episode screenshot
-            if (traktEpisode.EpisodeImage != null)
-            {
-                episode.Images.Add(new MediaCover.MediaCover(MediaCoverTypes.Screenshot, traktEpisode.EpisodeImage.ToString()));                
-            }
-            
-            return episode;
-        }
-
-
-        private static SeriesStatusType GetSeriesStatus(Status status)
-        {
-            if (status == Status.Ended)
-            {
-                return SeriesStatusType.Ended;
-            }
-
-            return SeriesStatusType.Continuing;
-        }
-
-        private static string GetSearchTerm(string phrase)
-        {
-            phrase = phrase.RemoveAccent();
-            phrase = InvalidSearchCharRegex.Replace(phrase, "");
-
-            //            if (!phrase.Any(char.IsWhiteSpace) && phrase.Any(char.IsUpper) && phrase.Any(char.IsLower) && phrase.Length > 4)
-            //            {
-            //                phrase = ExpandCamelCaseRegEx.Replace(phrase, " ");
-            //            }
-
-            phrase = CollapseSpaceRegex.Replace(phrase, " ").Trim();
-            phrase = phrase.Trim('-');
-
-            phrase = HttpUtility.UrlEncode(phrase.ToLower());
-
-            return phrase;
-        }
-
-        private static Tv.Ratings GetRatings(int ratingCount, decimal? rating)
-        {
-
-            var result = new Tv.Ratings { Votes = ratingCount };
-
-            if (rating != null)
-            {
-                result.Value = rating.Value;
-            }
-
-            return result;
-        }
-
-
-        private static List<Tv.Season> GetSeasons(TVDBSharp.Models.Show show)
-        {
-            var seasons = new List<Tv.Season>();
-
-            foreach (var seasonNumber in show.Episodes.Select(c => c.SeasonNumber).Distinct().OrderByDescending(c => c))
-            {
-                var season = new Tv.Season
-                {
-                    SeasonNumber = seasonNumber
-                };
-
-                /*           if (season.images != null)
-                           {
-                               season.Images.Add(new MediaCover.MediaCover(MediaCoverTypes.Poster, season.images.poster));
-                           }*/
-
-                seasons.Add(season);
-            }
-
-            return seasons;
-        }
-
-
-        private static readonly Regex RemoveRegex = new Regex(@"[^\w-]", RegexOptions.Compiled);
-
-        public static string GenerateSlug(string showTitle)
-        {
-            if (showTitle.StartsWith("."))
-            {
-                showTitle = "dot" + showTitle.Substring(1);
-            }
-            showTitle = showTitle.Replace(" ", "-");
-            showTitle = showTitle.Replace("&", "and");
-            showTitle = RemoveRegex.Replace(showTitle, String.Empty);
-            showTitle = showTitle.RemoveAccent();
-            showTitle = showTitle.ToLowerInvariant();
-
-            return showTitle;
-        }
-    }
-}
@@ -1,16 +0,0 @@
-using System.Net;
-using NzbDrone.Core.Exceptions;
-
-namespace NzbDrone.Core.MetadataSource.Tvdb
-{
-    public class TvdbException : NzbDroneClientException
-    {
-        public TvdbException(string message) : base(HttpStatusCode.ServiceUnavailable, message)
-        {
-        }
-
-        public TvdbException(string message, params object[] args) : base(HttpStatusCode.ServiceUnavailable, message, args)
-        {
-        }
-    }
-}