alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-10 01:38:49 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Changed testing

Browse Source
This commit is contained in:
BaronGreenback
2021-04-20 18:04:16 +01:00
parent 092c610fbf
commit a99caa0daa
3 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Emby.Dlna/DlnaManager.cs
View File

@@ -156,7 +156,7 @@ namespace Emby.Dlna
/// <param name="deviceInfo">The <see cref="DeviceIdentification"/> of the device.</param>
/// <param name="profileInfo">The <see cref="DeviceIdentification"/> of the profile.</param>
/// <returns><b>True</b> if they match.</returns>
public static bool IsMatch(DeviceIdentification deviceInfo, DeviceIdentification profileInfo)
public bool IsMatch(DeviceIdentification deviceInfo, DeviceIdentification profileInfo)
{
return IsRegexOrSubstringMatch(deviceInfo.FriendlyName, profileInfo.FriendlyName)
&& IsRegexOrSubstringMatch(deviceInfo.Manufacturer, profileInfo.Manufacturer)
@@ -168,7 +168,7 @@ namespace Emby.Dlna
&& IsRegexOrSubstringMatch(deviceInfo.SerialNumber, profileInfo.SerialNumber);
}
public static bool IsRegexOrSubstringMatch(string input, string pattern)
private bool IsRegexOrSubstringMatch(string input, string pattern)
{
if (string.IsNullOrEmpty(pattern))
{
@@ -182,15 +182,8 @@ namespace Emby.Dlna
return false;
}
try
{
return input.Equals(pattern, StringComparison.OrdinalIgnoreCase)
|| Regex.IsMatch(input, pattern, RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
}
catch (ArgumentException ex)
{
throw new ArgumentException("Error evaluating regex pattern " + pattern, ex);
}
return input.Equals(pattern, StringComparison.OrdinalIgnoreCase)
|| Regex.IsMatch(input, pattern, RegexOptions.IgnoreCase | RegexOptions.CultureInvariant);
}
public DeviceProfile GetProfile(IHeaderDictionary headers)