Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2544 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2017-03-25 18:09:16 -04:00 committed by GitHub
commit a4b3a049ce
4 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
View File

@ -442,6 +442,11 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
{ {
result = await provider.GetChannels(info, cancellationToken).ConfigureAwait(false); result = await provider.GetChannels(info, cancellationToken).ConfigureAwait(false);
foreach (var channel in result)
{
_logger.Info("Found epg channel in {0} {1} {2} {3}", provider.Name, info.ListingsId, channel.Name, channel.Id);
}
_epgChannels.AddOrUpdate(info.Id, result, (k, v) => result); _epgChannels.AddOrUpdate(info.Id, result, (k, v) => result);
} }
@ -1018,6 +1023,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
if (epgChannel == null) if (epgChannel == null)
{ {
_logger.Debug("EPG channel not found for tuner channel {0}-{1} from {2}-{3}", channel.Number, channel.Name, provider.Item1.Name, provider.Item2.ListingsId ?? string.Empty);
programs = new List<ProgramInfo>(); programs = new List<ProgramInfo>();
} }
else else

5
Emby.Server.Implementations/LiveTv/TunerHosts/M3uParser.cs
View File

@ -144,6 +144,11 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
channel.TunerChannelId = string.IsNullOrWhiteSpace(tvgId) ? channelId : tvgId; channel.TunerChannelId = string.IsNullOrWhiteSpace(tvgId) ? channelId : tvgId;
if (!string.IsNullOrWhiteSpace(channel.TunerChannelId) && channel.TunerChannelId.IndexOf(".json.schedulesdirect.org", StringComparison.OrdinalIgnoreCase) != -1)
{
channel.TunerChannelId = channel.TunerChannelId.Replace(".json.schedulesdirect.org", string.Empty, StringComparison.OrdinalIgnoreCase).TrimStart('I');
}
var channelIdValues = new List<string>(); var channelIdValues = new List<string>();
if (!string.IsNullOrWhiteSpace(channelId)) if (!string.IsNullOrWhiteSpace(channelId))
{ {

3
MediaBrowser.Api/Playback/Progressive/BaseProgressiveStreamingService.cs
View File

@ -295,7 +295,8 @@ namespace MediaBrowser.Api.Playback.Progressive
responseHeaders["Accept-Ranges"] = "none"; responseHeaders["Accept-Ranges"] = "none";
} }
if (response.ContentLength.HasValue) // Seeing cases of -1 here
if (response.ContentLength.HasValue && response.ContentLength.Value >= 0)
{ {
responseHeaders["Content-Length"] = response.ContentLength.Value.ToString(UsCulture); responseHeaders["Content-Length"] = response.ContentLength.Value.ToString(UsCulture);
} }

2
SharedVersion.cs
View File

@ -1,3 +1,3 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("3.2.8.11")] [assembly: AssemblyVersion("3.2.8.12")]