open-source-mirrors
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add base tuner host

Browse Source
pull/702/head
Luke Pulverenti 9 years ago
parent e5aea2b622
commit 2c050d05f8
5 changed files with 119 additions and 103 deletions
Show Stats Download Patch File Download Diff File

5
MediaBrowser.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
Unescape View File

@ -348,6 +348,11 @@ namespace MediaBrowser.Server.Implementations.LiveTv.Listings
{ {
info.Genres = details.genres.Where(g => !string.IsNullOrWhiteSpace(g)).ToList(); info.Genres = details.genres.Where(g => !string.IsNullOrWhiteSpace(g)).ToList();
info.IsNews = details.genres.Contains("news", StringComparer.OrdinalIgnoreCase); info.IsNews = details.genres.Contains("news", StringComparer.OrdinalIgnoreCase);
if (info.Genres.Contains("children", StringComparer.OrdinalIgnoreCase))
{
info.IsKids = true;
}
} }
return info; return info;

97
MediaBrowser.Server.Implementations/LiveTv/TunerHosts/BaseTunerHost.cs
Unescape View File

@ -0,0 +1,97 @@
using MediaBrowser.Common.Configuration;
using MediaBrowser.Controller.LiveTv;
using MediaBrowser.Model.LiveTv;
using MediaBrowser.Model.Logging;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
{
public abstract class BaseTunerHost
{
protected readonly IConfigurationManager Config;
protected readonly ILogger Logger;
private readonly ConcurrentDictionary<string, ChannelCache> _channelCache =
new ConcurrentDictionary<string, ChannelCache>(StringComparer.OrdinalIgnoreCase);
public BaseTunerHost(IConfigurationManager config, ILogger logger)
{
Config = config;
Logger = logger;
}
protected abstract Task<IEnumerable<ChannelInfo>> GetChannelsInternal(TunerHostInfo tuner, CancellationToken cancellationToken);
public abstract string Type { get; }
public async Task<IEnumerable<ChannelInfo>> GetChannels(TunerHostInfo tuner, bool enableCache, CancellationToken cancellationToken)
{
ChannelCache cache = null;
if (enableCache && _channelCache.TryGetValue(tuner.Id, out cache))
{
if ((DateTime.UtcNow - cache.Date) < TimeSpan.FromMinutes(60))
{
return cache.Channels.ToList();
}
}
var result = await GetChannelsInternal(tuner, cancellationToken).ConfigureAwait(false);
cache = cache ?? new ChannelCache();
cache.Date = DateTime.UtcNow;
cache.Channels = result.ToList();
_channelCache.AddOrUpdate(tuner.Id, cache, (k, v) => cache);
return cache.Channels.ToList();
}
private List<TunerHostInfo> GetTunerHosts()
{
return GetConfiguration().TunerHosts
.Where(i => i.IsEnabled && string.Equals(i.Type, Type, StringComparison.OrdinalIgnoreCase))
.ToList();
}
public async Task<IEnumerable<ChannelInfo>> GetChannels(CancellationToken cancellationToken)
{
var list = new List<ChannelInfo>();
var hosts = GetTunerHosts();
foreach (var host in hosts)
{
try
{
var channels = await GetChannels(host, true, cancellationToken).ConfigureAwait(false);
var newChannels = channels.Where(i => !list.Any(l => string.Equals(i.Id, l.Id, StringComparison.OrdinalIgnoreCase))).ToList();
list.AddRange(newChannels);
}
catch (Exception ex)
{
Logger.ErrorException("Error getting channel list", ex);
}
}
return list;
}
protected LiveTvOptions GetConfiguration()
{
return Config.GetConfiguration<LiveTvOptions>("livetv");
}
private class ChannelCache
{
public DateTime Date;
public List<ChannelInfo> Channels;
}
}
}

60
MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
Unescape View File

@ -17,19 +17,15 @@ using System.Threading.Tasks;
namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
{ {
public class HdHomerunHost : ITunerHost public class HdHomerunHost : BaseTunerHost, ITunerHost
{ {
private readonly IHttpClient _httpClient; private readonly IHttpClient _httpClient;
private readonly ILogger _logger;
private readonly IJsonSerializer _jsonSerializer; private readonly IJsonSerializer _jsonSerializer;
private readonly IConfigurationManager _config;
public HdHomerunHost(IHttpClient httpClient, ILogger logger, IJsonSerializer jsonSerializer, IConfigurationManager config) public HdHomerunHost(IConfigurationManager config, ILogger logger, IHttpClient httpClient, IJsonSerializer jsonSerializer) : base(config, logger)
{ {
_httpClient = httpClient; _httpClient = httpClient;
_logger = logger;
_jsonSerializer = jsonSerializer; _jsonSerializer = jsonSerializer;
_config = config;
} }
public string Name public string Name
@ -37,7 +33,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
get { return "HD Homerun"; } get { return "HD Homerun"; }
} }
public string Type public override string Type
{ {
get { return DeviceType; } get { return DeviceType; }
} }
@ -49,46 +45,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
private const string ChannelIdPrefix = "hdhr_"; private const string ChannelIdPrefix = "hdhr_";
private List<TunerHostInfo> GetTunerHosts() protected override async Task<IEnumerable<ChannelInfo>> GetChannelsInternal(TunerHostInfo info, CancellationToken cancellationToken)
{
return GetConfiguration().TunerHosts
.Where(i => i.IsEnabled && string.Equals(i.Type, Type, StringComparison.OrdinalIgnoreCase))
.ToList();
}
public async Task<IEnumerable<ChannelInfo>> GetChannels(CancellationToken cancellationToken)
{
var list = new List<ChannelInfo>();
var hosts = GetTunerHosts();
var ipAddresses = new List<string>();
foreach (var host in hosts)
{
var ip = GetApiUrl(host, false);
if (ipAddresses.Contains(ip, StringComparer.OrdinalIgnoreCase))
{
continue;
}
try
{
list.AddRange(await GetChannels(host, cancellationToken).ConfigureAwait(false));
}
catch (Exception ex)
{
_logger.ErrorException("Error getting channel list", ex);
}
ipAddresses.Add(ip);
}
return list;
}
private async Task<IEnumerable<ChannelInfo>> GetChannels(TunerHostInfo info, CancellationToken cancellationToken)
{ {
var options = new HttpRequestOptions var options = new HttpRequestOptions
{ {
@ -198,7 +155,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.ErrorException("Error getting tuner info", ex); Logger.ErrorException("Error getting tuner info", ex);
} }
} }
@ -263,11 +220,6 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
public bool DRM { get; set; } public bool DRM { get; set; }
} }
private LiveTvOptions GetConfiguration()
{
return _config.GetConfiguration<LiveTvOptions>("livetv");
}
private MediaSourceInfo GetMediaSource(TunerHostInfo info, string channelId, string profile) private MediaSourceInfo GetMediaSource(TunerHostInfo info, string channelId, string profile)
{ {
int? width = null; int? width = null;
@ -425,7 +377,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
public async Task Validate(TunerHostInfo info) public async Task Validate(TunerHostInfo info)
{ {
await GetChannels(info, CancellationToken.None).ConfigureAwait(false); await GetChannels(info, false, CancellationToken.None).ConfigureAwait(false);
} }
} }
} }

59
MediaBrowser.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
Unescape View File

@ -15,59 +15,25 @@ using System.Threading.Tasks;
namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
{ {
public class M3UTunerHost : ITunerHost public class M3UTunerHost : BaseTunerHost, ITunerHost
{ {
public string Type public M3UTunerHost(IConfigurationManager config, ILogger logger) : base(config, logger)
{ {
get { return "m3u"; }
}
public string Name
{
get { return "M3U Tuner"; }
}
private readonly IConfigurationManager _config;
private readonly ILogger _logger;
public M3UTunerHost(IConfigurationManager config, ILogger logger)
{
_config = config;
_logger = logger;
} }
private List<TunerHostInfo> GetTunerHosts() public override string Type
{ {
return GetConfiguration().TunerHosts get { return "m3u"; }
.Where(i => i.IsEnabled && string.Equals(i.Type, Type, StringComparison.OrdinalIgnoreCase))
.ToList();
} }
public async Task<IEnumerable<ChannelInfo>> GetChannels(CancellationToken cancellationToken) public string Name
{
var list = new List<ChannelInfo>();
var urls = GetTunerHosts().Select(i => i.Url)
.Where(i => !string.IsNullOrWhiteSpace(i))
.Distinct(StringComparer.OrdinalIgnoreCase);
foreach (var url in urls)
{
try
{
list.AddRange(await GetChannels(url, cancellationToken).ConfigureAwait(false));
}
catch (Exception ex)
{ {
_logger.ErrorException("Error getting channel list", ex); get { return "M3U Tuner"; }
}
}
return list;
} }
private Task<IEnumerable<ChannelInfo>> GetChannels(string url, CancellationToken cancellationToken) protected override async Task<IEnumerable<ChannelInfo>> GetChannelsInternal(TunerHostInfo info, CancellationToken cancellationToken)
{ {
var url = info.Url;
var urlHash = url.GetMD5().ToString("N"); var urlHash = url.GetMD5().ToString("N");
int position = 0; int position = 0;
@ -135,7 +101,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
} }
} }
file.Close(); file.Close();
return Task.FromResult((IEnumerable<ChannelInfo>)channels); return channels;
} }
public Task<List<LiveTvTunerInfo>> GetTunerInfos(CancellationToken cancellationToken) public Task<List<LiveTvTunerInfo>> GetTunerInfos(CancellationToken cancellationToken)
@ -155,11 +121,6 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
return Task.FromResult(list); return Task.FromResult(list);
} }
private LiveTvOptions GetConfiguration()
{
return _config.GetConfiguration<LiveTvOptions>("livetv");
}
public async Task<MediaSourceInfo> GetChannelStream(TunerHostInfo info, string channelId, string streamId, CancellationToken cancellationToken) public async Task<MediaSourceInfo> GetChannelStream(TunerHostInfo info, string channelId, string streamId, CancellationToken cancellationToken)
{ {
var urlHash = info.Url.GetMD5().ToString("N"); var urlHash = info.Url.GetMD5().ToString("N");
@ -170,7 +131,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
channelId = channelId.Substring(urlHash.Length); channelId = channelId.Substring(urlHash.Length);
var channels = await GetChannels(info.Url, cancellationToken).ConfigureAwait(false); var channels = await GetChannels(info, true, cancellationToken).ConfigureAwait(false);
var m3uchannels = channels.Cast<M3UChannel>(); var m3uchannels = channels.Cast<M3UChannel>();
var channel = m3uchannels.FirstOrDefault(c => c.Id == channelId); var channel = m3uchannels.FirstOrDefault(c => c.Id == channelId);
if (channel != null) if (channel != null)

1
MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
Unescape View File

@ -231,6 +231,7 @@
<Compile Include="LiveTv\LiveTvDtoService.cs" /> <Compile Include="LiveTv\LiveTvDtoService.cs" />
<Compile Include="LiveTv\LiveTvManager.cs" /> <Compile Include="LiveTv\LiveTvManager.cs" />
<Compile Include="LiveTv\LiveTvMediaSourceProvider.cs" /> <Compile Include="LiveTv\LiveTvMediaSourceProvider.cs" />
<Compile Include="LiveTv\TunerHosts\BaseTunerHost.cs" />
<Compile Include="LiveTv\TunerHosts\HdHomerun\HdHomerunHost.cs" /> <Compile Include="LiveTv\TunerHosts\HdHomerun\HdHomerunHost.cs" />
<Compile Include="LiveTv\TunerHosts\HdHomerun\HdHomerunDiscovery.cs" /> <Compile Include="LiveTv\TunerHosts\HdHomerun\HdHomerunDiscovery.cs" />
<Compile Include="LiveTv\TunerHosts\M3UTunerHost.cs" /> <Compile Include="LiveTv\TunerHosts\M3UTunerHost.cs" />

Write Preview
Loading…
Cancel
Save