Fixed #1133

Do not show shows that we do not ahve any information for.
Ombi-app · Feb 17, 2017 · d6684eb · d6684eb
1 parent 7412528
commit d6684eb
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 19 deletions.
diff --git a/Ombi.Api/ApiRequest.cs b/Ombi.Api/ApiRequest.cs
@@ -27,6 +27,7 @@
 
 using System;
 using System.IO;
+using System.Net;
 using System.Xml.Serialization;
 using Newtonsoft.Json;
 using NLog;
@@ -76,14 +77,7 @@ public IRestResponse Execute(IRestRequest request, Uri baseUri)
             var client = new RestClient { BaseUrl = baseUri };
 
             var response = client.Execute(request);
-
-            if (response.ErrorException != null)
-            {
-                Log.Error(response.ErrorException);
-                var message = "Error retrieving response. Check inner details for more info.";
-                throw new ApiRequestException(message, response.ErrorException);
-            }
-
+
             return response;
         }
 

diff --git a/Ombi.Api/TvMazeApi.cs b/Ombi.Api/TvMazeApi.cs
@@ -28,6 +28,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Newtonsoft.Json;
 using NLog;
 using Ombi.Api.Models.Tv;
 using RestSharp;
@@ -90,21 +91,29 @@ public TvMazeShow ShowLookupByTheTvDbId(int theTvDbId)
             };
             request.AddUrlSegment("id", theTvDbId.ToString());
             request.AddHeader("Content-Type", "application/json");
+            try
+            {
+                var result = Api.Execute(request, new Uri(Uri));
+                var obj = JsonConvert.DeserializeObject<TvMazeShow>(result.Content);
 
-            var obj = Api.Execute<TvMazeShow>(request, new Uri(Uri));
-
-            var episodes = EpisodeLookup(obj.id).ToList();
+                var episodes = EpisodeLookup(obj.id).ToList();
 
-            foreach (var e in episodes)
-            {
-                obj.Season.Add(new TvMazeCustomSeason
+                foreach (var e in episodes)
                 {
-                    SeasonNumber = e.season,
-                    EpisodeNumber = e.number
-                });
+                    obj.Season.Add(new TvMazeCustomSeason
+                    {
+                        SeasonNumber = e.season,
+                        EpisodeNumber = e.number
+                    });
+                }
+
+                return obj;
             }
-
-            return obj;
+            catch (Exception e)
+            {
+                Log.Error(e);
+                return null;
+            }           
         }
 
         public List<TvMazeSeasons> GetSeasons(int id)

diff --git a/Ombi.UI/Modules/SearchModule.cs b/Ombi.UI/Modules/SearchModule.cs
@@ -437,6 +437,11 @@ private async Task<Response> ProcessShows(ShowSearchType type)
                     {
                         var show = anticipatedShow.Show;
                         var theTvDbId = int.Parse(show.Ids.Tvdb.ToString());
+                        var result = TvApi.ShowLookupByTheTvDbId(theTvDbId);
+                        if (result == null)
+                        {
+                            continue;
+                        }
 
                         var model = new SearchTvShowViewModel
                         {
@@ -466,6 +471,12 @@ private async Task<Response> ProcessShows(ShowSearchType type)
                     {
                         var show = watched.Show;
                         var theTvDbId = int.Parse(show.Ids.Tvdb.ToString());
+                        var result = TvApi.ShowLookupByTheTvDbId(theTvDbId);
+                        if (result == null)
+                        {
+                            continue;
+                        }
+
                         var model = new SearchTvShowViewModel
                         {
                             FirstAired = show.FirstAired?.ToString("yyyy-MM-ddTHH:mm:ss"),
@@ -494,6 +505,12 @@ private async Task<Response> ProcessShows(ShowSearchType type)
                     {
                         var show = watched.Show;
                         var theTvDbId = int.Parse(show.Ids.Tvdb.ToString());
+                        var result = TvApi.ShowLookupByTheTvDbId(theTvDbId);
+                        if (result == null)
+                        {
+                            continue;
+                        }
+
                         var model = new SearchTvShowViewModel
                         {
                             FirstAired = show.FirstAired?.ToString("yyyy-MM-ddTHH:mm:ss"),