github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-08 06:00:50 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Almost fully integrated TVMaze #21 and also improved the fix for #31

Browse source
This commit is contained in:
Jamie Rees 2016-03-18 21:10:01 +00:00
parent b1d7a3187e
commit f88c7d7583
9 changed files with 64 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

31
PlexRequests.UI/Modules/SearchModule.cs
View file

@ -126,8 +126,8 @@ namespace PlexRequests.UI.Modules
FirstAired = t.show.premiered,
Id = t.show.id,
ImdbId = t.show.externals?.imdb,
Network = t.show.network.name,
NetworkId = t.show.network.id.ToString(),
Network = t.show.network?.name,
NetworkId = t.show.network?.id.ToString(),
Overview = t.show.summary,
Rating = t.score.ToString(CultureInfo.CurrentUICulture),
Runtime = t.show.runtime.ToString(),
@ -186,12 +186,12 @@ namespace PlexRequests.UI.Modules
Log.Trace("Getting movie info from TheMovieDb");
Log.Trace(movieInfo.DumpJson);
#if !DEBUG
if (CheckIfTitleExistsInPlex(movieInfo.Title))
//#if !DEBUG
if (CheckIfTitleExistsInPlex(movieInfo.Title, movieInfo.ReleaseDate?.Year.ToString()))
{
return Response.AsJson(new JsonResponseModel { Result = false, Message = $"{movieInfo.Title} is already in Plex!" });
}
#endif
//#endif
var model = new RequestedModel
{
@ -258,28 +258,27 @@ namespace PlexRequests.UI.Modules
return Response.AsJson(new JsonResponseModel { Result = false, Message = "TV Show has already been requested!" });
}
var tvApi = new TheTvDbApi();
var token = GetTvDbAuthToken(tvApi);
var tvApi = new TvMazeApi();
var showInfo = tvApi.GetInformation(showId, token).data;
var showInfo = tvApi.ShowLookup(showId);
//#if !DEBUG
if (CheckIfTitleExistsInPlex(showInfo.seriesName))
if (CheckIfTitleExistsInPlex(showInfo.name, showInfo.premiered.Substring(0,4))) // Take only the year Format = 2014-01-01
{
return Response.AsJson(new JsonResponseModel { Result = false, Message = $"{showInfo.seriesName} is already in Plex!" });
return Response.AsJson(new JsonResponseModel { Result = false, Message = $"{showInfo.name} is already in Plex!" });
}
//#endif
DateTime firstAir;
DateTime.TryParse(showInfo.firstAired, out firstAir);
DateTime.TryParse(showInfo.premiered, out firstAir);
var model = new RequestedModel
{
ProviderId = showInfo.id,
Type = RequestType.TvShow,
Overview = showInfo.overview,
PosterPath = "http://image.tmdb.org/t/p/w150/" + showInfo.banner, // This is incorrect
Title = showInfo.seriesName,
Overview = showInfo.summary,
PosterPath = showInfo.image?.medium,
Title = showInfo.name,
ReleaseDate = firstAir,
Status = showInfo.status,
RequestedDate = DateTime.Now,
@ -320,9 +319,9 @@ namespace PlexRequests.UI.Modules
return Cache.GetOrSet(CacheKeys.TvDbToken, api.Authenticate, 50);
}
private bool CheckIfTitleExistsInPlex(string title)
private bool CheckIfTitleExistsInPlex(string title, string year)
{
var result = Checker.IsAvailable(title);
var result = Checker.IsAvailable(title, year);
return result;
}
}