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

removed dead code

Browse Source
This commit is contained in:
Luke Pulverenti
2017-02-12 21:06:54 -05:00
parent 511a8702c2
commit e1b2b2e77e
11 changed files with 182 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Emby.Server.Implementations/HttpServer/HttpListenerHost.cs
View File

@@ -29,7 +29,7 @@ using SocketHttpListener.Primitives;
namespace Emby.Server.Implementations.HttpServer
{
public class HttpListenerHost : ServiceStackHost, IHttpServer
public class HttpListenerHost : IHttpServer, IDisposable
{
private string DefaultRedirectPath { get; set; }
@@ -62,7 +62,10 @@ namespace Emby.Server.Implementations.HttpServer
private readonly bool _enableDualModeSockets;
public List<Action<IRequest, IResponse, object>> RequestFilters { get; set; }
private Dictionary<Type, Type> ServiceOperationsMap = new Dictionary<Type, Type>();
public List<Action<IRequest, IResponse, object>> ResponseFilters { get; set; }
private readonly Dictionary<Type, Type> ServiceOperationsMap = new Dictionary<Type, Type>();
public static HttpListenerHost Instance { get; protected set; }
public HttpListenerHost(IServerApplicationHost applicationHost,
ILogger logger,
@@ -71,6 +74,8 @@ namespace Emby.Server.Implementations.HttpServer
string defaultRedirectPath, INetworkManager networkManager, IMemoryStreamFactory memoryStreamProvider, ITextEncoding textEncoding, ISocketFactory socketFactory, ICryptoProvider cryptoProvider, IJsonSerializer jsonSerializer, IXmlSerializer xmlSerializer, IEnvironmentInfo environment, ICertificate certificate, IStreamFactory streamFactory, Func<Type, Func<string, object>> funcParseFn, bool enableDualModeSockets)
: base()
{
Instance = this;
_appHost = applicationHost;
DefaultRedirectPath = defaultRedirectPath;
_networkManager = networkManager;
@@ -90,6 +95,7 @@ namespace Emby.Server.Implementations.HttpServer
_logger = logger;
RequestFilters = new List<Action<IRequest, IResponse, object>>();
ResponseFilters = new List<Action<IRequest, IResponse, object>>();
}
public string GlobalResponse { get; set; }
@@ -112,7 +118,7 @@ namespace Emby.Server.Implementations.HttpServer
}
}
public override object CreateInstance(Type type)
public object CreateInstance(Type type)
{
return _appHost.CreateInstance(type);
}
@@ -168,12 +174,12 @@ namespace Emby.Server.Implementations.HttpServer
private IHasRequestFilter[] GetRequestFilterAttributes(Type requestDtoType)
{
var attributes = requestDtoType.AllAttributes().OfType<IHasRequestFilter>().ToList();
var attributes = requestDtoType.GetTypeInfo().GetCustomAttributes(true).OfType<IHasRequestFilter>().ToList();
var serviceType = GetServiceTypeByRequest(requestDtoType);
if (serviceType != null)
{
attributes.AddRange(serviceType.AllAttributes().OfType<IHasRequestFilter>());
attributes.AddRange(serviceType.GetTypeInfo().GetCustomAttributes(true).OfType<IHasRequestFilter>());
}
attributes.Sort((x, y) => x.Priority - y.Priority);
@@ -611,7 +617,7 @@ namespace Emby.Server.Implementations.HttpServer
_logger.Error("Path parts empty for PathInfo: {0}, Url: {1}", pathInfo, httpReq.RawUrl);
return null;
}
string contentType;
var restPath = ServiceHandler.FindMatchingRestPath(httpReq.HttpMethod, pathInfo, _logger, out contentType);
@@ -658,8 +664,6 @@ namespace Emby.Server.Implementations.HttpServer
_logger.Info("Calling ServiceStack AppHost.Init");
Instance = this;
ServiceController.Init(this);
var requestFilters = _appHost.GetExports<IRequestFilter>().ToList();
@@ -668,12 +672,12 @@ namespace Emby.Server.Implementations.HttpServer
RequestFilters.Add(filter.Filter);
}
GlobalResponseFilters.Add(new ResponseFilter(_logger).FilterResponse);
ResponseFilters.Add(new ResponseFilter(_logger).FilterResponse);
}
public override RouteAttribute[] GetRouteAttributes(Type requestType)
public RouteAttribute[] GetRouteAttributes(Type requestType)
{
var routes = requestType.AllAttributes<RouteAttribute>();
var routes = requestType.GetTypeInfo().GetCustomAttributes<RouteAttribute>(true).ToList();
var clone = routes.ToList();
foreach (var route in clone)
@@ -703,27 +707,27 @@ namespace Emby.Server.Implementations.HttpServer
return routes.ToArray();
}
public override Func<string, object> GetParseFn(Type propertyType)
public Func<string, object> GetParseFn(Type propertyType)
{
return _funcParseFn(propertyType);
}
public override void SerializeToJson(object o, Stream stream)
public void SerializeToJson(object o, Stream stream)
{
_jsonSerializer.SerializeToStream(o, stream);
}
public override void SerializeToXml(object o, Stream stream)
public void SerializeToXml(object o, Stream stream)
{
_xmlSerializer.SerializeToStream(o, stream);
}
public override object DeserializeXml(Type type, Stream stream)
public object DeserializeXml(Type type, Stream stream)
{
return _xmlSerializer.DeserializeFromStream(type, stream);
}
public override object DeserializeJson(Type type, Stream stream)
public object DeserializeJson(Type type, Stream stream)
{
return _jsonSerializer.DeserializeFromStream(stream, type);
}
@@ -764,7 +768,7 @@ namespace Emby.Server.Implementations.HttpServer
{
if (_disposed) return;
base.Dispose();
Dispose();
lock (_disposeLock)
{
@@ -779,7 +783,7 @@ namespace Emby.Server.Implementations.HttpServer
}
}
public override void Dispose()
public void Dispose()
{
Dispose(true);
GC.SuppressFinalize(this);

2
Emby.Server.Implementations/HttpServer/HttpResultFactory.cs
View File

@@ -204,7 +204,7 @@ namespace Emby.Server.Implementations.HttpServer
using (var ms = new MemoryStream())
{
var contentType = request.ResponseContentType;
var writerFn = RequestHelper.GetResponseWriter(contentType);
var writerFn = RequestHelper.GetResponseWriter(HttpListenerHost.Instance, contentType);
writerFn(dto, ms);

14
Emby.Server.Implementations/Services/RequestHelper.cs
View File

@@ -1,40 +1,40 @@
using System;
using System.IO;
using ServiceStack;
using Emby.Server.Implementations.HttpServer;
namespace Emby.Server.Implementations.Services
{
public class RequestHelper
{
public static Func<Type, Stream, object> GetRequestReader(string contentType)
public static Func<Type, Stream, object> GetRequestReader(HttpListenerHost host, string contentType)
{
switch (GetContentTypeWithoutEncoding(contentType))
{
case "application/xml":
case "text/xml":
case "text/xml; charset=utf-8": //"text/xml; charset=utf-8" also matches xml
return ServiceStackHost.Instance.DeserializeXml;
return host.DeserializeXml;
case "application/json":
case "text/json":
return ServiceStackHost.Instance.DeserializeJson;
return host.DeserializeJson;
}
return null;
}
public static Action<object, Stream> GetResponseWriter(string contentType)
public static Action<object, Stream> GetResponseWriter(HttpListenerHost host, string contentType)
{
switch (GetContentTypeWithoutEncoding(contentType))
{
case "application/xml":
case "text/xml":
case "text/xml; charset=utf-8": //"text/xml; charset=utf-8" also matches xml
return (o, s) => ServiceStackHost.Instance.SerializeToXml(o, s);
return host.SerializeToXml;
case "application/json":
case "text/json":
return (o, s) => ServiceStackHost.Instance.SerializeToJson(o, s);
return host.SerializeToJson;
}
return null;

3
Emby.Server.Implementations/Services/ResponseHelper.cs
View File

@@ -5,6 +5,7 @@ using System.Net;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using Emby.Server.Implementations.HttpServer;
using MediaBrowser.Model.Services;
namespace Emby.Server.Implementations.Services
@@ -161,7 +162,7 @@ namespace Emby.Server.Implementations.Services
public static async Task WriteObject(IRequest request, object result, IResponse response)
{
var contentType = request.ResponseContentType;
var serializer = RequestHelper.GetResponseWriter(contentType);
var serializer = RequestHelper.GetResponseWriter(HttpListenerHost.Instance, contentType);
using (var ms = new MemoryStream())
{

42
Emby.Server.Implementations/Services/ServiceController.cs
View File

@@ -53,28 +53,58 @@ namespace Emby.Server.Implementations.Services
ServiceExecGeneral.CreateServiceRunnersFor(requestType, actions);
var returnMarker = requestType.GetTypeWithGenericTypeDefinitionOf(typeof(IReturn<>));
var returnMarker = GetTypeWithGenericTypeDefinitionOf(requestType, typeof(IReturn<>));
var responseType = returnMarker != null ?
GetGenericArguments(returnMarker)[0]
: mi.ReturnType != typeof(object) && mi.ReturnType != typeof(void) ?
mi.ReturnType
: Type.GetType(requestType.FullName + "Response");
RegisterRestPaths(requestType);
RegisterRestPaths(appHost, requestType);
appHost.AddServiceInfo(serviceType, requestType, responseType);
}
}
private static Type GetTypeWithGenericTypeDefinitionOf(Type type, Type genericTypeDefinition)
{
foreach (var t in type.GetTypeInfo().ImplementedInterfaces)
{
if (t.GetTypeInfo().IsGenericType && t.GetGenericTypeDefinition() == genericTypeDefinition)
{
return t;
}
}
var genericType = FirstGenericType(type);
if (genericType != null && genericType.GetGenericTypeDefinition() == genericTypeDefinition)
{
return genericType;
}
return null;
}
public static Type FirstGenericType(Type type)
{
while (type != null)
{
if (type.GetTypeInfo().IsGenericType)
return type;
type = type.GetTypeInfo().BaseType;
}
return null;
}
public readonly Dictionary<string, List<RestPath>> RestPathMap = new Dictionary<string, List<RestPath>>(StringComparer.OrdinalIgnoreCase);
public void RegisterRestPaths(Type requestType)
public void RegisterRestPaths(HttpListenerHost appHost, Type requestType)
{
var appHost = ServiceStackHost.Instance;
var attrs = appHost.GetRouteAttributes(requestType);
foreach (MediaBrowser.Model.Services.RouteAttribute attr in attrs)
foreach (RouteAttribute attr in attrs)
{
var restPath = new RestPath(requestType, attr.Path, attr.Verbs, attr.Summary, attr.Notes);
var restPath = new RestPath(appHost.CreateInstance, appHost.GetParseFn, requestType, attr.Path, attr.Verbs, attr.Summary, attr.Notes);
if (!restPath.IsValid)
throw new NotSupportedException(string.Format(

24
Emby.Server.Implementations/Services/ServiceHandler.cs
View File

@@ -59,17 +59,17 @@ namespace Emby.Server.Implementations.Services
}
}
protected static object CreateContentTypeRequest(IRequest httpReq, Type requestType, string contentType)
protected static object CreateContentTypeRequest(HttpListenerHost host, IRequest httpReq, Type requestType, string contentType)
{
if (!string.IsNullOrEmpty(contentType) && httpReq.ContentLength > 0)
{
var deserializer = RequestHelper.GetRequestReader(contentType);
var deserializer = RequestHelper.GetRequestReader(host, contentType);
if (deserializer != null)
{
return deserializer(requestType, httpReq.InputStream);
}
}
return ServiceStackHost.Instance.CreateInstance(requestType); //Return an empty DTO, even for empty request bodies
return host.CreateInstance(requestType);
}
public static RestPath FindMatchingRestPath(string httpMethod, string pathInfo, ILogger logger, out string contentType)
@@ -137,7 +137,7 @@ namespace Emby.Server.Implementations.Services
if (ResponseContentType != null)
httpReq.ResponseContentType = ResponseContentType;
var request = httpReq.Dto = CreateRequest(httpReq, restPath, logger);
var request = httpReq.Dto = CreateRequest(appHost, httpReq, restPath, logger);
appHost.ApplyRequestFilters(httpReq, httpRes, request);
@@ -146,7 +146,7 @@ namespace Emby.Server.Implementations.Services
var response = await HandleResponseAsync(rawResponse).ConfigureAwait(false);
// Apply response filters
foreach (var responseFilter in appHost.GlobalResponseFilters)
foreach (var responseFilter in appHost.ResponseFilters)
{
responseFilter(httpReq, httpRes, response);
}
@@ -154,18 +154,18 @@ namespace Emby.Server.Implementations.Services
await ResponseHelper.WriteToResponse(httpRes, httpReq, response).ConfigureAwait(false);
}
public static object CreateRequest(IRequest httpReq, RestPath restPath, ILogger logger)
public static object CreateRequest(HttpListenerHost host, IRequest httpReq, RestPath restPath, ILogger logger)
{
var requestType = restPath.RequestType;
if (RequireqRequestStream(requestType))
{
// Used by IRequiresRequestStream
return CreateRequiresRequestStreamRequest(httpReq, requestType);
return CreateRequiresRequestStreamRequest(host, httpReq, requestType);
}
var requestParams = GetFlattenedRequestParams(httpReq);
return CreateRequest(httpReq, restPath, requestParams);
return CreateRequest(host, httpReq, restPath, requestParams);
}
private static bool RequireqRequestStream(Type requestType)
@@ -175,19 +175,19 @@ namespace Emby.Server.Implementations.Services
return requiresRequestStreamTypeInfo.IsAssignableFrom(requestType.GetTypeInfo());
}
private static IRequiresRequestStream CreateRequiresRequestStreamRequest(IRequest req, Type requestType)
private static IRequiresRequestStream CreateRequiresRequestStreamRequest(HttpListenerHost host, IRequest req, Type requestType)
{
var restPath = GetRoute(req);
var request = ServiceHandler.CreateRequest(req, restPath, GetRequestParams(req), ServiceStackHost.Instance.CreateInstance(requestType));
var request = ServiceHandler.CreateRequest(req, restPath, GetRequestParams(req), host.CreateInstance(requestType));
var rawReq = (IRequiresRequestStream)request;
rawReq.RequestStream = req.InputStream;
return rawReq;
}
public static object CreateRequest(IRequest httpReq, RestPath restPath, Dictionary<string, string> requestParams)
public static object CreateRequest(HttpListenerHost host, IRequest httpReq, RestPath restPath, Dictionary<string, string> requestParams)
{
var requestDto = CreateContentTypeRequest(httpReq, restPath.RequestType, httpReq.ContentType);
var requestDto = CreateContentTypeRequest(host, httpReq, restPath.RequestType, httpReq.ContentType);
return CreateRequest(httpReq, restPath, requestParams, requestDto);
}