Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update DescriptionXmlBuilder.cs

Browse Source
This commit is contained in:
BaronGreenback 2020-09-16 12:08:23 +01:00 committed by GitHub
parent c2e2e5ac0c
commit a6400d12c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
Emby.Dlna/Server/DescriptionXmlBuilder.cs
View File

@ -4,8 +4,9 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.Linq; using System.Linq;
using System.Security; using System.Security;a
using System.Text; using System.Text;
using Emby.Dlna.Common;
using MediaBrowser.Model.Dlna; using MediaBrowser.Model.Dlna;
namespace Emby.Dlna.Server namespace Emby.Dlna.Server
@ -19,9 +20,8 @@ namespace Emby.Dlna.Server
private readonly string _serverAddress; private readonly string _serverAddress;
private readonly string _serverName; private readonly string _serverName;
private readonly string _serverId; private readonly string _serverId;
private readonly string _customName;
public DescriptionXmlBuilder(DeviceProfile profile, string serverUdn, string serverAddress, string serverName, string serverId, string customName) public DescriptionXmlBuilder(DeviceProfile profile, string serverUdn, string serverAddress, string serverName, string serverId)
{ {
if (string.IsNullOrEmpty(serverUdn)) if (string.IsNullOrEmpty(serverUdn))
{ {
@ -38,7 +38,6 @@ namespace Emby.Dlna.Server
_serverAddress = serverAddress; _serverAddress = serverAddress;
_serverName = serverName; _serverName = serverName;
_serverId = serverId; _serverId = serverId;
_customName = customName;
} }
private static bool EnableAbsoluteUrls => false; private static bool EnableAbsoluteUrls => false;
@ -169,12 +168,7 @@ namespace Emby.Dlna.Server
{ {
if (string.IsNullOrEmpty(_profile.FriendlyName)) if (string.IsNullOrEmpty(_profile.FriendlyName))
{ {
if (string.IsNullOrEmpty(_customName)) return "Jellyfin - " + _serverName;
{
return "Jellyfin - " + _serverName;
}
return _customName;
} }
var characterList = new List<char>(); var characterList = new List<char>();
@ -281,7 +275,7 @@ namespace Emby.Dlna.Server
return SecurityElement.Escape(url); return SecurityElement.Escape(url);
} }
private static IEnumerable<DeviceIcon> GetIcons() private IEnumerable<DeviceIcon> GetIcons()
=> new[] => new[]
{ {
new DeviceIcon new DeviceIcon
@ -341,26 +335,25 @@ namespace Emby.Dlna.Server
private IEnumerable<DeviceService> GetServices() private IEnumerable<DeviceService> GetServices()
{ {
var list = new List<DeviceService> var list = new List<DeviceService>();
{
new DeviceService
{
ServiceType = "urn:schemas-upnp-org:service:ContentDirectory:1",
ServiceId = "urn:upnp-org:serviceId:ContentDirectory",
ScpdUrl = "contentdirectory/contentdirectory.xml",
ControlUrl = "contentdirectory/control",
EventSubUrl = "contentdirectory/events"
},
new DeviceService list.Add(new DeviceService
{ {
ServiceType = "urn:schemas-upnp-org:service:ConnectionManager:1", ServiceType = "urn:schemas-upnp-org:service:ContentDirectory:1",
ServiceId = "urn:upnp-org:serviceId:ConnectionManager", ServiceId = "urn:upnp-org:serviceId:ContentDirectory",
ScpdUrl = "connectionmanager/connectionmanager.xml", ScpdUrl = "contentdirectory/contentdirectory.xml",
ControlUrl = "connectionmanager/control", ControlUrl = "contentdirectory/control",
EventSubUrl = "connectionmanager/events" EventSubUrl = "contentdirectory/events"
} });
};
list.Add(new DeviceService
{
ServiceType = "urn:schemas-upnp-org:service:ConnectionManager:1",
ServiceId = "urn:upnp-org:serviceId:ConnectionManager",
ScpdUrl = "connectionmanager/connectionmanager.xml",
ControlUrl = "connectionmanager/control",
EventSubUrl = "connectionmanager/events"
});
if (_profile.EnableMSMediaReceiverRegistrar) if (_profile.EnableMSMediaReceiverRegistrar)
{ {