mirror of
https://github.com/Ombi-app/Ombi.git
synced 2025-08-14 02:26:55 -07:00
frontend and tv episodes api work for #254
This commit is contained in:
tidusjar
parent
d7c40164cb
commit
33ba1db20b
12 changed files with 433 additions and 210 deletions
4
PlexRequests.UI/Content/base.css
vendored
4
PlexRequests.UI/Content/base.css
vendored
|
|
@ -329,3 +329,7 @@ label {
|
|||
.landing-title {
|
||||
font-weight: bold; }
|
||||
|
||||
.checkbox-custom {
|
||||
margin-top: 0 !important;
|
||||
margin-bottom: 0 !important; }
|
||||
|
||||
|
|
|
|||
2
PlexRequests.UI/Content/base.min.css
vendored
2
PlexRequests.UI/Content/base.min.css
vendored
File diff suppressed because one or more lines are too long
|
|
@ -384,7 +384,7 @@ $border-radius: 10px;
|
|||
|
||||
.bootstrap-datetimepicker-widget table td.active,
|
||||
.bootstrap-datetimepicker-widget table td.active:hover {
|
||||
color: #fff !important;
|
||||
color: #fff $i;
|
||||
}
|
||||
|
||||
.landing-header {
|
||||
|
|
@ -393,7 +393,7 @@ $border-radius: 10px;
|
|||
}
|
||||
|
||||
.landing-block {
|
||||
background: #2f2f2f !important;
|
||||
background: #2f2f2f $i;
|
||||
padding: 5px;
|
||||
}
|
||||
|
||||
|
|
@ -415,3 +415,8 @@ $border-radius: 10px;
|
|||
.landing-title {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.checkbox-custom{
|
||||
margin-top:0 $i;
|
||||
margin-bottom:0 $i;
|
||||
}
|
||||
|
|
@ -12,9 +12,14 @@ $(function () {
|
|||
var searchSource = $("#search-template").html();
|
||||
var seasonsSource = $("#seasons-template").html();
|
||||
var musicSource = $("#music-template").html();
|
||||
var seasonsNumberSource = $("#seasonNumber-template").html();
|
||||
var episodeSource = $("#episode-template").html();
|
||||
|
||||
var searchTemplate = Handlebars.compile(searchSource);
|
||||
var musicTemplate = Handlebars.compile(musicSource);
|
||||
var seasonsTemplate = Handlebars.compile(seasonsSource);
|
||||
var seasonsNumberTemplate = Handlebars.compile(seasonsNumberSource);
|
||||
var episodesTemplate = Handlebars.compile(episodeSource);
|
||||
|
||||
var base = $('#baseUrl').text();
|
||||
|
||||
|
|
@ -256,6 +261,7 @@ $(function () {
|
|||
$('#typeModal').val(type);
|
||||
});
|
||||
|
||||
|
||||
function focusSearch($content) {
|
||||
if ($content.length > 0) {
|
||||
$('input[type=text].form-control', $content).first().focus();
|
||||
|
|
@ -531,4 +537,71 @@ $(function () {
|
|||
|
||||
});
|
||||
|
||||
$('#episodesModal').on('show.bs.modal', function (event) {
|
||||
var button = $(event.relatedTarget); // Button that triggered the modal
|
||||
var id = button.data('identifier'); // Extract info from data-* attributes
|
||||
var url = createBaseUrl(base, '/search/episodes/');
|
||||
var seenSeasons = [];
|
||||
$.ajax({
|
||||
type: "get",
|
||||
url: url,
|
||||
data: { tvId: id },
|
||||
dataType: "json",
|
||||
success: function (results) {
|
||||
var $content = $("#episodesBody");
|
||||
$content.html("");
|
||||
$('#selectedEpisodeId').val(id);
|
||||
results.forEach(function (result) {
|
||||
|
||||
|
||||
var episodes = buildEpisodesView(result);
|
||||
|
||||
if (!seenSeasons.find(x => x === episodes.season)) {
|
||||
// Create the seasons heading
|
||||
seenSeasons.push(episodes.season);
|
||||
var context = buildSeasonsCount(result);
|
||||
$content.append(seasonsNumberTemplate(context));
|
||||
}
|
||||
var episodesResult = episodesTemplate(episodes);
|
||||
$content.append(episodesResult);
|
||||
});
|
||||
},
|
||||
error: function (e) {
|
||||
console.log(e);
|
||||
generateNotify("Something went wrong!", "danger");
|
||||
}
|
||||
});
|
||||
|
||||
function buildSeasonsContext(result) {
|
||||
var context = {
|
||||
id: result
|
||||
};
|
||||
return context;
|
||||
};
|
||||
|
||||
function buildSeasonsCount(result) {
|
||||
return {
|
||||
seasonNumber: result.season
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
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
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
});
|
||||
|
|
|
|||
|
|
@ -100,6 +100,7 @@ namespace PlexRequests.UI.Modules
|
|||
IssueService = issue;
|
||||
Analytics = a;
|
||||
RequestLimitRepo = rl;
|
||||
TvApi = new TvMazeApi();
|
||||
|
||||
|
||||
Get["SearchIndex","/", true] = async (x, ct) => await RequestLoad();
|
||||
|
|
@ -120,7 +121,9 @@ namespace PlexRequests.UI.Modules
|
|||
Get["/notifyuser", true] = async (x, ct) => await GetUserNotificationSettings();
|
||||
|
||||
Get["/seasons"] = x => GetSeasons();
|
||||
Get["/episodes"] = x => GetEpisodes();
|
||||
}
|
||||
private TvMazeApi TvApi { get; }
|
||||
private IPlexApi PlexApi { get; }
|
||||
private TheMovieDbApi MovieApi { get; }
|
||||
private INotificationService NotificationService { get; }
|
||||
|
|
@ -854,14 +857,21 @@ namespace PlexRequests.UI.Modules
|
|||
|
||||
private Response GetSeasons()
|
||||
{
|
||||
var tv = new TvMazeApi();
|
||||
var seriesId = (int)Request.Query.tvId;
|
||||
var show = tv.ShowLookupByTheTvDbId(seriesId);
|
||||
var seasons = tv.GetSeasons(show.id);
|
||||
var show = TvApi.ShowLookupByTheTvDbId(seriesId);
|
||||
var seasons = TvApi.GetSeasons(show.id);
|
||||
var model = seasons.Select(x => x.number);
|
||||
return Response.AsJson(model);
|
||||
}
|
||||
|
||||
private Response GetEpisodes()
|
||||
{
|
||||
var seriesId = (int)Request.Query.tvId;
|
||||
var show = TvApi.ShowLookupByTheTvDbId(seriesId);
|
||||
var seasons = TvApi.EpisodeLookup(show.id);
|
||||
return Response.AsJson(seasons);
|
||||
}
|
||||
|
||||
private async Task<bool> CheckRequestLimit(PlexRequestSettings s, RequestType type)
|
||||
{
|
||||
if (IsAdmin)
|
||||
|
|
|
|||
9
PlexRequests.UI/Resources/UI.Designer.cs
generated
9
PlexRequests.UI/Resources/UI.Designer.cs
generated
|
|
@ -888,6 +888,15 @@ namespace PlexRequests.UI.Resources {
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Select Episode.
|
||||
/// </summary>
|
||||
public static string Search_SelectEpisode {
|
||||
get {
|
||||
return ResourceManager.GetString("Search_SelectEpisode", resourceCulture);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Looks up a localized string similar to Select .
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -431,4 +431,7 @@
|
|||
<data name="Layout_French" xml:space="preserve">
|
||||
<value>French</value>
|
||||
</data>
|
||||
<data name="Search_SelectEpisode" xml:space="preserve">
|
||||
<value>Select Episode</value>
|
||||
</data>
|
||||
</root>
|
||||
|
|
@ -192,6 +192,7 @@
|
|||
<li><a id="{{id}}" season-select="1" class="dropdownTv" href="#">@UI.Search_FirstSeason</a></li>
|
||||
<li><a id="{{id}}" season-select="2" class="dropdownTv" href="#">@UI.Search_LatestSeason</a></li>
|
||||
<li><a id="SeasonSelect" data-identifier="{{id}}" data-toggle="modal" data-target="#seasonsModal" href="#">@UI.Search_SelectSeason...</a></li>
|
||||
<li><a id="EpisodeSelect" data-identifier="{{id}}" data-toggle="modal" data-target="#episodesModal" href="#">@UI.Search_SelectEpisode...</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
{{/if_eq}}
|
||||
|
|
@ -291,6 +292,26 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div class="modal fade" id="episodesModal">
|
||||
<div class="modal-dialog modal-lg">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header">
|
||||
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
|
||||
<h4 class="modal-title">@UI.Search_Modal_SeasonsTitle</h4>
|
||||
</div>
|
||||
<div class="modal-body" id="episodesBody">
|
||||
|
||||
</div>
|
||||
|
||||
<div hidden="hidden" id="selectedEpisodeId"></div>
|
||||
<div class="modal-footer">
|
||||
<button type="button" class="btn btn-default" data-dismiss="modal">@UI.Common_Close</button>
|
||||
<button type="button" id="episodesRequest" class="btn btn-primary">@UI.Search_Request</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<div class="modal fade" id="issuesModal">
|
||||
<div class="modal-dialog">
|
||||
|
|
@ -321,6 +342,24 @@
|
|||
<input type="checkbox" class="selectedSeasons" id="{{id}}" name="{{id}}"><label for="{{id}}">@UI.Search_Season {{id}}</label>
|
||||
</div>
|
||||
</div>
|
||||
</script>
|
||||
|
||||
<script id="seasonNumber-template" type="text/x-handlebars-template">
|
||||
<div class="row"></div>
|
||||
<div id="seasonNumber{{seasonNumber}}">
|
||||
<strong>@UI.Search_Season {{seasonNumber}}</strong>
|
||||
</div>
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
|
||||
<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}}" name="{{id}}"><label for="{{id}}">{{number}}. {{name}}</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</script>
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue