alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-20 09:04:42 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

updated nuget

Browse Source
This commit is contained in:
Luke Pulverenti
2014-09-03 21:44:40 -04:00
parent 60d1d5cdee
commit 5de8b92fe5
12 changed files with 85 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
MediaBrowser.Server.Implementations/Connect/ConnectManager.cs
View File

@@ -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,

2
MediaBrowser.Server.Implementations/HttpServer/HttpListenerHost.cs
View File

@@ -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;

50
MediaBrowser.Server.Implementations/HttpServer/SocketSharp/SocketSharpLogger.cs Normal file
View File

@@ -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);
}
}
}

2
MediaBrowser.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
View File

@@ -35,7 +35,7 @@ namespace MediaBrowser.Server.Implementations.HttpServer.SocketSharp
public void Start(IEnumerable<string> urlPrefixes)
{
if (_listener == null)
_listener = new WebSocketSharp.Net.HttpListener();
_listener = new HttpListener(new SocketSharpLogger(_logger));
foreach (var prefix in urlPrefixes)
{

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

@@ -162,6 +162,7 @@
<Compile Include="HttpServer\ServerLogger.cs" />
<Compile Include="HttpServer\Security\SessionContext.cs" />
<Compile Include="HttpServer\SocketSharp\SharpWebSocket.cs" />
<Compile Include="HttpServer\SocketSharp\SocketSharpLogger.cs" />
<Compile Include="HttpServer\StreamWriter.cs" />
<Compile Include="HttpServer\SwaggerService.cs" />
<Compile Include="Drawing\ImageProcessor.cs" />