|
|
@ -126,7 +126,6 @@ namespace Emby.Dlna
|
|
|
|
var builder = new StringBuilder();
|
|
|
|
var builder = new StringBuilder();
|
|
|
|
|
|
|
|
|
|
|
|
builder.AppendLine("No matching device profile found. The default will need to be used.");
|
|
|
|
builder.AppendLine("No matching device profile found. The default will need to be used.");
|
|
|
|
builder.AppendFormat(CultureInfo.InvariantCulture, "DeviceDescription:{0}", profile.DeviceDescription ?? string.Empty).AppendLine();
|
|
|
|
|
|
|
|
builder.AppendFormat(CultureInfo.InvariantCulture, "FriendlyName:{0}", profile.FriendlyName ?? string.Empty).AppendLine();
|
|
|
|
builder.AppendFormat(CultureInfo.InvariantCulture, "FriendlyName:{0}", profile.FriendlyName ?? string.Empty).AppendLine();
|
|
|
|
builder.AppendFormat(CultureInfo.InvariantCulture, "Manufacturer:{0}", profile.Manufacturer ?? string.Empty).AppendLine();
|
|
|
|
builder.AppendFormat(CultureInfo.InvariantCulture, "Manufacturer:{0}", profile.Manufacturer ?? string.Empty).AppendLine();
|
|
|
|
builder.AppendFormat(CultureInfo.InvariantCulture, "ManufacturerUrl:{0}", profile.ManufacturerUrl ?? string.Empty).AppendLine();
|
|
|
|
builder.AppendFormat(CultureInfo.InvariantCulture, "ManufacturerUrl:{0}", profile.ManufacturerUrl ?? string.Empty).AppendLine();
|
|
|
@ -141,17 +140,9 @@ namespace Emby.Dlna
|
|
|
|
|
|
|
|
|
|
|
|
private bool IsMatch(DeviceIdentification deviceInfo, DeviceIdentification profileInfo)
|
|
|
|
private bool IsMatch(DeviceIdentification deviceInfo, DeviceIdentification profileInfo)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (!string.IsNullOrEmpty(profileInfo.DeviceDescription))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
if (deviceInfo.DeviceDescription == null || !IsRegexMatch(deviceInfo.DeviceDescription, profileInfo.DeviceDescription))
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrEmpty(profileInfo.FriendlyName))
|
|
|
|
if (!string.IsNullOrEmpty(profileInfo.FriendlyName))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (deviceInfo.FriendlyName == null || !IsRegexMatch(deviceInfo.FriendlyName, profileInfo.FriendlyName))
|
|
|
|
if (deviceInfo.FriendlyName == null || !IsRegexOrSubstringMatch(deviceInfo.FriendlyName, profileInfo.FriendlyName))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -159,7 +150,7 @@ namespace Emby.Dlna
|
|
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrEmpty(profileInfo.Manufacturer))
|
|
|
|
if (!string.IsNullOrEmpty(profileInfo.Manufacturer))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (deviceInfo.Manufacturer == null || !IsRegexMatch(deviceInfo.Manufacturer, profileInfo.Manufacturer))
|
|
|
|
if (deviceInfo.Manufacturer == null || !IsRegexOrSubstringMatch(deviceInfo.Manufacturer, profileInfo.Manufacturer))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -167,7 +158,7 @@ namespace Emby.Dlna
|
|
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrEmpty(profileInfo.ManufacturerUrl))
|
|
|
|
if (!string.IsNullOrEmpty(profileInfo.ManufacturerUrl))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (deviceInfo.ManufacturerUrl == null || !IsRegexMatch(deviceInfo.ManufacturerUrl, profileInfo.ManufacturerUrl))
|
|
|
|
if (deviceInfo.ManufacturerUrl == null || !IsRegexOrSubstringMatch(deviceInfo.ManufacturerUrl, profileInfo.ManufacturerUrl))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -175,7 +166,7 @@ namespace Emby.Dlna
|
|
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrEmpty(profileInfo.ModelDescription))
|
|
|
|
if (!string.IsNullOrEmpty(profileInfo.ModelDescription))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (deviceInfo.ModelDescription == null || !IsRegexMatch(deviceInfo.ModelDescription, profileInfo.ModelDescription))
|
|
|
|
if (deviceInfo.ModelDescription == null || !IsRegexOrSubstringMatch(deviceInfo.ModelDescription, profileInfo.ModelDescription))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -183,7 +174,7 @@ namespace Emby.Dlna
|
|
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrEmpty(profileInfo.ModelName))
|
|
|
|
if (!string.IsNullOrEmpty(profileInfo.ModelName))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (deviceInfo.ModelName == null || !IsRegexMatch(deviceInfo.ModelName, profileInfo.ModelName))
|
|
|
|
if (deviceInfo.ModelName == null || !IsRegexOrSubstringMatch(deviceInfo.ModelName, profileInfo.ModelName))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -191,7 +182,7 @@ namespace Emby.Dlna
|
|
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrEmpty(profileInfo.ModelNumber))
|
|
|
|
if (!string.IsNullOrEmpty(profileInfo.ModelNumber))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (deviceInfo.ModelNumber == null || !IsRegexMatch(deviceInfo.ModelNumber, profileInfo.ModelNumber))
|
|
|
|
if (deviceInfo.ModelNumber == null || !IsRegexOrSubstringMatch(deviceInfo.ModelNumber, profileInfo.ModelNumber))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -199,7 +190,7 @@ namespace Emby.Dlna
|
|
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrEmpty(profileInfo.ModelUrl))
|
|
|
|
if (!string.IsNullOrEmpty(profileInfo.ModelUrl))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (deviceInfo.ModelUrl == null || !IsRegexMatch(deviceInfo.ModelUrl, profileInfo.ModelUrl))
|
|
|
|
if (deviceInfo.ModelUrl == null || !IsRegexOrSubstringMatch(deviceInfo.ModelUrl, profileInfo.ModelUrl))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -207,7 +198,7 @@ namespace Emby.Dlna
|
|
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrEmpty(profileInfo.SerialNumber))
|
|
|
|
if (!string.IsNullOrEmpty(profileInfo.SerialNumber))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (deviceInfo.SerialNumber == null || !IsRegexMatch(deviceInfo.SerialNumber, profileInfo.SerialNumber))
|
|
|
|
if (deviceInfo.SerialNumber == null || !IsRegexOrSubstringMatch(deviceInfo.SerialNumber, profileInfo.SerialNumber))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -216,11 +207,11 @@ namespace Emby.Dlna
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private bool IsRegexMatch(string input, string pattern)
|
|
|
|
private bool IsRegexOrSubstringMatch(string input, string pattern)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
try
|
|
|
|
try
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return Regex.IsMatch(input, pattern);
|
|
|
|
return input.Contains(pattern, StringComparison.OrdinalIgnoreCase) || Regex.IsMatch(input, pattern, RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
catch (ArgumentException ex)
|
|
|
|
catch (ArgumentException ex)
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -511,8 +502,7 @@ namespace Emby.Dlna
|
|
|
|
|
|
|
|
|
|
|
|
public string GetServerDescriptionXml(IHeaderDictionary headers, string serverUuId, string serverAddress)
|
|
|
|
public string GetServerDescriptionXml(IHeaderDictionary headers, string serverUuId, string serverAddress)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var profile = GetProfile(headers) ??
|
|
|
|
var profile = GetDefaultProfile();
|
|
|
|
GetDefaultProfile();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
var serverId = _appHost.SystemId;
|
|
|
|
var serverId = _appHost.SystemId;
|
|
|
|
|
|
|
|
|
|
|
|