Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-08 23:00:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

add slideshows to now playing page

Browse source
This commit is contained in:
Luke Pulverenti 2015-08-21 01:00:56 -04:00
parent 920b57d9d1
commit 918aa4cfd7
2 changed files with 22 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
View file

@ -1,9 +1,11 @@
using MediaBrowser.Common;
using System.Net;
using MediaBrowser.Common;
using MediaBrowser.Common.Net;
using MediaBrowser.Controller.LiveTv;
using MediaBrowser.Model.Dto;
using MediaBrowser.Model.LiveTv;
using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Net;
using MediaBrowser.Model.Serialization;
using System;
using System.Collections.Concurrent;
@ -620,11 +622,24 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
options.RequestHeaders["token"] = token;
using (var response = await _httpClient.Get(options).ConfigureAwait(false))
try
{
var root = _jsonSerializer.DeserializeFromStream<ScheduleDirect.Lineups>(response);
using (var response = await _httpClient.Get(options).ConfigureAwait(false))
{
var root = _jsonSerializer.DeserializeFromStream<ScheduleDirect.Lineups>(response);
return root.lineups.Any(i => string.Equals(info.ListingsId, i.lineup, StringComparison.OrdinalIgnoreCase));
return root.lineups.Any(i => string.Equals(info.ListingsId, i.lineup, StringComparison.OrdinalIgnoreCase));
}
}
catch (HttpException ex)
{
// Apparently we're supposed to swallow this
if (ex.StatusCode.HasValue && ex.StatusCode.Value == HttpStatusCode.BadRequest)
{
return false;
}
throw;
}
}

3
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View file

@ -261,6 +261,9 @@
<Content Include="dashboard-ui\scripts\sharingwidget.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\scripts\slideshow.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\scripts\wizardlivetvtuner.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>