From b14d6d0417b57adcd4eb7587401827b1bf2bba42 Mon Sep 17 00:00:00 2001 From: Bond-009 Date: Wed, 13 Nov 2019 10:11:45 +0100 Subject: Fix GetPathValue function --- MediaBrowser.Api/BaseApiService.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'MediaBrowser.Api/BaseApiService.cs') diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs index 49f8c6ace..328bda50f 100644 --- a/MediaBrowser.Api/BaseApiService.cs +++ b/MediaBrowser.Api/BaseApiService.cs @@ -299,8 +299,9 @@ namespace MediaBrowser.Api var first = pathInfo[0]; // backwards compatibility - if (string.Equals(first, "mediabrowser", StringComparison.OrdinalIgnoreCase) || - string.Equals(first, "emby", StringComparison.OrdinalIgnoreCase)) + if (string.Equals(first, "mediabrowser", StringComparison.OrdinalIgnoreCase) + || string.Equals(first, "emby", StringComparison.OrdinalIgnoreCase) + || string.Equals(first, ApiEntryPoint.Instance.ConfigurationManager.Configuration.BaseUrl)) { index++; } -- cgit v1.2.3 From aea4ef94713cc6806dc3bfc2bb31b8f05160e4e7 Mon Sep 17 00:00:00 2001 From: Bond-009 Date: Wed, 13 Nov 2019 10:35:55 +0100 Subject: Fix logic --- MediaBrowser.Api/BaseApiService.cs | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'MediaBrowser.Api/BaseApiService.cs') diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs index 328bda50f..55e25e079 100644 --- a/MediaBrowser.Api/BaseApiService.cs +++ b/MediaBrowser.Api/BaseApiService.cs @@ -298,12 +298,24 @@ namespace MediaBrowser.Api var pathInfo = Parse(Request.PathInfo); var first = pathInfo[0]; + string baseUrl = ApiEntryPoint.Instance.ConfigurationManager.Configuration.BaseUrl; + // backwards compatibility - if (string.Equals(first, "mediabrowser", StringComparison.OrdinalIgnoreCase) - || string.Equals(first, "emby", StringComparison.OrdinalIgnoreCase) - || string.Equals(first, ApiEntryPoint.Instance.ConfigurationManager.Configuration.BaseUrl)) + if (baseUrl.Length == 0 + && (string.Equals(first, "mediabrowser", StringComparison.OrdinalIgnoreCase) + || string.Equals(first, "emby", StringComparison.OrdinalIgnoreCase))) + { + index++; + } + else if (string.Equals(first, baseUrl)) { index++; + var second = pathInfo[1]; + if (string.Equals(second, "mediabrowser", StringComparison.OrdinalIgnoreCase) + || string.Equals(second, "emby", StringComparison.OrdinalIgnoreCase)) + { + index++; + } } return pathInfo[index]; -- cgit v1.2.3 From d161b9cbfcb9e149a2d4c9acfb5bae0b7ee333e3 Mon Sep 17 00:00:00 2001 From: Bond-009 Date: Wed, 13 Nov 2019 16:40:34 +0100 Subject: Fix GetPathValue function for DLNA service --- Emby.Dlna/Api/DlnaServerService.cs | 33 +++++++++++++++++++++++++-------- MediaBrowser.Api/BaseApiService.cs | 1 - 2 files changed, 25 insertions(+), 9 deletions(-) (limited to 'MediaBrowser.Api/BaseApiService.cs') diff --git a/Emby.Dlna/Api/DlnaServerService.cs b/Emby.Dlna/Api/DlnaServerService.cs index 8bf3797f8..2c9be4bff 100644 --- a/Emby.Dlna/Api/DlnaServerService.cs +++ b/Emby.Dlna/Api/DlnaServerService.cs @@ -6,6 +6,7 @@ using System.Text; using System.Threading.Tasks; using Emby.Dlna.Main; using MediaBrowser.Common.Extensions; +using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Dlna; using MediaBrowser.Controller.Net; using MediaBrowser.Model.Services; @@ -108,12 +109,13 @@ namespace Emby.Dlna.Api public class DlnaServerService : IService, IRequiresRequest { - private readonly IDlnaManager _dlnaManager; - private const string XMLContentType = "text/xml; charset=UTF-8"; + private readonly IDlnaManager _dlnaManager; + private readonly IHttpResultFactory _resultFactory; + private readonly IServerConfigurationManager _configurationManager; + public IRequest Request { get; set; } - private IHttpResultFactory _resultFactory; private IContentDirectory ContentDirectory => DlnaEntryPoint.Current.ContentDirectory; @@ -121,10 +123,14 @@ namespace Emby.Dlna.Api private IMediaReceiverRegistrar MediaReceiverRegistrar => DlnaEntryPoint.Current.MediaReceiverRegistrar; - public DlnaServerService(IDlnaManager dlnaManager, IHttpResultFactory httpResultFactory) + public DlnaServerService( + IDlnaManager dlnaManager, + IHttpResultFactory httpResultFactory, + IServerConfigurationManager configurationManager) { _dlnaManager = dlnaManager; _resultFactory = httpResultFactory; + _configurationManager = configurationManager; } private string GetHeader(string name) @@ -205,14 +211,25 @@ namespace Emby.Dlna.Api var pathInfo = Parse(Request.PathInfo); var first = pathInfo[0]; + string baseUrl = _configurationManager.Configuration.BaseUrl; + // backwards compatibility - // TODO: Work out what this is doing. - if (string.Equals(first, "mediabrowser", StringComparison.OrdinalIgnoreCase) || - string.Equals(first, "emby", StringComparison.OrdinalIgnoreCase) || - string.Equals(first, "jellyfin", StringComparison.OrdinalIgnoreCase)) + if (baseUrl.Length == 0 + && (string.Equals(first, "mediabrowser", StringComparison.OrdinalIgnoreCase) + || string.Equals(first, "emby", StringComparison.OrdinalIgnoreCase))) { index++; } + else if (string.Equals(first, baseUrl)) + { + index++; + var second = pathInfo[1]; + if (string.Equals(second, "mediabrowser", StringComparison.OrdinalIgnoreCase) + || string.Equals(second, "emby", StringComparison.OrdinalIgnoreCase)) + { + index++; + } + } return pathInfo[index]; } diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs index 55e25e079..e8ecf37d4 100644 --- a/MediaBrowser.Api/BaseApiService.cs +++ b/MediaBrowser.Api/BaseApiService.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Linq; using MediaBrowser.Controller.Dto; using MediaBrowser.Controller.Entities; -- cgit v1.2.3 From 5ee070eb292e1588e9482e0f73e067c85c956ca2 Mon Sep 17 00:00:00 2001 From: Bond_009 Date: Sun, 17 Nov 2019 19:53:12 +0100 Subject: Remove leading / from baseurl --- Emby.Dlna/Api/DlnaServerService.cs | 2 +- MediaBrowser.Api/BaseApiService.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'MediaBrowser.Api/BaseApiService.cs') diff --git a/Emby.Dlna/Api/DlnaServerService.cs b/Emby.Dlna/Api/DlnaServerService.cs index 2c9be4bff..1f137e620 100644 --- a/Emby.Dlna/Api/DlnaServerService.cs +++ b/Emby.Dlna/Api/DlnaServerService.cs @@ -220,7 +220,7 @@ namespace Emby.Dlna.Api { index++; } - else if (string.Equals(first, baseUrl)) + else if (string.Equals(first, baseUrl.Remove(0, 1))) { index++; var second = pathInfo[1]; diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs index e8ecf37d4..311105596 100644 --- a/MediaBrowser.Api/BaseApiService.cs +++ b/MediaBrowser.Api/BaseApiService.cs @@ -306,7 +306,7 @@ namespace MediaBrowser.Api { index++; } - else if (string.Equals(first, baseUrl)) + else if (string.Equals(first, baseUrl.Remove(0, 1))) { index++; var second = pathInfo[1]; -- cgit v1.2.3 From 602ebe3fdb8baf90343d0bc7840878e8ab5e260b Mon Sep 17 00:00:00 2001 From: Bond_009 Date: Sat, 23 Nov 2019 22:50:37 +0100 Subject: Fix baseurl (attempt #2) --- MediaBrowser.Api/BaseApiService.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'MediaBrowser.Api/BaseApiService.cs') diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs index 311105596..5f1f6c5b1 100644 --- a/MediaBrowser.Api/BaseApiService.cs +++ b/MediaBrowser.Api/BaseApiService.cs @@ -300,11 +300,13 @@ namespace MediaBrowser.Api string baseUrl = ApiEntryPoint.Instance.ConfigurationManager.Configuration.BaseUrl; // backwards compatibility - if (baseUrl.Length == 0 - && (string.Equals(first, "mediabrowser", StringComparison.OrdinalIgnoreCase) - || string.Equals(first, "emby", StringComparison.OrdinalIgnoreCase))) + if (baseUrl.Length == 0) { - index++; + if (string.Equals(first, "mediabrowser", StringComparison.OrdinalIgnoreCase) + || string.Equals(first, "emby", StringComparison.OrdinalIgnoreCase)) + { + index++; + } } else if (string.Equals(first, baseUrl.Remove(0, 1))) { -- cgit v1.2.3