github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-10 23:42:36 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed #1133

Browse source 
Do not show shows that we do not ahve any information for.
This commit is contained in:
tidusjar 2017-02-17 22:11:37 +00:00
parent 74125286b5
commit d6684eb1de
3 changed files with 40 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Ombi.Api/ApiRequest.cs
View file

@ -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;
} }

13
Ombi.Api/TvMazeApi.cs
View file

@ -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,8 +91,10 @@ 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 obj = Api.Execute<TvMazeShow>(request, new Uri(Uri)); {
var result = Api.Execute(request, new Uri(Uri));
var obj = JsonConvert.DeserializeObject<TvMazeShow>(result.Content);
var episodes = EpisodeLookup(obj.id).ToList(); var episodes = EpisodeLookup(obj.id).ToList();
@ -106,6 +109,12 @@ namespace Ombi.Api
return obj; return obj;
} }
catch (Exception e)
{
Log.Error(e);
return null;
}
}
public List<TvMazeSeasons> GetSeasons(int id) public List<TvMazeSeasons> GetSeasons(int id)
{ {

17
Ombi.UI/Modules/SearchModule.cs
View file

@ -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"),