From 5de8b92fe566a156197ec3ac49892fdf6168f1ca Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 3 Sep 2014 21:44:40 -0400 Subject: [PATCH] updated nuget --- .../HttpClientManager/HttpClientManager.cs | 1 - .../Movies/MovieDbProvider.cs | 1 + .../Music/MusicBrainzAlbumProvider.cs | 8 +-- .../Connect/ConnectManager.cs | 24 +++++++-- .../HttpServer/HttpListenerHost.cs | 2 +- .../SocketSharp/SocketSharpLogger.cs | 50 +++++++++++++++++++ .../SocketSharp/WebSocketSharpListener.cs | 2 +- ...MediaBrowser.Server.Implementations.csproj | 1 + Nuget/MediaBrowser.Common.Internal.nuspec | 4 +- Nuget/MediaBrowser.Common.nuspec | 2 +- Nuget/MediaBrowser.Model.Signed.nuspec | 2 +- Nuget/MediaBrowser.Server.Core.nuspec | 4 +- 12 files changed, 85 insertions(+), 16 deletions(-) create mode 100644 MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SocketSharpLogger.cs diff --git a/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs b/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs index ffde10bfed..f1f1858cb2 100644 --- a/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs +++ b/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs @@ -123,7 +123,6 @@ namespace MediaBrowser.Common.Implementations.HttpClientManager } request.Method = method; - request.Pipelined = true; request.Timeout = 20000; if (!string.IsNullOrEmpty(options.Host)) diff --git a/MediaBrowser.Providers/Movies/MovieDbProvider.cs b/MediaBrowser.Providers/Movies/MovieDbProvider.cs index 32d53db436..00a80af83f 100644 --- a/MediaBrowser.Providers/Movies/MovieDbProvider.cs +++ b/MediaBrowser.Providers/Movies/MovieDbProvider.cs @@ -349,6 +349,7 @@ namespace MediaBrowser.Providers.Movies if (diff > 0) { + _logger.Debug("Throttling MovieDb by {0} ms", diff); await Task.Delay(Convert.ToInt32(diff), cancellationToken).ConfigureAwait(false); } diff --git a/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs b/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs index 7a30c4a507..12ac30453c 100644 --- a/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs +++ b/MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs @@ -3,6 +3,7 @@ using MediaBrowser.Common.Net; using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.Providers; using MediaBrowser.Model.Entities; +using MediaBrowser.Model.Logging; using MediaBrowser.Model.Providers; using System; using System.Collections.Generic; @@ -22,11 +23,13 @@ namespace MediaBrowser.Providers.Music private readonly IHttpClient _httpClient; private readonly IApplicationHost _appHost; + private readonly ILogger _logger; - public MusicBrainzAlbumProvider(IHttpClient httpClient, IApplicationHost appHost) + public MusicBrainzAlbumProvider(IHttpClient httpClient, IApplicationHost appHost, ILogger logger) { _httpClient = httpClient; _appHost = appHost; + _logger = logger; Current = this; } @@ -285,11 +288,10 @@ namespace MediaBrowser.Providers.Music if (diff > 0) { + _logger.Debug("Throttling musicbrainz by {0} ms", diff); await Task.Delay(Convert.ToInt32(diff), cancellationToken).ConfigureAwait(false); } - _lastRequestDate = DateTime.Now; - var doc = new XmlDocument(); var userAgent = _appHost.Name + "/" + _appHost.ApplicationVersion; diff --git a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs index af1628ba47..dc03f14cbe 100644 --- a/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs +++ b/MediaBrowser.Server.Implementations/Connect/ConnectManager.cs @@ -1,10 +1,12 @@ -using MediaBrowser.Common.Configuration; +using System.Net; +using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Net; using MediaBrowser.Controller; using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Connect; using MediaBrowser.Controller.Security; using MediaBrowser.Model.Logging; +using MediaBrowser.Model.Net; using MediaBrowser.Model.Serialization; using System; using System.Collections.Generic; @@ -93,11 +95,26 @@ namespace MediaBrowser.Server.Implementations.Connect var hasExistingRecord = !string.IsNullOrWhiteSpace(ConnectServerId) && !string.IsNullOrWhiteSpace(ConnectAccessKey); + var createNewRegistration = !hasExistingRecord; + if (hasExistingRecord) { - await UpdateServerRegistration(wanApiAddress).ConfigureAwait(false); + try + { + await UpdateServerRegistration(wanApiAddress).ConfigureAwait(false); + } + catch (HttpException ex) + { + if (!ex.StatusCode.HasValue || ex.StatusCode.Value != HttpStatusCode.NotFound || ex.StatusCode.Value != HttpStatusCode.Unauthorized) + { + throw; + } + + createNewRegistration = true; + } } - else + + if (createNewRegistration) { await CreateServerRegistration(wanApiAddress).ConfigureAwait(false); } @@ -136,7 +153,6 @@ namespace MediaBrowser.Server.Implementations.Connect url = GetConnectUrl(url); url += "?id=" + ConnectServerId; - // TODO: Add Access-Key http request header var options = new HttpRequestOptions { Url = url, diff --git a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs index 16ca8b0991..15d1eea6d9 100644 --- a/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs +++ b/MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs @@ -168,7 +168,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer _listener = NativeWebSocket.IsSupported ? _listener = new HttpListenerServer(_logger, OnRequestReceived) - //? _listener = new WebSocketSharpListener(_logger) + //? _listener = new WebSocketSharpListener(_logger, OnRequestReceived) : _listener = new WebSocketSharpListener(_logger, OnRequestReceived); _listener.WebSocketHandler = WebSocketHandler; diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SocketSharpLogger.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SocketSharpLogger.cs new file mode 100644 index 0000000000..ffc99793e9 --- /dev/null +++ b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SocketSharpLogger.cs @@ -0,0 +1,50 @@ +using MediaBrowser.Model.Logging; +using System; + +namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp +{ + public class SocketSharpLogger : WebSocketSharp.Logging.ILogger + { + private readonly ILogger _logger; + + public SocketSharpLogger(ILogger logger) + { + _logger = logger; + } + + public void Debug(string message, params object[] paramList) + { + _logger.Debug(message, paramList); + } + + public void Error(string message, params object[] paramList) + { + _logger.Error(message, paramList); + } + + public void ErrorException(string message, Exception exception, params object[] paramList) + { + _logger.ErrorException(message, exception, paramList); + } + + public void Fatal(string message, params object[] paramList) + { + _logger.Fatal(message, paramList); + } + + public void FatalException(string message, Exception exception, params object[] paramList) + { + _logger.FatalException(message, exception, paramList); + } + + public void Info(string message, params object[] paramList) + { + _logger.Info(message, paramList); + } + + public void Warn(string message, params object[] paramList) + { + _logger.Warn(message, paramList); + } + } +} diff --git a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs index f2fae9e90d..79916d5ffd 100644 --- a/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs +++ b/MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs @@ -35,7 +35,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp public void Start(IEnumerable urlPrefixes) { if (_listener == null) - _listener = new WebSocketSharp.Net.HttpListener(); + _listener = new HttpListener(new SocketSharpLogger(_logger)); foreach (var prefix in urlPrefixes) { diff --git a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj index 3130636737..24d1447c08 100644 --- a/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj +++ b/MediaBrowser.Server.Implementations/MediaBrowser.Server.Implementations.csproj @@ -162,6 +162,7 @@ + diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec index 11ccc3075f..894c87ec2d 100644 --- a/Nuget/MediaBrowser.Common.Internal.nuspec +++ b/Nuget/MediaBrowser.Common.Internal.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common.Internal - 3.0.429 + 3.0.430 MediaBrowser.Common.Internal Luke ebr,Luke,scottisafool @@ -12,7 +12,7 @@ Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption. Copyright © Media Browser 2013 - + diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec index b912745934..ad8ea4a5ab 100644 --- a/Nuget/MediaBrowser.Common.nuspec +++ b/Nuget/MediaBrowser.Common.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common - 3.0.429 + 3.0.430 MediaBrowser.Common Media Browser Team ebr,Luke,scottisafool diff --git a/Nuget/MediaBrowser.Model.Signed.nuspec b/Nuget/MediaBrowser.Model.Signed.nuspec index 9280656b1b..df5f65a530 100644 --- a/Nuget/MediaBrowser.Model.Signed.nuspec +++ b/Nuget/MediaBrowser.Model.Signed.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Model.Signed - 3.0.429 + 3.0.430 MediaBrowser.Model - Signed Edition Media Browser Team ebr,Luke,scottisafool diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec index a44bc2eab4..279765be8a 100644 --- a/Nuget/MediaBrowser.Server.Core.nuspec +++ b/Nuget/MediaBrowser.Server.Core.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Server.Core - 3.0.429 + 3.0.430 Media Browser.Server.Core Media Browser Team ebr,Luke,scottisafool @@ -12,7 +12,7 @@ Contains core components required to build plugins for Media Browser Server. Copyright © Media Browser 2013 - +