From cd135d824cf1cb08569eb351c34f03732b628ed4 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 27 Jul 2016 17:17:43 +0100 Subject: [PATCH] small bit of work on #266 --- PlexRequests.UI/Content/search.js | 3 +- .../Models/SearchTvShowViewModel.cs | 1 + PlexRequests.UI/Modules/SearchModule.cs | 25 ++++++++++------ PlexRequests.UI/Views/Search/Index.cshtml | 30 +++++++++++-------- 4 files changed, 36 insertions(+), 23 deletions(-) diff --git a/PlexRequests.UI/Content/search.js b/PlexRequests.UI/Content/search.js index f54f79691..97d1d1513 100644 --- a/PlexRequests.UI/Content/search.js +++ b/PlexRequests.UI/Content/search.js @@ -443,7 +443,8 @@ $(function () { requested: result.requested, approved: result.approved, available: result.available, - episodes : result.episodes + episodes: result.episodes, + tvFullyAvailable: result.tvFullyAvailable }; return context; } diff --git a/PlexRequests.UI/Models/SearchTvShowViewModel.cs b/PlexRequests.UI/Models/SearchTvShowViewModel.cs index 7497839ac..893d09b97 100644 --- a/PlexRequests.UI/Models/SearchTvShowViewModel.cs +++ b/PlexRequests.UI/Models/SearchTvShowViewModel.cs @@ -50,5 +50,6 @@ namespace PlexRequests.UI.Models public string ImdbId { get; set; } public int SiteRating { get; set; } public Store.EpisodesModel[] Episodes { get; set; } + public bool TvFullyAvailable { get; set; } } } \ No newline at end of file diff --git a/PlexRequests.UI/Modules/SearchModule.cs b/PlexRequests.UI/Modules/SearchModule.cs index 5e21a0d5c..99b2ea52e 100644 --- a/PlexRequests.UI/Modules/SearchModule.cs +++ b/PlexRequests.UI/Modules/SearchModule.cs @@ -40,7 +40,6 @@ using PlexRequests.Api.Models.Music; using PlexRequests.Core; using PlexRequests.Core.SettingModels; using PlexRequests.Helpers; -using PlexRequests.Helpers.Exceptions; using PlexRequests.Services.Interfaces; using PlexRequests.Services.Notification; using PlexRequests.Store; @@ -49,10 +48,9 @@ using PlexRequests.UI.Models; using System.Threading.Tasks; using Nancy.Extensions; -using Nancy.ModelBinding; -using Nancy.Responses; + using Newtonsoft.Json; -using PlexRequests.Api.Models.Sonarr; + using PlexRequests.Api.Models.Tv; using PlexRequests.Core.Models; using PlexRequests.Helpers.Analytics; @@ -289,6 +287,7 @@ namespace PlexRequests.UI.Modules { Analytics.TrackEventAsync(Category.Search, Action.TvShow, searchTerm, Username, CookieHelper.GetAnalyticClientId(Cookies)); var plexSettings = await PlexService.GetSettingsAsync(); + var providerId = string.Empty; var apiTv = new List(); await Task.Factory.StartNew(() => new TvMazeApi().Search(searchTerm)).ContinueWith((t) => @@ -313,10 +312,12 @@ namespace PlexRequests.UI.Modules var viewTv = new List(); foreach (var t in apiTv) { + var tvInfoTask = Task.Run(() => TvApi.EpisodeLookup(t.show.id)); + var banner = t.show.image?.medium; if (!string.IsNullOrEmpty(banner)) { - banner = banner.Replace("http", "https"); + banner = banner.Replace("http", "https"); // Always use the Https banners } var viewT = new SearchTvShowViewModel @@ -334,9 +335,7 @@ namespace PlexRequests.UI.Modules SeriesName = t.show.name, Status = t.show.status }; - - - var providerId = string.Empty; + if (plexSettings.AdvancedSearch) { @@ -349,7 +348,7 @@ namespace PlexRequests.UI.Modules } else if (t.show?.externals?.thetvdb != null) { - int tvdbid = (int)t.show.externals.thetvdb; + var tvdbid = (int)t.show.externals.thetvdb; if (dbTv.ContainsKey(tvdbid)) { @@ -365,7 +364,15 @@ namespace PlexRequests.UI.Modules viewT.Requested = true; } } + var tvInfo = await tvInfoTask; + // Check if we have every episode in all seasons + var epModel = tvInfo.Select(tvIn => new Store.EpisodesModel { SeasonNumber = tvIn.season, EpisodeNumber = tvIn.number }).ToList(); + var diff = viewT.Episodes.Except(epModel); + if (diff.Any()) + { + viewT.TvFullyAvailable = true; + } viewTv.Add(viewT); } diff --git a/PlexRequests.UI/Views/Search/Index.cshtml b/PlexRequests.UI/Views/Search/Index.cshtml index 12485e026..f388710f8 100644 --- a/PlexRequests.UI/Views/Search/Index.cshtml +++ b/PlexRequests.UI/Views/Search/Index.cshtml @@ -184,19 +184,23 @@ {{/if_eq}} {{/if_eq}} {{#if_eq type "tv"}} - + {{#if_eq tvFullyAvailable true}} + + {{else}} + + {{/if_eq}} {{/if_eq}}