|
|
@ -143,7 +143,7 @@ namespace Emby.Dlna
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (!string.IsNullOrEmpty(profileInfo.DeviceDescription))
|
|
|
|
if (!string.IsNullOrEmpty(profileInfo.DeviceDescription))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (deviceInfo.DeviceDescription == null || !IsRegexMatch(deviceInfo.DeviceDescription, profileInfo.DeviceDescription))
|
|
|
|
if (deviceInfo.DeviceDescription == null || !IsPropertyMatch(deviceInfo.DeviceDescription, profileInfo.DeviceDescription))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -151,7 +151,7 @@ namespace Emby.Dlna
|
|
|
|
|
|
|
|
|
|
|
|
if (!string.IsNullOrEmpty(profileInfo.FriendlyName))
|
|
|
|
if (!string.IsNullOrEmpty(profileInfo.FriendlyName))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (deviceInfo.FriendlyName == null || !IsRegexMatch(deviceInfo.FriendlyName, profileInfo.FriendlyName))
|
|
|
|
if (deviceInfo.FriendlyName == null || !IsPropertyMatch(deviceInfo.FriendlyName, profileInfo.FriendlyName))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -159,7 +159,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 || !IsPropertyMatch(deviceInfo.Manufacturer, profileInfo.Manufacturer))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -167,7 +167,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 || !IsPropertyMatch(deviceInfo.ManufacturerUrl, profileInfo.ManufacturerUrl))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -175,7 +175,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 || !IsPropertyMatch(deviceInfo.ModelDescription, profileInfo.ModelDescription))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -183,7 +183,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 || !IsPropertyMatch(deviceInfo.ModelName, profileInfo.ModelName))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -191,7 +191,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 || !IsPropertyMatch(deviceInfo.ModelNumber, profileInfo.ModelNumber))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -199,7 +199,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 || !IsPropertyMatch(deviceInfo.ModelUrl, profileInfo.ModelUrl))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -207,7 +207,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 || !IsPropertyMatch(deviceInfo.SerialNumber, profileInfo.SerialNumber))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -216,7 +216,7 @@ namespace Emby.Dlna
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
private bool IsRegexMatch(string input, string pattern)
|
|
|
|
private bool IsPropertyMatch(string input, string pattern)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
try
|
|
|
|
try
|
|
|
|
{
|
|
|
|
{
|
|
|
|