Merge pull request #1468 from MediaBrowser/dev

Dev

6 files changed, 36 insertions, 40 deletions

diff --git a/MediaBrowser.Server.Implementations/EntryPoints/UsageReporter.cs b/MediaBrowser.Server.Implementations/EntryPoints/UsageReporter.cs
index 47c754643..be2817fd2 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/UsageReporter.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/UsageReporter.cs
@@ -18,7 +18,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
         private readonly IHttpClient _httpClient;
         private readonly IUserManager _userManager;
         private readonly ILogger _logger;
-        private const string MbAdminUrl = "https://www.mb3admin.com/admin/";
+        private const string MbAdminUrl = "http://www.mb3admin.com/admin/";
 
         public UsageReporter(IApplicationHost applicationHost, IHttpClient httpClient, IUserManager userManager, ILogger logger)
         {
diff --git a/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs b/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs
index 4ef9d5277..f993d4437 100644
--- a/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs
+++ b/MediaBrowser.Server.Implementations/HttpServer/ResponseFilter.cs
@@ -61,6 +61,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer
                 if (!hasOptions.Options.ContainsKey("Server"))
                 {
                     hasOptions.Options["Server"] = "Mono-HTTPAPI/1.1, UPnP/1.0 DLNADOC/1.50";
+                    //hasOptions.Options["Server"] = "Mono-HTTPAPI/1.1";
                 }
 
                 // Content length has to be explicitly set on on HttpListenerResponse or it won't be happy
diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
index b4ff79567..5f4d32732 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
@@ -91,6 +91,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
             // Important - don't await the log task or we won't be able to kill ffmpeg when the user stops playback
             StartStreamingLog(process.StandardError.BaseStream, _logFileStream);
 
+            onStarted();
+
             // Wait for the file to exist before proceeeding
             while (!_hasExited)
             {
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpDiscovery.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpDiscovery.cs
index 95c04d61f..08c42bb46 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpDiscovery.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp/SatIpDiscovery.cs
@@ -41,29 +41,21 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.SatIp
 
         void _deviceDiscovery_DeviceDiscovered(object sender, SsdpMessageEventArgs e)
         {
-            //string server = null;
-            //if (e.Headers.TryGetValue("SERVER", out server) && server.IndexOf("HDHomeRun", StringComparison.OrdinalIgnoreCase) != -1)
-            //{
-            //    string location;
-            //    if (e.Headers.TryGetValue("Location", out location))
-            //    {
-            //        //_logger.Debug("HdHomerun found at {0}", location);
-
-            //        // Just get the beginning of the url
-            //        Uri uri;
-            //        if (Uri.TryCreate(location, UriKind.Absolute, out uri))
-            //        {
-            //            var apiUrl = location.Replace(uri.LocalPath, String.Empty, StringComparison.OrdinalIgnoreCase)
-            //                    .TrimEnd('/');
-
-            //            //_logger.Debug("HdHomerun api url: {0}", apiUrl);
-            //            AddDevice(apiUrl);
-            //        }
-            //    }
-            //}
+            string st = null;
+            if (e.Headers.TryGetValue("ST", out st) && string.Equals(st, "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);
+                }
+            }
         }
 
-        private async void AddDevice(string url)
+        private async void AddDevice(string location)
         {
             await _semaphore.WaitAsync().ConfigureAwait(false);
 
@@ -71,24 +63,24 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.SatIp
             {
                 var options = GetConfiguration();
 
-                if (options.TunerHosts.Any(i =>
-                            string.Equals(i.Type, SatIpHost.DeviceType, StringComparison.OrdinalIgnoreCase) &&
-                            UriEquals(i.Url, url)))
-                {
-                    return;
-                }
+                //if (options.TunerHosts.Any(i =>
+                //            string.Equals(i.Type, SatIpHost.DeviceType, StringComparison.OrdinalIgnoreCase) &&
+                //            UriEquals(i.Url, url)))
+                //{
+                //    return;
+                //}
 
-                // Strip off the port
-                url = new Uri(url).GetComponents(UriComponents.AbsoluteUri & ~UriComponents.Port, UriFormat.UriEscaped).TrimEnd('/');
+                //// Strip off the port
+                //url = new Uri(url).GetComponents(UriComponents.AbsoluteUri & ~UriComponents.Port, UriFormat.UriEscaped).TrimEnd('/');
 
-                await TestUrl(url).ConfigureAwait(false);
-                
-                await _liveTvManager.SaveTunerHost(new TunerHostInfo
-                {
-                    Type = SatIpHost.DeviceType,
-                    Url = url
+                //await TestUrl(url).ConfigureAwait(false);
+
+                //await _liveTvManager.SaveTunerHost(new TunerHostInfo
+                //{
+                //    Type = SatIpHost.DeviceType,
+                //    Url = url
 
-                }).ConfigureAwait(false);
+                //}).ConfigureAwait(false);
             }
             catch (Exception ex)
             {
diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
index 2dee8a5ed..5f2fab457 100644
--- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
+++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj
@@ -45,8 +45,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\CommonIO.1.0.0.7\lib\net45\CommonIO.dll</HintPath>
     </Reference>
-    <Reference Include="Emby.XmlTv">
-      <HintPath>..\packages\Emby.XmlTv.1.0.0.46\lib\net45\Emby.XmlTv.dll</HintPath>
+    <Reference Include="Emby.XmlTv, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\Emby.XmlTv.1.0.0.48\lib\net45\Emby.XmlTv.dll</HintPath>
     </Reference>
     <Reference Include="Interfaces.IO">
       <HintPath>..\packages\Interfaces.IO.1.0.0.5\lib\portable-net45+sl4+wp71+win8+wpa81\Interfaces.IO.dll</HintPath>
diff --git a/MediaBrowser.Server.Implementations/packages.config b/MediaBrowser.Server.Implementations/packages.config
index 98c27786f..816f85b42 100644
--- a/MediaBrowser.Server.Implementations/packages.config
+++ b/MediaBrowser.Server.Implementations/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>

 <packages>

   <package id="CommonIO" version="1.0.0.7" targetFramework="net45" />

-  <package id="Emby.XmlTv" version="1.0.0.46" targetFramework="net45" />

+  <package id="Emby.XmlTv" version="1.0.0.48" targetFramework="net45" />

   <package id="Interfaces.IO" version="1.0.0.5" targetFramework="net45" />

   <package id="MediaBrowser.Naming" version="1.0.0.47" targetFramework="net45" />

   <package id="Mono.Nat" version="1.2.24.0" targetFramework="net45" />