mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-07-21 21:20:39 +02:00
Merge pull request #4162 from BaronGreenback/DlnaServerBaseUrlFix
Fix for #4161: BaseUrl in DLNA
This commit is contained in:
commit
43add833cc
|
@ -235,13 +235,13 @@ namespace Emby.Dlna.Server
|
||||||
.Append(SecurityElement.Escape(service.ServiceId ?? string.Empty))
|
.Append(SecurityElement.Escape(service.ServiceId ?? string.Empty))
|
||||||
.Append("</serviceId>");
|
.Append("</serviceId>");
|
||||||
builder.Append("<SCPDURL>")
|
builder.Append("<SCPDURL>")
|
||||||
.Append(BuildUrl(service.ScpdUrl))
|
.Append(BuildUrl(service.ScpdUrl, true))
|
||||||
.Append("</SCPDURL>");
|
.Append("</SCPDURL>");
|
||||||
builder.Append("<controlURL>")
|
builder.Append("<controlURL>")
|
||||||
.Append(BuildUrl(service.ControlUrl))
|
.Append(BuildUrl(service.ControlUrl, true))
|
||||||
.Append("</controlURL>");
|
.Append("</controlURL>");
|
||||||
builder.Append("<eventSubURL>")
|
builder.Append("<eventSubURL>")
|
||||||
.Append(BuildUrl(service.EventSubUrl))
|
.Append(BuildUrl(service.EventSubUrl, true))
|
||||||
.Append("</eventSubURL>");
|
.Append("</eventSubURL>");
|
||||||
|
|
||||||
builder.Append("</service>");
|
builder.Append("</service>");
|
||||||
|
@ -250,7 +250,13 @@ namespace Emby.Dlna.Server
|
||||||
builder.Append("</serviceList>");
|
builder.Append("</serviceList>");
|
||||||
}
|
}
|
||||||
|
|
||||||
private string BuildUrl(string url)
|
/// <summary>
|
||||||
|
/// Builds a valid url for inclusion in the xml.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="url">Url to include.</param>
|
||||||
|
/// <param name="absoluteUrl">Optional. When set to true, the absolute url is always used.</param>
|
||||||
|
/// <returns>The url to use for the element.</returns>
|
||||||
|
private string BuildUrl(string url, bool absoluteUrl = false)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(url))
|
if (string.IsNullOrEmpty(url))
|
||||||
{
|
{
|
||||||
|
@ -261,7 +267,7 @@ namespace Emby.Dlna.Server
|
||||||
|
|
||||||
url = "/dlna/" + _serverUdn + "/" + url;
|
url = "/dlna/" + _serverUdn + "/" + url;
|
||||||
|
|
||||||
if (EnableAbsoluteUrls)
|
if (EnableAbsoluteUrls || absoluteUrl)
|
||||||
{
|
{
|
||||||
url = _serverAddress.TrimEnd('/') + url;
|
url = _serverAddress.TrimEnd('/') + url;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue