Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-11-03 19:17:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1785 from dkanada/compat

Browse Source 
Add mediabrowser route back for now
This commit is contained in:
Vasily 2019-09-25 14:18:21 +03:00 committed by GitHub
commit fc99f1f563
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -94,7 +94,7 @@ namespace Emby.Server.Implementations.HttpServer
/// <returns></returns> /// <returns></returns>
public void ApplyRequestFilters(IRequest req, HttpResponse res, object requestDto) public void ApplyRequestFilters(IRequest req, HttpResponse res, object requestDto)
{ {
//Exec all RequestFilter attributes with Priority < 0 // Exec all RequestFilter attributes with Priority < 0
var attributes = GetRequestFilterAttributes(requestDto.GetType()); var attributes = GetRequestFilterAttributes(requestDto.GetType());
int count = attributes.Count; int count = attributes.Count;
@ -105,7 +105,7 @@ namespace Emby.Server.Implementations.HttpServer
attribute.RequestFilter(req, res, requestDto); attribute.RequestFilter(req, res, requestDto);
} }
//Exec remaining RequestFilter attributes with Priority >= 0 // Exec remaining RequestFilter attributes with Priority >= 0
for (; i < count && attributes[i].Priority >= 0; i++) for (; i < count && attributes[i].Priority >= 0; i++)
{ {
var attribute = attributes[i]; var attribute = attributes[i];
@ -276,9 +276,9 @@ namespace Emby.Server.Implementations.HttpServer
{ {
connection.Dispose(); connection.Dispose();
} }
catch catch (Exception ex)
{ {
_logger.LogError(ex, "Error disposing connection");
} }
} }
} }
@ -603,7 +603,14 @@ namespace Emby.Server.Implementations.HttpServer
Summary = route.Summary Summary = route.Summary
}); });
routes.Add(new RouteAttribute(NormalizeOldRoutePath(route.Path), route.Verbs) routes.Add(new RouteAttribute(NormalizeEmbyRoutePath(route.Path), route.Verbs)
{
Notes = route.Notes,
Priority = route.Priority,
Summary = route.Summary
});
routes.Add(new RouteAttribute(NormalizeMediaBrowserRoutePath(route.Path), route.Verbs)
{ {
Notes = route.Notes, Notes = route.Notes,
Priority = route.Priority, Priority = route.Priority,
@ -645,7 +652,7 @@ namespace Emby.Server.Implementations.HttpServer
} }
// this method was left for compatibility with third party clients // this method was left for compatibility with third party clients
private static string NormalizeOldRoutePath(string path) private static string NormalizeEmbyRoutePath(string path)
{ {
if (path.StartsWith("/", StringComparison.OrdinalIgnoreCase)) if (path.StartsWith("/", StringComparison.OrdinalIgnoreCase))
{ {
@ -655,6 +662,17 @@ namespace Emby.Server.Implementations.HttpServer
return "emby/" + path; return "emby/" + path;
} }
// this method was left for compatibility with third party clients
private static string NormalizeMediaBrowserRoutePath(string path)
{
if (path.StartsWith("/", StringComparison.OrdinalIgnoreCase))
{
return "/mediabrowser" + path;
}
return "mediabrowser/" + path;
}
private static string NormalizeCustomRoutePath(string baseUrl, string path) private static string NormalizeCustomRoutePath(string baseUrl, string path)
{ {
if (path.StartsWith("/", StringComparison.OrdinalIgnoreCase)) if (path.StartsWith("/", StringComparison.OrdinalIgnoreCase))