mirror of
https://github.com/Ombi-app/Ombi.git
synced 2025-07-11 07:46:05 -07:00
precheck and disable the episode boxes if we already have requested it. TODO check sonarr to see if it's already there. #254
This commit is contained in:
parent
767a045864
commit
d458dca541
8 changed files with 285 additions and 227 deletions
20
PlexRequests.UI/Content/search.js
vendored
20
PlexRequests.UI/Content/search.js
vendored
|
@ -442,7 +442,8 @@ $(function () {
|
|||
imdb: result.imdbId,
|
||||
requested: result.requested,
|
||||
approved: result.approved,
|
||||
available: result.available
|
||||
available: result.available,
|
||||
episodes : result.episodes
|
||||
};
|
||||
return context;
|
||||
}
|
||||
|
@ -585,8 +586,6 @@ $(function () {
|
|||
|
||||
var model = [];
|
||||
|
||||
|
||||
|
||||
var $checkedEpisodes = $('.selectedEpisodes:checkbox:checked');
|
||||
$checkedEpisodes.each(function (index, element) {
|
||||
var $element = $('#' + element.id);
|
||||
|
@ -616,7 +615,7 @@ $(function () {
|
|||
|
||||
function buildSeasonsCount(result) {
|
||||
return {
|
||||
seasonNumber: result.season
|
||||
seasonNumber: result.seasonNumber
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -624,17 +623,10 @@ $(function () {
|
|||
function buildEpisodesView(result) {
|
||||
return {
|
||||
id: result.id,
|
||||
url: result.url,
|
||||
name: result.name,
|
||||
season: result.season,
|
||||
number: result.number,
|
||||
airdate: result.airdate,
|
||||
airtime: result.airtime,
|
||||
airstamp: result.airstamp,
|
||||
runtime: result.runtime,
|
||||
image: result.image,
|
||||
summary: result.summary,
|
||||
links : result._links
|
||||
season: result.seasonNumber,
|
||||
number: result.episodeNumber,
|
||||
requested: result.requested
|
||||
}
|
||||
}
|
||||
});
|
||||
|
|
|
@ -33,13 +33,11 @@ using PlexRequests.Api.Interfaces;
|
|||
using PlexRequests.Api.Models.SickRage;
|
||||
using PlexRequests.Api.Models.Sonarr;
|
||||
using PlexRequests.Core.SettingModels;
|
||||
using PlexRequests.Helpers;
|
||||
using PlexRequests.Store;
|
||||
using System.Linq;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
using PlexRequests.Helpers.Exceptions;
|
||||
using PlexRequests.UI.Models;
|
||||
|
||||
namespace PlexRequests.UI.Helpers
|
||||
{
|
||||
|
@ -73,15 +71,16 @@ namespace PlexRequests.UI.Helpers
|
|||
int.TryParse(sonarrSettings.QualityProfile, out qualityProfile);
|
||||
}
|
||||
|
||||
// Does series exist?
|
||||
var series = await GetSonarrSeries(sonarrSettings, model.ProviderId);
|
||||
|
||||
var seriesTask = GetSonarrSeries(sonarrSettings, model.ProviderId);
|
||||
|
||||
// Series Exists
|
||||
if (episodeRequest)
|
||||
{
|
||||
// Does series exist?
|
||||
var series = await seriesTask;
|
||||
if (series != null)
|
||||
{
|
||||
// Series Exists
|
||||
// Request the episodes in the existing series
|
||||
RequestEpisodesWithExistingSeries(model, series, sonarrSettings);
|
||||
}
|
||||
|
@ -119,7 +118,6 @@ namespace PlexRequests.UI.Helpers
|
|||
}
|
||||
|
||||
|
||||
|
||||
var result = SonarrApi.AddSeries(model.ProviderId, model.Title, qualityProfile,
|
||||
sonarrSettings.SeasonFolders, sonarrSettings.RootPath, model.SeasonCount, model.SeasonList, sonarrSettings.ApiKey,
|
||||
sonarrSettings.FullUri);
|
||||
|
|
37
PlexRequests.UI/Models/EpisodeListViewModel.cs
Normal file
37
PlexRequests.UI/Models/EpisodeListViewModel.cs
Normal file
|
@ -0,0 +1,37 @@
|
|||
#region Copyright
|
||||
// /************************************************************************
|
||||
// Copyright (c) 2016 Jamie Rees
|
||||
// File: EpisodeListViewModel.cs
|
||||
// Created By: Jamie Rees
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
// ************************************************************************/
|
||||
#endregion
|
||||
namespace PlexRequests.UI.Models
|
||||
{
|
||||
public class EpisodeListViewModel
|
||||
{
|
||||
public int SeasonNumber { get; set; }
|
||||
public int EpisodeNumber { get; set; }
|
||||
public bool Requested { get; set; }
|
||||
public string Name { get; set; }
|
||||
public int Id { get; set; }
|
||||
}
|
||||
}
|
|
@ -49,5 +49,6 @@ namespace PlexRequests.UI.Models
|
|||
public string Rating { get; set; }
|
||||
public string ImdbId { get; set; }
|
||||
public int SiteRating { get; set; }
|
||||
public Store.EpisodesModel[] Episodes { get; set; }
|
||||
}
|
||||
}
|
|
@ -124,7 +124,7 @@ namespace PlexRequests.UI.Modules
|
|||
Get["/notifyuser", true] = async (x, ct) => await GetUserNotificationSettings();
|
||||
|
||||
Get["/seasons"] = x => GetSeasons();
|
||||
Get["/episodes"] = x => GetEpisodes();
|
||||
Get["/episodes", true] = async (x, ct) => await GetEpisodes();
|
||||
}
|
||||
private TvMazeApi TvApi { get; }
|
||||
private IPlexApi PlexApi { get; }
|
||||
|
@ -356,6 +356,7 @@ namespace PlexRequests.UI.Modules
|
|||
var dbt = dbTv[tvdbid];
|
||||
|
||||
viewT.Requested = true;
|
||||
viewT.Episodes = dbt.Episodes;
|
||||
viewT.Approved = dbt.Approved;
|
||||
viewT.Available = dbt.Available;
|
||||
}
|
||||
|
@ -545,10 +546,11 @@ namespace PlexRequests.UI.Modules
|
|||
if (episodeModel != null)
|
||||
{
|
||||
episodeRequest = true;
|
||||
showId = episodeModel.ShowId;
|
||||
var s = await sonarrSettings;
|
||||
if (!s.Enabled)
|
||||
{
|
||||
return Response.AsJson("This is currently only supported with Sonarr");
|
||||
return Response.AsJson(new JsonResponseModel { Message = "This is currently only supported with Sonarr", Result = false });
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -924,12 +926,35 @@ namespace PlexRequests.UI.Modules
|
|||
return Response.AsJson(model);
|
||||
}
|
||||
|
||||
private Response GetEpisodes()
|
||||
private async Task<Response> GetEpisodes()
|
||||
{
|
||||
var allResults = await RequestService.GetAllAsync();
|
||||
var model = new List<EpisodeListViewModel>();
|
||||
var seriesId = (int)Request.Query.tvId;
|
||||
var enumerable = allResults as RequestedModel[] ?? allResults.ToArray();
|
||||
|
||||
var dbDbShow = enumerable.FirstOrDefault(x => x.Type == RequestType.TvShow && x.TvDbId == seriesId.ToString());
|
||||
var show = TvApi.ShowLookupByTheTvDbId(seriesId);
|
||||
var seasons = TvApi.EpisodeLookup(show.id);
|
||||
return Response.AsJson(seasons);
|
||||
|
||||
|
||||
foreach (var ep in seasons)
|
||||
{
|
||||
var requested = dbDbShow?.Episodes
|
||||
.Any(episodesModel =>
|
||||
ep.number == episodesModel.EpisodeNumber && ep.season == episodesModel.SeasonNumber);
|
||||
|
||||
model.Add(new EpisodeListViewModel
|
||||
{
|
||||
Id = show.id,
|
||||
SeasonNumber = ep.season,
|
||||
EpisodeNumber = ep.number,
|
||||
Requested = requested ?? false,
|
||||
Name = ep.name
|
||||
});
|
||||
}
|
||||
|
||||
return Response.AsJson(model);
|
||||
}
|
||||
|
||||
public async Task<bool> CheckRequestLimit(PlexRequestSettings s, RequestType type)
|
||||
|
|
|
@ -200,6 +200,7 @@
|
|||
<Compile Include="ModelDataProviders\UserUpdateViewModelDataProvider.cs" />
|
||||
<Compile Include="ModelDataProviders\RequestedModelDataProvider.cs" />
|
||||
<Compile Include="Models\DatatablesModel.cs" />
|
||||
<Compile Include="Models\EpisodeListViewModel.cs" />
|
||||
<Compile Include="Models\EpisodeRequestModel.cs" />
|
||||
<Compile Include="Models\IssuesDetailsViewModel.cs" />
|
||||
<Compile Include="Models\IssuesViewMOdel.cs" />
|
||||
|
|
|
@ -361,7 +361,11 @@
|
|||
<script id="episode-template" type="text/x-handlebars-template">
|
||||
<div class="form-group col-md-6">
|
||||
<div class="checkbox" style="margin-bottom:0px; margin-top:0px;">
|
||||
<input type="checkbox" class="selectedEpisodes" id="{{id}}" epNumber="{{number}}" epSeason="{{season}}" name="{{id}}"><label for="{{id}}">{{number}}. {{name}}</label>
|
||||
{{#if_eq requested true}}
|
||||
<input type="checkbox" checked="checked" disabled="disabled" class="selectedEpisodes" id="{{id}}" epNumber="{{number}}" epSeason="{{season}}" name="{{id}}"><label for="{{id}}">{{number}}. {{name}}</label>
|
||||
{{else}}
|
||||
<input type="checkbox" class="selectedEpisodes" id="{{id}}" epNumber="{{number}}" epSeason="{{season}}" name="{{id}}"><label for="{{id}}">{{number}}. {{name}}</label>
|
||||
{{/if_eq}}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue