lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1520 from MediaBrowser/beta

Browse Source 
Beta
This commit is contained in:
Luke 2016-03-03 01:38:16 -05:00
commit 010ce1bb79
7 changed files with 350 additions and 320 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
MediaBrowser.Model/Configuration/ServerConfiguration.cs
View File

@ -206,6 +206,8 @@ namespace MediaBrowser.Model.Configuration
public bool DownloadImagesInAdvance { get; set; } public bool DownloadImagesInAdvance { get; set; }
public bool EnableAnonymousUsageReporting { get; set; }
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="ServerConfiguration" /> class. /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
/// </summary> /// </summary>
@ -221,6 +223,7 @@ namespace MediaBrowser.Model.Configuration
EnableHttps = false; EnableHttps = false;
EnableDashboardResponseCaching = true; EnableDashboardResponseCaching = true;
EnableDashboardResourceMinification = true; EnableDashboardResourceMinification = true;
EnableAnonymousUsageReporting = true;
EnableAutomaticRestart = true; EnableAutomaticRestart = true;
DenyIFrameEmbedding = true; DenyIFrameEmbedding = true;

17
MediaBrowser.Server.Implementations/EntryPoints/UsageEntryPoint.cs
View File

@ -10,6 +10,7 @@ using System.Collections.Concurrent;
using System.Collections.Generic; using System.Collections.Generic;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using MediaBrowser.Controller.Configuration;
namespace MediaBrowser.Server.Implementations.EntryPoints namespace MediaBrowser.Server.Implementations.EntryPoints
{ {
@ -23,18 +24,18 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
private readonly ILogger _logger; private readonly ILogger _logger;
private readonly ISessionManager _sessionManager; private readonly ISessionManager _sessionManager;
private readonly IUserManager _userManager; private readonly IUserManager _userManager;
private readonly IServerConfigurationManager _config;
private readonly TimeSpan _frequency = TimeSpan.FromHours(24);
private readonly ConcurrentDictionary<Guid, ClientInfo> _apps = new ConcurrentDictionary<Guid, ClientInfo>(); private readonly ConcurrentDictionary<Guid, ClientInfo> _apps = new ConcurrentDictionary<Guid, ClientInfo>();
public UsageEntryPoint(ILogger logger, IApplicationHost applicationHost, IHttpClient httpClient, ISessionManager sessionManager, IUserManager userManager) public UsageEntryPoint(ILogger logger, IApplicationHost applicationHost, IHttpClient httpClient, ISessionManager sessionManager, IUserManager userManager, IServerConfigurationManager config)
{ {
_logger = logger; _logger = logger;
_applicationHost = applicationHost; _applicationHost = applicationHost;
_httpClient = httpClient; _httpClient = httpClient;
_sessionManager = sessionManager; _sessionManager = sessionManager;
_userManager = userManager; _userManager = userManager;
_config = config;
_sessionManager.SessionStarted += _sessionManager_SessionStarted; _sessionManager.SessionStarted += _sessionManager_SessionStarted;
} }
@ -64,6 +65,11 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
private async void ReportNewSession(ClientInfo client) private async void ReportNewSession(ClientInfo client)
{ {
if (!_config.Configuration.EnableAnonymousUsageReporting)
{
return;
}
try try
{ {
await new UsageReporter(_applicationHost, _httpClient, _userManager, _logger) await new UsageReporter(_applicationHost, _httpClient, _userManager, _logger)
@ -106,6 +112,11 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
/// </summary> /// </summary>
private async void OnTimerFired() private async void OnTimerFired()
{ {
if (!_config.Configuration.EnableAnonymousUsageReporting)
{
return;
}
try try
{ {
await new UsageReporter(_applicationHost, _httpClient, _userManager, _logger) await new UsageReporter(_applicationHost, _httpClient, _userManager, _logger)

16
MediaBrowser.Server.Implementations/EntryPoints/UsageReporter.cs
View File

@ -8,6 +8,7 @@ using System.Globalization;
using System.Linq; using System.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Model.Logging; using MediaBrowser.Model.Logging;
namespace MediaBrowser.Server.Implementations.EntryPoints namespace MediaBrowser.Server.Implementations.EntryPoints
@ -51,6 +52,10 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
data["plugins"] = string.Join(",", _applicationHost.Plugins.Select(i => i.Id).ToArray()); data["plugins"] = string.Join(",", _applicationHost.Plugins.Select(i => i.Id).ToArray());
var logErrors = false;
#if DEBUG
logErrors = true;
#endif
var options = new HttpRequestOptions var options = new HttpRequestOptions
{ {
Url = MbAdminUrl + "service/registration/ping", Url = MbAdminUrl + "service/registration/ping",
@ -59,7 +64,8 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
// Seeing block length errors // Seeing block length errors
EnableHttpCompression = false, EnableHttpCompression = false,
LogRequest = false LogRequest = false,
LogErrors = logErrors
}; };
options.SetPostData(data); options.SetPostData(data);
@ -95,6 +101,11 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
{ "platform", app.DeviceName }, { "platform", app.DeviceName },
}; };
var logErrors = false;
#if DEBUG
logErrors = true;
#endif
var options = new HttpRequestOptions var options = new HttpRequestOptions
{ {
Url = MbAdminUrl + "service/registration/ping", Url = MbAdminUrl + "service/registration/ping",
@ -103,7 +114,8 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
// Seeing block length errors // Seeing block length errors
EnableHttpCompression = false, EnableHttpCompression = false,
LogRequest = false LogRequest = false,
LogErrors = logErrors
}; };
options.SetPostData(data); options.SetPostData(data);

4
MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
View File

@ -920,6 +920,10 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
{ {
if (recording.IsSeries) if (recording.IsSeries)
{ {
// this is to account for the library monitor holding a lock for additional time after the change is complete.
// ideally this shouldn't be hard-coded
await Task.Delay(30000).ConfigureAwait(false);
try try
{ {
var organize = new EpisodeFileOrganizer(_organizationService, _config, _fileSystem, _logger, _libraryManager, _libraryMonitor, _providerManager); var organize = new EpisodeFileOrganizer(_organizationService, _config, _fileSystem, _logger, _libraryManager, _libraryMonitor, _providerManager);

378
MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpDiscovery.cs
View File

@ -21,225 +21,225 @@ using MediaBrowser.Model.Serialization;
namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.SatIp namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.SatIp
{ {
public class SatIpDiscovery : IServerEntryPoint //public class SatIpDiscovery : IServerEntryPoint
{ //{
private readonly IDeviceDiscovery _deviceDiscovery; // private readonly IDeviceDiscovery _deviceDiscovery;
private readonly IServerConfigurationManager _config; // private readonly IServerConfigurationManager _config;
private readonly ILogger _logger; // private readonly ILogger _logger;
private readonly ILiveTvManager _liveTvManager; // private readonly ILiveTvManager _liveTvManager;
private readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1); // private readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
private readonly IHttpClient _httpClient; // private readonly IHttpClient _httpClient;
private readonly IJsonSerializer _json; // private readonly IJsonSerializer _json;
public static SatIpDiscovery Current; // public static SatIpDiscovery Current;
private readonly List<TunerHostInfo> _discoveredHosts = new List<TunerHostInfo>(); // private readonly List<TunerHostInfo> _discoveredHosts = new List<TunerHostInfo>();
public List<TunerHostInfo> DiscoveredHosts // public List<TunerHostInfo> DiscoveredHosts
{ // {
get { return _discoveredHosts.ToList(); } // get { return _discoveredHosts.ToList(); }
} // }
public SatIpDiscovery(IDeviceDiscovery deviceDiscovery, IServerConfigurationManager config, ILogger logger, ILiveTvManager liveTvManager, IHttpClient httpClient, IJsonSerializer json) // public SatIpDiscovery(IDeviceDiscovery deviceDiscovery, IServerConfigurationManager config, ILogger logger, ILiveTvManager liveTvManager, IHttpClient httpClient, IJsonSerializer json)
{ // {
_deviceDiscovery = deviceDiscovery; // _deviceDiscovery = deviceDiscovery;
_config = config; // _config = config;
_logger = logger; // _logger = logger;
_liveTvManager = liveTvManager; // _liveTvManager = liveTvManager;
_httpClient = httpClient; // _httpClient = httpClient;
_json = json; // _json = json;
Current = this; // Current = this;
} // }
public void Run() // public void Run()
{ // {
_deviceDiscovery.DeviceDiscovered += _deviceDiscovery_DeviceDiscovered; // _deviceDiscovery.DeviceDiscovered += _deviceDiscovery_DeviceDiscovered;
} // }
void _deviceDiscovery_DeviceDiscovered(object sender, SsdpMessageEventArgs e) // void _deviceDiscovery_DeviceDiscovered(object sender, SsdpMessageEventArgs e)
{ // {
string st = null; // string st = null;
string nt = null; // string nt = null;
e.Headers.TryGetValue("ST", out st); // e.Headers.TryGetValue("ST", out st);
e.Headers.TryGetValue("NT", out nt); // e.Headers.TryGetValue("NT", out nt);
if (string.Equals(st, "urn:ses-com:device:SatIPServer:1", StringComparison.OrdinalIgnoreCase) || // if (string.Equals(st, "urn:ses-com:device:SatIPServer:1", StringComparison.OrdinalIgnoreCase) ||
string.Equals(nt, "urn:ses-com:device:SatIPServer:1", StringComparison.OrdinalIgnoreCase)) // string.Equals(nt, "urn:ses-com:device:SatIPServer:1", StringComparison.OrdinalIgnoreCase))
{ // {
string location; // string location;
if (e.Headers.TryGetValue("Location", out location) && !string.IsNullOrWhiteSpace(location)) // if (e.Headers.TryGetValue("Location", out location) && !string.IsNullOrWhiteSpace(location))
{ // {
_logger.Debug("SAT IP found at {0}", location); // _logger.Debug("SAT IP found at {0}", location);
// Just get the beginning of the url // // Just get the beginning of the url
AddDevice(location); // AddDevice(location);
} // }
} // }
} // }
private async void AddDevice(string location) // private async void AddDevice(string location)
{ // {
await _semaphore.WaitAsync().ConfigureAwait(false); // await _semaphore.WaitAsync().ConfigureAwait(false);
try // try
{ // {
if (_discoveredHosts.Any(i => string.Equals(i.Type, SatIpHost.DeviceType, StringComparison.OrdinalIgnoreCase) && string.Equals(location, i.Url, StringComparison.OrdinalIgnoreCase))) // if (_discoveredHosts.Any(i => string.Equals(i.Type, SatIpHost.DeviceType, StringComparison.OrdinalIgnoreCase) && string.Equals(location, i.Url, StringComparison.OrdinalIgnoreCase)))
{ // {
return; // return;
} // }
_logger.Debug("Will attempt to add SAT device {0}", location); // _logger.Debug("Will attempt to add SAT device {0}", location);
var info = await GetInfo(location, CancellationToken.None).ConfigureAwait(false); // var info = await GetInfo(location, CancellationToken.None).ConfigureAwait(false);
_discoveredHosts.Add(info); // _discoveredHosts.Add(info);
} // }
catch (OperationCanceledException) // catch (OperationCanceledException)
{ // {
} // }
catch (NotImplementedException) // catch (NotImplementedException)
{ // {
} // }
catch (Exception ex) // catch (Exception ex)
{ // {
_logger.ErrorException("Error saving device", ex); // _logger.ErrorException("Error saving device", ex);
} // }
finally // finally
{ // {
_semaphore.Release(); // _semaphore.Release();
} // }
} // }
public void Dispose() // public void Dispose()
{ // {
} // }
public async Task<SatIpTunerHostInfo> GetInfo(string url, CancellationToken cancellationToken) // public async Task<SatIpTunerHostInfo> GetInfo(string url, CancellationToken cancellationToken)
{ // {
var result = new SatIpTunerHostInfo // var result = new SatIpTunerHostInfo
{ // {
Url = url, // Url = url,
IsEnabled = true, // IsEnabled = true,
Type = SatIpHost.DeviceType, // Type = SatIpHost.DeviceType,
Tuners = 1, // Tuners = 1,
TunersAvailable = 1 // TunersAvailable = 1
}; // };
using (var stream = await _httpClient.Get(url, cancellationToken).ConfigureAwait(false)) // using (var stream = await _httpClient.Get(url, cancellationToken).ConfigureAwait(false))
{ // {
using (var streamReader = new StreamReader(stream)) // using (var streamReader = new StreamReader(stream))
{ // {
// Use XmlReader for best performance // // Use XmlReader for best performance
using (var reader = XmlReader.Create(streamReader)) // using (var reader = XmlReader.Create(streamReader))
{ // {
reader.MoveToContent(); // reader.MoveToContent();
// Loop through each element // // Loop through each element
while (reader.Read()) // while (reader.Read())
{ // {
if (reader.NodeType == XmlNodeType.Element) // if (reader.NodeType == XmlNodeType.Element)
{ // {
switch (reader.Name) // switch (reader.Name)
{ // {
case "device": // case "device":
using (var subtree = reader.ReadSubtree()) // using (var subtree = reader.ReadSubtree())
{ // {
FillFromDeviceNode(result, subtree); // FillFromDeviceNode(result, subtree);
} // }
break; // break;
default: // default:
reader.Skip(); // reader.Skip();
break; // break;
} // }
} // }
} // }
} // }
} // }
} // }
if (string.IsNullOrWhiteSpace(result.Id)) // if (string.IsNullOrWhiteSpace(result.Id))
{ // {
throw new NotImplementedException(); // throw new NotImplementedException();
} // }
// Device hasn't implemented an m3u list // // Device hasn't implemented an m3u list
if (string.IsNullOrWhiteSpace(result.M3UUrl)) // if (string.IsNullOrWhiteSpace(result.M3UUrl))
{ // {
result.IsEnabled = false; // result.IsEnabled = false;
} // }
else if (!result.M3UUrl.StartsWith("http", StringComparison.OrdinalIgnoreCase)) // else if (!result.M3UUrl.StartsWith("http", StringComparison.OrdinalIgnoreCase))
{ // {
var fullM3uUrl = url.Substring(0, url.LastIndexOf('/')); // var fullM3uUrl = url.Substring(0, url.LastIndexOf('/'));
result.M3UUrl = fullM3uUrl + "/" + result.M3UUrl.TrimStart('/'); // result.M3UUrl = fullM3uUrl + "/" + result.M3UUrl.TrimStart('/');
} // }
_logger.Debug("SAT device result: {0}", _json.SerializeToString(result)); // _logger.Debug("SAT device result: {0}", _json.SerializeToString(result));
return result; // return result;
} // }
private void FillFromDeviceNode(SatIpTunerHostInfo info, XmlReader reader) // private void FillFromDeviceNode(SatIpTunerHostInfo info, XmlReader reader)
{ // {
reader.MoveToContent(); // reader.MoveToContent();
while (reader.Read()) // while (reader.Read())
{ // {
if (reader.NodeType == XmlNodeType.Element) // if (reader.NodeType == XmlNodeType.Element)
{ // {
switch (reader.LocalName) // switch (reader.LocalName)
{ // {
case "UDN": // case "UDN":
{ // {
info.Id = reader.ReadElementContentAsString(); // info.Id = reader.ReadElementContentAsString();
break; // break;
} // }
case "friendlyName": // case "friendlyName":
{ // {
info.FriendlyName = reader.ReadElementContentAsString(); // info.FriendlyName = reader.ReadElementContentAsString();
break; // break;
} // }
case "satip:X_SATIPCAP": // case "satip:X_SATIPCAP":
case "X_SATIPCAP": // case "X_SATIPCAP":
{ // {
// <satip:X_SATIPCAP xmlns:satip="urn:ses-com:satip">DVBS2-2</satip:X_SATIPCAP> // // <satip:X_SATIPCAP xmlns:satip="urn:ses-com:satip">DVBS2-2</satip:X_SATIPCAP>
var value = reader.ReadElementContentAsString() ?? string.Empty; // var value = reader.ReadElementContentAsString() ?? string.Empty;
var parts = value.Split(new[] { '-' }, StringSplitOptions.RemoveEmptyEntries); // var parts = value.Split(new[] { '-' }, StringSplitOptions.RemoveEmptyEntries);
if (parts.Length == 2) // if (parts.Length == 2)
{ // {
int intValue; // int intValue;
if (int.TryParse(parts[1], NumberStyles.Any, CultureInfo.InvariantCulture, out intValue)) // if (int.TryParse(parts[1], NumberStyles.Any, CultureInfo.InvariantCulture, out intValue))
{ // {
info.TunersAvailable = intValue; // info.TunersAvailable = intValue;
} // }
if (int.TryParse(parts[0].Substring(parts[0].Length - 1), NumberStyles.Any, CultureInfo.InvariantCulture, out intValue)) // if (int.TryParse(parts[0].Substring(parts[0].Length - 1), NumberStyles.Any, CultureInfo.InvariantCulture, out intValue))
{ // {
info.Tuners = intValue; // info.Tuners = intValue;
} // }
} // }
break; // break;
} // }
case "satip:X_SATIPM3U": // case "satip:X_SATIPM3U":
case "X_SATIPM3U": // case "X_SATIPM3U":
{ // {
// <satip:X_SATIPM3U xmlns:satip="urn:ses-com:satip">/channellist.lua?select=m3u</satip:X_SATIPM3U> // // <satip:X_SATIPM3U xmlns:satip="urn:ses-com:satip">/channellist.lua?select=m3u</satip:X_SATIPM3U>
info.M3UUrl = reader.ReadElementContentAsString(); // info.M3UUrl = reader.ReadElementContentAsString();
break; // break;
} // }
default: // default:
reader.Skip(); // reader.Skip();
break; // break;
} // }
} // }
} // }
} // }
} //}
public class SatIpTunerHostInfo : TunerHostInfo public class SatIpTunerHostInfo : TunerHostInfo
{ {

250
MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpHost.cs
View File

@ -19,153 +19,153 @@ using MediaBrowser.Model.Serialization;
namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.SatIp namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.SatIp
{ {
public class SatIpHost : BaseTunerHost, ITunerHost //public class SatIpHost : BaseTunerHost, ITunerHost
{ //{
private readonly IFileSystem _fileSystem; // private readonly IFileSystem _fileSystem;
private readonly IHttpClient _httpClient; // private readonly IHttpClient _httpClient;
public SatIpHost(IConfigurationManager config, ILogger logger, IJsonSerializer jsonSerializer, IMediaEncoder mediaEncoder, IFileSystem fileSystem, IHttpClient httpClient) // public SatIpHost(IConfigurationManager config, ILogger logger, IJsonSerializer jsonSerializer, IMediaEncoder mediaEncoder, IFileSystem fileSystem, IHttpClient httpClient)
: base(config, logger, jsonSerializer, mediaEncoder) // : base(config, logger, jsonSerializer, mediaEncoder)
{ // {
_fileSystem = fileSystem; // _fileSystem = fileSystem;
_httpClient = httpClient; // _httpClient = httpClient;
} // }
private const string ChannelIdPrefix = "sat_"; // private const string ChannelIdPrefix = "sat_";
protected override async Task<IEnumerable<ChannelInfo>> GetChannelsInternal(TunerHostInfo tuner, CancellationToken cancellationToken) // protected override async Task<IEnumerable<ChannelInfo>> GetChannelsInternal(TunerHostInfo tuner, CancellationToken cancellationToken)
{ // {
var satInfo = (SatIpTunerHostInfo) tuner; // var satInfo = (SatIpTunerHostInfo) tuner;
return await new M3uParser(Logger, _fileSystem, _httpClient).Parse(satInfo.M3UUrl, ChannelIdPrefix, tuner.Id, cancellationToken).ConfigureAwait(false); // return await new M3uParser(Logger, _fileSystem, _httpClient).Parse(satInfo.M3UUrl, ChannelIdPrefix, tuner.Id, cancellationToken).ConfigureAwait(false);
} // }
public static string DeviceType // public static string DeviceType
{ // {
get { return "satip"; } // get { return "satip"; }
} // }
public override string Type // public override string Type
{ // {
get { return DeviceType; } // get { return DeviceType; }
} // }
protected override async Task<List<MediaSourceInfo>> GetChannelStreamMediaSources(TunerHostInfo tuner, string channelId, CancellationToken cancellationToken) // protected override async Task<List<MediaSourceInfo>> GetChannelStreamMediaSources(TunerHostInfo tuner, string channelId, CancellationToken cancellationToken)
{ // {
var urlHash = tuner.Url.GetMD5().ToString("N"); // var urlHash = tuner.Url.GetMD5().ToString("N");
var prefix = ChannelIdPrefix + urlHash; // var prefix = ChannelIdPrefix + urlHash;
if (!channelId.StartsWith(prefix, StringComparison.OrdinalIgnoreCase)) // if (!channelId.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
{ // {
return null; // return null;
} // }
var channels = await GetChannels(tuner, true, cancellationToken).ConfigureAwait(false); // var channels = await GetChannels(tuner, true, cancellationToken).ConfigureAwait(false);
var m3uchannels = channels.Cast<M3UChannel>(); // var m3uchannels = channels.Cast<M3UChannel>();
var channel = m3uchannels.FirstOrDefault(c => string.Equals(c.Id, channelId, StringComparison.OrdinalIgnoreCase)); // var channel = m3uchannels.FirstOrDefault(c => string.Equals(c.Id, channelId, StringComparison.OrdinalIgnoreCase));
if (channel != null) // if (channel != null)
{ // {
var path = channel.Path; // var path = channel.Path;
MediaProtocol protocol = MediaProtocol.File; // MediaProtocol protocol = MediaProtocol.File;
if (path.StartsWith("http", StringComparison.OrdinalIgnoreCase)) // if (path.StartsWith("http", StringComparison.OrdinalIgnoreCase))
{ // {
protocol = MediaProtocol.Http; // protocol = MediaProtocol.Http;
} // }
else if (path.StartsWith("rtmp", StringComparison.OrdinalIgnoreCase)) // else if (path.StartsWith("rtmp", StringComparison.OrdinalIgnoreCase))
{ // {
protocol = MediaProtocol.Rtmp; // protocol = MediaProtocol.Rtmp;
} // }
else if (path.StartsWith("rtsp", StringComparison.OrdinalIgnoreCase)) // else if (path.StartsWith("rtsp", StringComparison.OrdinalIgnoreCase))
{ // {
protocol = MediaProtocol.Rtsp; // protocol = MediaProtocol.Rtsp;
} // }
var mediaSource = new MediaSourceInfo // var mediaSource = new MediaSourceInfo
{ // {
Path = channel.Path, // Path = channel.Path,
Protocol = protocol, // Protocol = protocol,
MediaStreams = new List<MediaStream> // MediaStreams = new List<MediaStream>
{ // {
new MediaStream // new MediaStream
{ // {
Type = MediaStreamType.Video, // Type = MediaStreamType.Video,
// Set the index to -1 because we don't know the exact index of the video stream within the container // // Set the index to -1 because we don't know the exact index of the video stream within the container
Index = -1, // Index = -1,
IsInterlaced = true // IsInterlaced = true
}, // },
new MediaStream // new MediaStream
{ // {
Type = MediaStreamType.Audio, // Type = MediaStreamType.Audio,
// Set the index to -1 because we don't know the exact index of the audio stream within the container // // Set the index to -1 because we don't know the exact index of the audio stream within the container
Index = -1 // Index = -1
} // }
}, // },
RequiresOpening = false, // RequiresOpening = false,
RequiresClosing = false // RequiresClosing = false
}; // };
return new List<MediaSourceInfo> { mediaSource }; // return new List<MediaSourceInfo> { mediaSource };
} // }
return new List<MediaSourceInfo> { }; // return new List<MediaSourceInfo> { };
} // }
protected override async Task<MediaSourceInfo> GetChannelStream(TunerHostInfo tuner, string channelId, string streamId, CancellationToken cancellationToken) // protected override async Task<MediaSourceInfo> GetChannelStream(TunerHostInfo tuner, string channelId, string streamId, CancellationToken cancellationToken)
{ // {
var sources = await GetChannelStreamMediaSources(tuner, channelId, cancellationToken).ConfigureAwait(false); // var sources = await GetChannelStreamMediaSources(tuner, channelId, cancellationToken).ConfigureAwait(false);
return sources.First(); // return sources.First();
} // }
protected override async Task<bool> IsAvailableInternal(TunerHostInfo tuner, string channelId, CancellationToken cancellationToken) // protected override async Task<bool> IsAvailableInternal(TunerHostInfo tuner, string channelId, CancellationToken cancellationToken)
{ // {
var updatedInfo = await SatIpDiscovery.Current.GetInfo(tuner.Url, cancellationToken).ConfigureAwait(false); // var updatedInfo = await SatIpDiscovery.Current.GetInfo(tuner.Url, cancellationToken).ConfigureAwait(false);
return updatedInfo.TunersAvailable > 0; // return updatedInfo.TunersAvailable > 0;
} // }
protected override bool IsValidChannelId(string channelId) // protected override bool IsValidChannelId(string channelId)
{ // {
return channelId.StartsWith(ChannelIdPrefix, StringComparison.OrdinalIgnoreCase); // return channelId.StartsWith(ChannelIdPrefix, StringComparison.OrdinalIgnoreCase);
} // }
protected override List<TunerHostInfo> GetTunerHosts() // protected override List<TunerHostInfo> GetTunerHosts()
{ // {
return SatIpDiscovery.Current.DiscoveredHosts; // return SatIpDiscovery.Current.DiscoveredHosts;
} // }
public string Name // public string Name
{ // {
get { return "Sat IP"; } // get { return "Sat IP"; }
} // }
public Task<List<LiveTvTunerInfo>> GetTunerInfos(CancellationToken cancellationToken) // public Task<List<LiveTvTunerInfo>> GetTunerInfos(CancellationToken cancellationToken)
{ // {
var list = GetTunerHosts() // var list = GetTunerHosts()
.SelectMany(i => GetTunerInfos(i, cancellationToken)) // .SelectMany(i => GetTunerInfos(i, cancellationToken))
.ToList(); // .ToList();
return Task.FromResult(list); // return Task.FromResult(list);
} // }
public List<LiveTvTunerInfo> GetTunerInfos(TunerHostInfo info, CancellationToken cancellationToken) // public List<LiveTvTunerInfo> GetTunerInfos(TunerHostInfo info, CancellationToken cancellationToken)
{ // {
var satInfo = (SatIpTunerHostInfo) info; // var satInfo = (SatIpTunerHostInfo) info;
var list = new List<LiveTvTunerInfo>(); // var list = new List<LiveTvTunerInfo>();
for (var i = 0; i < satInfo.Tuners; i++) // for (var i = 0; i < satInfo.Tuners; i++)
{ // {
list.Add(new LiveTvTunerInfo // list.Add(new LiveTvTunerInfo
{ // {
Name = satInfo.FriendlyName ?? Name, // Name = satInfo.FriendlyName ?? Name,
SourceType = Type, // SourceType = Type,
Status = LiveTvTunerStatus.Available, // Status = LiveTvTunerStatus.Available,
Id = info.Url.GetMD5().ToString("N") + i.ToString(CultureInfo.InvariantCulture), // Id = info.Url.GetMD5().ToString("N") + i.ToString(CultureInfo.InvariantCulture),
Url = info.Url // Url = info.Url
}); // });
} // }
return list; // return list;
} // }
} //}
} }

2
SharedVersion.cs
View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
//[assembly: AssemblyVersion("3.0.*")] //[assembly: AssemblyVersion("3.0.*")]
[assembly: AssemblyVersion("3.0.5872")] [assembly: AssemblyVersion("3.0.5896")]