Do not show shows that we do not ahve any information for.
pull/1138/head
tidusjar 8 years ago
parent 74125286b5
commit d6684eb1de

@ -27,6 +27,7 @@
using System; using System;
using System.IO; using System.IO;
using System.Net;
using System.Xml.Serialization; using System.Xml.Serialization;
using Newtonsoft.Json; using Newtonsoft.Json;
using NLog; using NLog;
@ -77,13 +78,6 @@ namespace Ombi.Api
var response = client.Execute(request); 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; return response;
} }

@ -28,6 +28,7 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using Newtonsoft.Json;
using NLog; using NLog;
using Ombi.Api.Models.Tv; using Ombi.Api.Models.Tv;
using RestSharp; using RestSharp;
@ -90,21 +91,29 @@ namespace Ombi.Api
}; };
request.AddUrlSegment("id", theTvDbId.ToString()); request.AddUrlSegment("id", theTvDbId.ToString());
request.AddHeader("Content-Type", "application/json"); 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) foreach (var e in episodes)
{
obj.Season.Add(new TvMazeCustomSeason
{ {
SeasonNumber = e.season, obj.Season.Add(new TvMazeCustomSeason
EpisodeNumber = e.number {
}); SeasonNumber = e.season,
EpisodeNumber = e.number
});
}
return obj;
}
catch (Exception e)
{
Log.Error(e);
return null;
} }
return obj;
} }
public List<TvMazeSeasons> GetSeasons(int id) public List<TvMazeSeasons> GetSeasons(int id)

@ -437,6 +437,11 @@ namespace Ombi.UI.Modules
{ {
var show = anticipatedShow.Show; var show = anticipatedShow.Show;
var theTvDbId = int.Parse(show.Ids.Tvdb.ToString()); var theTvDbId = int.Parse(show.Ids.Tvdb.ToString());
var result = TvApi.ShowLookupByTheTvDbId(theTvDbId);
if (result == null)
{
continue;
}
var model = new SearchTvShowViewModel var model = new SearchTvShowViewModel
{ {
@ -466,6 +471,12 @@ namespace Ombi.UI.Modules
{ {
var show = watched.Show; var show = watched.Show;
var theTvDbId = int.Parse(show.Ids.Tvdb.ToString()); var theTvDbId = int.Parse(show.Ids.Tvdb.ToString());
var result = TvApi.ShowLookupByTheTvDbId(theTvDbId);
if (result == null)
{
continue;
}
var model = new SearchTvShowViewModel var model = new SearchTvShowViewModel
{ {
FirstAired = show.FirstAired?.ToString("yyyy-MM-ddTHH:mm:ss"), FirstAired = show.FirstAired?.ToString("yyyy-MM-ddTHH:mm:ss"),
@ -494,6 +505,12 @@ namespace Ombi.UI.Modules
{ {
var show = watched.Show; var show = watched.Show;
var theTvDbId = int.Parse(show.Ids.Tvdb.ToString()); var theTvDbId = int.Parse(show.Ids.Tvdb.ToString());
var result = TvApi.ShowLookupByTheTvDbId(theTvDbId);
if (result == null)
{
continue;
}
var model = new SearchTvShowViewModel var model = new SearchTvShowViewModel
{ {
FirstAired = show.FirstAired?.ToString("yyyy-MM-ddTHH:mm:ss"), FirstAired = show.FirstAired?.ToString("yyyy-MM-ddTHH:mm:ss"),

Loading…
Cancel
Save