diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 5527c16463..64edbdea9c 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -205,6 +205,8 @@ namespace MediaBrowser.Model.Configuration
public int MigrationVersion { get; set; }
public bool DownloadImagesInAdvance { get; set; }
+
+ public bool EnableAnonymousUsageReporting { get; set; }
///
/// Initializes a new instance of the class.
@@ -221,6 +223,7 @@ namespace MediaBrowser.Model.Configuration
EnableHttps = false;
EnableDashboardResponseCaching = true;
EnableDashboardResourceMinification = true;
+ EnableAnonymousUsageReporting = true;
EnableAutomaticRestart = true;
DenyIFrameEmbedding = true;
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/UsageEntryPoint.cs b/MediaBrowser.Server.Implementations/EntryPoints/UsageEntryPoint.cs
index d8aef909bb..f82bb01bb3 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/UsageEntryPoint.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/UsageEntryPoint.cs
@@ -10,6 +10,7 @@ using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
+using MediaBrowser.Controller.Configuration;
namespace MediaBrowser.Server.Implementations.EntryPoints
{
@@ -23,18 +24,18 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
private readonly ILogger _logger;
private readonly ISessionManager _sessionManager;
private readonly IUserManager _userManager;
-
- private readonly TimeSpan _frequency = TimeSpan.FromHours(24);
+ private readonly IServerConfigurationManager _config;
private readonly ConcurrentDictionary _apps = new ConcurrentDictionary();
- 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;
_applicationHost = applicationHost;
_httpClient = httpClient;
_sessionManager = sessionManager;
_userManager = userManager;
+ _config = config;
_sessionManager.SessionStarted += _sessionManager_SessionStarted;
}
@@ -64,6 +65,11 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
private async void ReportNewSession(ClientInfo client)
{
+ if (!_config.Configuration.EnableAnonymousUsageReporting)
+ {
+ return;
+ }
+
try
{
await new UsageReporter(_applicationHost, _httpClient, _userManager, _logger)
@@ -106,6 +112,11 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
///
private async void OnTimerFired()
{
+ if (!_config.Configuration.EnableAnonymousUsageReporting)
+ {
+ return;
+ }
+
try
{
await new UsageReporter(_applicationHost, _httpClient, _userManager, _logger)
diff --git a/MediaBrowser.Server.Implementations/EntryPoints/UsageReporter.cs b/MediaBrowser.Server.Implementations/EntryPoints/UsageReporter.cs
index 2473f3af69..cbec916791 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/UsageReporter.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/UsageReporter.cs
@@ -8,6 +8,7 @@ using System.Globalization;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
+using MediaBrowser.Controller.Configuration;
using MediaBrowser.Model.Logging;
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());
+ var logErrors = false;
+#if DEBUG
+ logErrors = true;
+#endif
var options = new HttpRequestOptions
{
Url = MbAdminUrl + "service/registration/ping",
@@ -59,7 +64,8 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
// Seeing block length errors
EnableHttpCompression = false,
- LogRequest = false
+ LogRequest = false,
+ LogErrors = logErrors
};
options.SetPostData(data);
@@ -95,6 +101,11 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
{ "platform", app.DeviceName },
};
+ var logErrors = false;
+
+#if DEBUG
+ logErrors = true;
+#endif
var options = new HttpRequestOptions
{
Url = MbAdminUrl + "service/registration/ping",
@@ -103,7 +114,8 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
// Seeing block length errors
EnableHttpCompression = false,
- LogRequest = false
+ LogRequest = false,
+ LogErrors = logErrors
};
options.SetPostData(data);
diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index 3ab08274c7..ba4e9f721a 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -920,6 +920,10 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
{
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
{
var organize = new EpisodeFileOrganizer(_organizationService, _config, _fileSystem, _logger, _libraryManager, _libraryMonitor, _providerManager);
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpDiscovery.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpDiscovery.cs
index 6781e498ac..f6db2f5a8d 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpDiscovery.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpDiscovery.cs
@@ -21,225 +21,225 @@ using MediaBrowser.Model.Serialization;
namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.SatIp
{
- public class SatIpDiscovery : IServerEntryPoint
- {
- private readonly IDeviceDiscovery _deviceDiscovery;
- private readonly IServerConfigurationManager _config;
- private readonly ILogger _logger;
- private readonly ILiveTvManager _liveTvManager;
- private readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
- private readonly IHttpClient _httpClient;
- private readonly IJsonSerializer _json;
+ //public class SatIpDiscovery : IServerEntryPoint
+ //{
+ // private readonly IDeviceDiscovery _deviceDiscovery;
+ // private readonly IServerConfigurationManager _config;
+ // private readonly ILogger _logger;
+ // private readonly ILiveTvManager _liveTvManager;
+ // private readonly SemaphoreSlim _semaphore = new SemaphoreSlim(1, 1);
+ // private readonly IHttpClient _httpClient;
+ // private readonly IJsonSerializer _json;
- public static SatIpDiscovery Current;
+ // public static SatIpDiscovery Current;
- private readonly List _discoveredHosts = new List();
+ // private readonly List _discoveredHosts = new List();
- public List DiscoveredHosts
- {
- get { return _discoveredHosts.ToList(); }
- }
+ // public List DiscoveredHosts
+ // {
+ // get { return _discoveredHosts.ToList(); }
+ // }
- public SatIpDiscovery(IDeviceDiscovery deviceDiscovery, IServerConfigurationManager config, ILogger logger, ILiveTvManager liveTvManager, IHttpClient httpClient, IJsonSerializer json)
- {
- _deviceDiscovery = deviceDiscovery;
- _config = config;
- _logger = logger;
- _liveTvManager = liveTvManager;
- _httpClient = httpClient;
- _json = json;
- Current = this;
- }
+ // public SatIpDiscovery(IDeviceDiscovery deviceDiscovery, IServerConfigurationManager config, ILogger logger, ILiveTvManager liveTvManager, IHttpClient httpClient, IJsonSerializer json)
+ // {
+ // _deviceDiscovery = deviceDiscovery;
+ // _config = config;
+ // _logger = logger;
+ // _liveTvManager = liveTvManager;
+ // _httpClient = httpClient;
+ // _json = json;
+ // Current = this;
+ // }
- public void Run()
- {
- _deviceDiscovery.DeviceDiscovered += _deviceDiscovery_DeviceDiscovered;
- }
+ // public void Run()
+ // {
+ // _deviceDiscovery.DeviceDiscovered += _deviceDiscovery_DeviceDiscovered;
+ // }
- void _deviceDiscovery_DeviceDiscovered(object sender, SsdpMessageEventArgs e)
- {
- string st = null;
- string nt = null;
- e.Headers.TryGetValue("ST", out st);
- e.Headers.TryGetValue("NT", out nt);
+ // void _deviceDiscovery_DeviceDiscovered(object sender, SsdpMessageEventArgs e)
+ // {
+ // string st = null;
+ // string nt = null;
+ // e.Headers.TryGetValue("ST", out st);
+ // e.Headers.TryGetValue("NT", out nt);
- if (string.Equals(st, "urn:ses-com:device:SatIPServer:1", StringComparison.OrdinalIgnoreCase) ||
- string.Equals(nt, "urn:ses-com:device:SatIPServer:1", StringComparison.OrdinalIgnoreCase))
- {
- string location;
- if (e.Headers.TryGetValue("Location", out location) && !string.IsNullOrWhiteSpace(location))
- {
- _logger.Debug("SAT IP found at {0}", location);
+ // if (string.Equals(st, "urn:ses-com:device:SatIPServer:1", StringComparison.OrdinalIgnoreCase) ||
+ // string.Equals(nt, "urn:ses-com:device:SatIPServer:1", StringComparison.OrdinalIgnoreCase))
+ // {
+ // string location;
+ // if (e.Headers.TryGetValue("Location", out location) && !string.IsNullOrWhiteSpace(location))
+ // {
+ // _logger.Debug("SAT IP found at {0}", location);
- // Just get the beginning of the url
- AddDevice(location);
- }
- }
- }
+ // // Just get the beginning of the url
+ // AddDevice(location);
+ // }
+ // }
+ // }
- private async void AddDevice(string location)
- {
- await _semaphore.WaitAsync().ConfigureAwait(false);
+ // private async void AddDevice(string location)
+ // {
+ // await _semaphore.WaitAsync().ConfigureAwait(false);
- try
- {
- if (_discoveredHosts.Any(i => string.Equals(i.Type, SatIpHost.DeviceType, StringComparison.OrdinalIgnoreCase) && string.Equals(location, i.Url, StringComparison.OrdinalIgnoreCase)))
- {
- return;
- }
+ // try
+ // {
+ // if (_discoveredHosts.Any(i => string.Equals(i.Type, SatIpHost.DeviceType, StringComparison.OrdinalIgnoreCase) && string.Equals(location, i.Url, StringComparison.OrdinalIgnoreCase)))
+ // {
+ // return;
+ // }
- _logger.Debug("Will attempt to add SAT device {0}", location);
- var info = await GetInfo(location, CancellationToken.None).ConfigureAwait(false);
+ // _logger.Debug("Will attempt to add SAT device {0}", location);
+ // var info = await GetInfo(location, CancellationToken.None).ConfigureAwait(false);
- _discoveredHosts.Add(info);
- }
- catch (OperationCanceledException)
- {
+ // _discoveredHosts.Add(info);
+ // }
+ // catch (OperationCanceledException)
+ // {
- }
- catch (NotImplementedException)
- {
+ // }
+ // catch (NotImplementedException)
+ // {
- }
- catch (Exception ex)
- {
- _logger.ErrorException("Error saving device", ex);
- }
- finally
- {
- _semaphore.Release();
- }
- }
+ // }
+ // catch (Exception ex)
+ // {
+ // _logger.ErrorException("Error saving device", ex);
+ // }
+ // finally
+ // {
+ // _semaphore.Release();
+ // }
+ // }
- public void Dispose()
- {
- }
+ // public void Dispose()
+ // {
+ // }
- public async Task GetInfo(string url, CancellationToken cancellationToken)
- {
- var result = new SatIpTunerHostInfo
- {
- Url = url,
- IsEnabled = true,
- Type = SatIpHost.DeviceType,
- Tuners = 1,
- TunersAvailable = 1
- };
+ // public async Task GetInfo(string url, CancellationToken cancellationToken)
+ // {
+ // var result = new SatIpTunerHostInfo
+ // {
+ // Url = url,
+ // IsEnabled = true,
+ // Type = SatIpHost.DeviceType,
+ // Tuners = 1,
+ // TunersAvailable = 1
+ // };
- using (var stream = await _httpClient.Get(url, cancellationToken).ConfigureAwait(false))
- {
- using (var streamReader = new StreamReader(stream))
- {
- // Use XmlReader for best performance
- using (var reader = XmlReader.Create(streamReader))
- {
- reader.MoveToContent();
+ // using (var stream = await _httpClient.Get(url, cancellationToken).ConfigureAwait(false))
+ // {
+ // using (var streamReader = new StreamReader(stream))
+ // {
+ // // Use XmlReader for best performance
+ // using (var reader = XmlReader.Create(streamReader))
+ // {
+ // reader.MoveToContent();
- // Loop through each element
- while (reader.Read())
- {
- if (reader.NodeType == XmlNodeType.Element)
- {
- switch (reader.Name)
- {
- case "device":
- using (var subtree = reader.ReadSubtree())
- {
- FillFromDeviceNode(result, subtree);
- }
- break;
- default:
- reader.Skip();
- break;
- }
- }
- }
- }
- }
- }
+ // // Loop through each element
+ // while (reader.Read())
+ // {
+ // if (reader.NodeType == XmlNodeType.Element)
+ // {
+ // switch (reader.Name)
+ // {
+ // case "device":
+ // using (var subtree = reader.ReadSubtree())
+ // {
+ // FillFromDeviceNode(result, subtree);
+ // }
+ // break;
+ // default:
+ // reader.Skip();
+ // break;
+ // }
+ // }
+ // }
+ // }
+ // }
+ // }
- if (string.IsNullOrWhiteSpace(result.Id))
- {
- throw new NotImplementedException();
- }
+ // if (string.IsNullOrWhiteSpace(result.Id))
+ // {
+ // throw new NotImplementedException();
+ // }
- // Device hasn't implemented an m3u list
- if (string.IsNullOrWhiteSpace(result.M3UUrl))
- {
- result.IsEnabled = false;
- }
+ // // Device hasn't implemented an m3u list
+ // if (string.IsNullOrWhiteSpace(result.M3UUrl))
+ // {
+ // result.IsEnabled = false;
+ // }
- else if (!result.M3UUrl.StartsWith("http", StringComparison.OrdinalIgnoreCase))
- {
- var fullM3uUrl = url.Substring(0, url.LastIndexOf('/'));
- result.M3UUrl = fullM3uUrl + "/" + result.M3UUrl.TrimStart('/');
- }
+ // else if (!result.M3UUrl.StartsWith("http", StringComparison.OrdinalIgnoreCase))
+ // {
+ // var fullM3uUrl = url.Substring(0, url.LastIndexOf('/'));
+ // 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)
- {
- reader.MoveToContent();
+ // private void FillFromDeviceNode(SatIpTunerHostInfo info, XmlReader reader)
+ // {
+ // reader.MoveToContent();
- while (reader.Read())
- {
- if (reader.NodeType == XmlNodeType.Element)
- {
- switch (reader.LocalName)
- {
- case "UDN":
- {
- info.Id = reader.ReadElementContentAsString();
- break;
- }
+ // while (reader.Read())
+ // {
+ // if (reader.NodeType == XmlNodeType.Element)
+ // {
+ // switch (reader.LocalName)
+ // {
+ // case "UDN":
+ // {
+ // info.Id = reader.ReadElementContentAsString();
+ // break;
+ // }
- case "friendlyName":
- {
- info.FriendlyName = reader.ReadElementContentAsString();
- break;
- }
+ // case "friendlyName":
+ // {
+ // info.FriendlyName = reader.ReadElementContentAsString();
+ // break;
+ // }
- case "satip:X_SATIPCAP":
- case "X_SATIPCAP":
- {
- // DVBS2-2
- var value = reader.ReadElementContentAsString() ?? string.Empty;
- var parts = value.Split(new[] { '-' }, StringSplitOptions.RemoveEmptyEntries);
- if (parts.Length == 2)
- {
- int intValue;
- if (int.TryParse(parts[1], NumberStyles.Any, CultureInfo.InvariantCulture, out intValue))
- {
- info.TunersAvailable = intValue;
- }
+ // case "satip:X_SATIPCAP":
+ // case "X_SATIPCAP":
+ // {
+ // // DVBS2-2
+ // var value = reader.ReadElementContentAsString() ?? string.Empty;
+ // var parts = value.Split(new[] { '-' }, StringSplitOptions.RemoveEmptyEntries);
+ // if (parts.Length == 2)
+ // {
+ // int intValue;
+ // if (int.TryParse(parts[1], NumberStyles.Any, CultureInfo.InvariantCulture, out intValue))
+ // {
+ // info.TunersAvailable = intValue;
+ // }
- if (int.TryParse(parts[0].Substring(parts[0].Length - 1), NumberStyles.Any, CultureInfo.InvariantCulture, out intValue))
- {
- info.Tuners = intValue;
- }
- }
- break;
- }
+ // if (int.TryParse(parts[0].Substring(parts[0].Length - 1), NumberStyles.Any, CultureInfo.InvariantCulture, out intValue))
+ // {
+ // info.Tuners = intValue;
+ // }
+ // }
+ // break;
+ // }
- case "satip:X_SATIPM3U":
- case "X_SATIPM3U":
- {
- // /channellist.lua?select=m3u
- info.M3UUrl = reader.ReadElementContentAsString();
- break;
- }
+ // case "satip:X_SATIPM3U":
+ // case "X_SATIPM3U":
+ // {
+ // // /channellist.lua?select=m3u
+ // info.M3UUrl = reader.ReadElementContentAsString();
+ // break;
+ // }
- default:
- reader.Skip();
- break;
- }
- }
- }
- }
- }
+ // default:
+ // reader.Skip();
+ // break;
+ // }
+ // }
+ // }
+ // }
+ //}
public class SatIpTunerHostInfo : TunerHostInfo
{
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpHost.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpHost.cs
index 181169e9a1..11213be232 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpHost.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpHost.cs
@@ -19,153 +19,153 @@ using MediaBrowser.Model.Serialization;
namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.SatIp
{
- public class SatIpHost : BaseTunerHost, ITunerHost
- {
- private readonly IFileSystem _fileSystem;
- private readonly IHttpClient _httpClient;
+ //public class SatIpHost : BaseTunerHost, ITunerHost
+ //{
+ // private readonly IFileSystem _fileSystem;
+ // private readonly IHttpClient _httpClient;
- public SatIpHost(IConfigurationManager config, ILogger logger, IJsonSerializer jsonSerializer, IMediaEncoder mediaEncoder, IFileSystem fileSystem, IHttpClient httpClient)
- : base(config, logger, jsonSerializer, mediaEncoder)
- {
- _fileSystem = fileSystem;
- _httpClient = httpClient;
- }
+ // public SatIpHost(IConfigurationManager config, ILogger logger, IJsonSerializer jsonSerializer, IMediaEncoder mediaEncoder, IFileSystem fileSystem, IHttpClient httpClient)
+ // : base(config, logger, jsonSerializer, mediaEncoder)
+ // {
+ // _fileSystem = fileSystem;
+ // _httpClient = httpClient;
+ // }
- private const string ChannelIdPrefix = "sat_";
+ // private const string ChannelIdPrefix = "sat_";
- protected override async Task> GetChannelsInternal(TunerHostInfo tuner, CancellationToken cancellationToken)
- {
- var satInfo = (SatIpTunerHostInfo) tuner;
+ // protected override async Task> GetChannelsInternal(TunerHostInfo tuner, CancellationToken cancellationToken)
+ // {
+ // 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
- {
- get { return "satip"; }
- }
+ // public static string DeviceType
+ // {
+ // get { return "satip"; }
+ // }
- public override string Type
- {
- get { return DeviceType; }
- }
+ // public override string Type
+ // {
+ // get { return DeviceType; }
+ // }
- protected override async Task> GetChannelStreamMediaSources(TunerHostInfo tuner, string channelId, CancellationToken cancellationToken)
- {
- var urlHash = tuner.Url.GetMD5().ToString("N");
- var prefix = ChannelIdPrefix + urlHash;
- if (!channelId.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
- {
- return null;
- }
+ // protected override async Task> GetChannelStreamMediaSources(TunerHostInfo tuner, string channelId, CancellationToken cancellationToken)
+ // {
+ // var urlHash = tuner.Url.GetMD5().ToString("N");
+ // var prefix = ChannelIdPrefix + urlHash;
+ // if (!channelId.StartsWith(prefix, StringComparison.OrdinalIgnoreCase))
+ // {
+ // return null;
+ // }
- var channels = await GetChannels(tuner, true, cancellationToken).ConfigureAwait(false);
- var m3uchannels = channels.Cast();
- var channel = m3uchannels.FirstOrDefault(c => string.Equals(c.Id, channelId, StringComparison.OrdinalIgnoreCase));
- if (channel != null)
- {
- var path = channel.Path;
- MediaProtocol protocol = MediaProtocol.File;
- if (path.StartsWith("http", StringComparison.OrdinalIgnoreCase))
- {
- protocol = MediaProtocol.Http;
- }
- else if (path.StartsWith("rtmp", StringComparison.OrdinalIgnoreCase))
- {
- protocol = MediaProtocol.Rtmp;
- }
- else if (path.StartsWith("rtsp", StringComparison.OrdinalIgnoreCase))
- {
- protocol = MediaProtocol.Rtsp;
- }
+ // var channels = await GetChannels(tuner, true, cancellationToken).ConfigureAwait(false);
+ // var m3uchannels = channels.Cast();
+ // var channel = m3uchannels.FirstOrDefault(c => string.Equals(c.Id, channelId, StringComparison.OrdinalIgnoreCase));
+ // if (channel != null)
+ // {
+ // var path = channel.Path;
+ // MediaProtocol protocol = MediaProtocol.File;
+ // if (path.StartsWith("http", StringComparison.OrdinalIgnoreCase))
+ // {
+ // protocol = MediaProtocol.Http;
+ // }
+ // else if (path.StartsWith("rtmp", StringComparison.OrdinalIgnoreCase))
+ // {
+ // protocol = MediaProtocol.Rtmp;
+ // }
+ // else if (path.StartsWith("rtsp", StringComparison.OrdinalIgnoreCase))
+ // {
+ // protocol = MediaProtocol.Rtsp;
+ // }
- var mediaSource = new MediaSourceInfo
- {
- Path = channel.Path,
- Protocol = protocol,
- MediaStreams = new List
- {
- new MediaStream
- {
- Type = MediaStreamType.Video,
- // Set the index to -1 because we don't know the exact index of the video stream within the container
- Index = -1,
- IsInterlaced = true
- },
- new MediaStream
- {
- Type = MediaStreamType.Audio,
- // Set the index to -1 because we don't know the exact index of the audio stream within the container
- Index = -1
+ // var mediaSource = new MediaSourceInfo
+ // {
+ // Path = channel.Path,
+ // Protocol = protocol,
+ // MediaStreams = new List
+ // {
+ // new MediaStream
+ // {
+ // Type = MediaStreamType.Video,
+ // // Set the index to -1 because we don't know the exact index of the video stream within the container
+ // Index = -1,
+ // IsInterlaced = true
+ // },
+ // new MediaStream
+ // {
+ // Type = MediaStreamType.Audio,
+ // // Set the index to -1 because we don't know the exact index of the audio stream within the container
+ // Index = -1
- }
- },
- RequiresOpening = false,
- RequiresClosing = false
- };
+ // }
+ // },
+ // RequiresOpening = false,
+ // RequiresClosing = false
+ // };
- return new List { mediaSource };
- }
- return new List { };
- }
+ // return new List { mediaSource };
+ // }
+ // return new List { };
+ // }
- protected override async Task GetChannelStream(TunerHostInfo tuner, string channelId, string streamId, CancellationToken cancellationToken)
- {
- var sources = await GetChannelStreamMediaSources(tuner, channelId, cancellationToken).ConfigureAwait(false);
+ // protected override async Task GetChannelStream(TunerHostInfo tuner, string channelId, string streamId, CancellationToken cancellationToken)
+ // {
+ // var sources = await GetChannelStreamMediaSources(tuner, channelId, cancellationToken).ConfigureAwait(false);
- return sources.First();
- }
+ // return sources.First();
+ // }
- protected override async Task IsAvailableInternal(TunerHostInfo tuner, string channelId, CancellationToken cancellationToken)
- {
- var updatedInfo = await SatIpDiscovery.Current.GetInfo(tuner.Url, cancellationToken).ConfigureAwait(false);
+ // protected override async Task IsAvailableInternal(TunerHostInfo tuner, string channelId, CancellationToken cancellationToken)
+ // {
+ // 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)
- {
- return channelId.StartsWith(ChannelIdPrefix, StringComparison.OrdinalIgnoreCase);
- }
+ // protected override bool IsValidChannelId(string channelId)
+ // {
+ // return channelId.StartsWith(ChannelIdPrefix, StringComparison.OrdinalIgnoreCase);
+ // }
- protected override List GetTunerHosts()
- {
- return SatIpDiscovery.Current.DiscoveredHosts;
- }
+ // protected override List GetTunerHosts()
+ // {
+ // return SatIpDiscovery.Current.DiscoveredHosts;
+ // }
- public string Name
- {
- get { return "Sat IP"; }
- }
+ // public string Name
+ // {
+ // get { return "Sat IP"; }
+ // }
- public Task> GetTunerInfos(CancellationToken cancellationToken)
- {
- var list = GetTunerHosts()
- .SelectMany(i => GetTunerInfos(i, cancellationToken))
- .ToList();
+ // public Task> GetTunerInfos(CancellationToken cancellationToken)
+ // {
+ // var list = GetTunerHosts()
+ // .SelectMany(i => GetTunerInfos(i, cancellationToken))
+ // .ToList();
- return Task.FromResult(list);
- }
+ // return Task.FromResult(list);
+ // }
- public List GetTunerInfos(TunerHostInfo info, CancellationToken cancellationToken)
- {
- var satInfo = (SatIpTunerHostInfo) info;
+ // public List GetTunerInfos(TunerHostInfo info, CancellationToken cancellationToken)
+ // {
+ // var satInfo = (SatIpTunerHostInfo) info;
- var list = new List();
+ // var list = new List();
- for (var i = 0; i < satInfo.Tuners; i++)
- {
- list.Add(new LiveTvTunerInfo
- {
- Name = satInfo.FriendlyName ?? Name,
- SourceType = Type,
- Status = LiveTvTunerStatus.Available,
- Id = info.Url.GetMD5().ToString("N") + i.ToString(CultureInfo.InvariantCulture),
- Url = info.Url
- });
- }
+ // for (var i = 0; i < satInfo.Tuners; i++)
+ // {
+ // list.Add(new LiveTvTunerInfo
+ // {
+ // Name = satInfo.FriendlyName ?? Name,
+ // SourceType = Type,
+ // Status = LiveTvTunerStatus.Available,
+ // Id = info.Url.GetMD5().ToString("N") + i.ToString(CultureInfo.InvariantCulture),
+ // Url = info.Url
+ // });
+ // }
- return list;
- }
- }
+ // return list;
+ // }
+ //}
}
diff --git a/SharedVersion.cs b/SharedVersion.cs
index 39f7221c16..ab7f18aa3c 100644
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,4 @@
using System.Reflection;
//[assembly: AssemblyVersion("3.0.*")]
-[assembly: AssemblyVersion("3.0.5872")]
+[assembly: AssemblyVersion("3.0.5896")]