From 53e1b302cc08181c7909719df0cd837fd4b182f4 Mon Sep 17 00:00:00 2001
From: BaronGreenback <jimcartlidge@yahoo.co.uk>
Date: Wed, 21 Apr 2021 10:18:29 +0100
Subject: [PATCH] Changes as requested

---
 Emby.Dlna/DlnaManager.cs                      | 14 ++++-----
 .../{ProfileTester.cs => DlnaManagerTests.cs} | 31 ++++++++++++++++---
 2 files changed, 34 insertions(+), 11 deletions(-)
 rename tests/Jellyfin.Dlna.Tests/{ProfileTester.cs => DlnaManagerTests.cs} (78%)

diff --git a/Emby.Dlna/DlnaManager.cs b/Emby.Dlna/DlnaManager.cs
index 57a6c20598..5f2be07cf3 100644
--- a/Emby.Dlna/DlnaManager.cs
+++ b/Emby.Dlna/DlnaManager.cs
@@ -150,13 +150,13 @@ namespace Emby.Dlna
         public bool IsMatch(DeviceIdentification deviceInfo, DeviceIdentification profileInfo)
         {
             return IsRegexOrSubstringMatch(deviceInfo.FriendlyName, profileInfo.FriendlyName)
-               && IsRegexOrSubstringMatch(deviceInfo.Manufacturer, profileInfo.Manufacturer)
-               && IsRegexOrSubstringMatch(deviceInfo.ManufacturerUrl, profileInfo.ManufacturerUrl)
-               && IsRegexOrSubstringMatch(deviceInfo.ModelDescription, profileInfo.ModelDescription)
-               && IsRegexOrSubstringMatch(deviceInfo.ModelName, profileInfo.ModelName)
-               && IsRegexOrSubstringMatch(deviceInfo.ModelNumber, profileInfo.ModelNumber)
-               && IsRegexOrSubstringMatch(deviceInfo.ModelUrl, profileInfo.ModelUrl)
-               && IsRegexOrSubstringMatch(deviceInfo.SerialNumber, profileInfo.SerialNumber);
+                && IsRegexOrSubstringMatch(deviceInfo.Manufacturer, profileInfo.Manufacturer)
+                && IsRegexOrSubstringMatch(deviceInfo.ManufacturerUrl, profileInfo.ManufacturerUrl)
+                && IsRegexOrSubstringMatch(deviceInfo.ModelDescription, profileInfo.ModelDescription)
+                && IsRegexOrSubstringMatch(deviceInfo.ModelName, profileInfo.ModelName)
+                && IsRegexOrSubstringMatch(deviceInfo.ModelNumber, profileInfo.ModelNumber)
+                && IsRegexOrSubstringMatch(deviceInfo.ModelUrl, profileInfo.ModelUrl)
+                && IsRegexOrSubstringMatch(deviceInfo.SerialNumber, profileInfo.SerialNumber);
         }
 
         private bool IsRegexOrSubstringMatch(string input, string pattern)
diff --git a/tests/Jellyfin.Dlna.Tests/ProfileTester.cs b/tests/Jellyfin.Dlna.Tests/DlnaManagerTests.cs
similarity index 78%
rename from tests/Jellyfin.Dlna.Tests/ProfileTester.cs
rename to tests/Jellyfin.Dlna.Tests/DlnaManagerTests.cs
index 004933ca95..087d43a779 100644
--- a/tests/Jellyfin.Dlna.Tests/ProfileTester.cs
+++ b/tests/Jellyfin.Dlna.Tests/DlnaManagerTests.cs
@@ -46,7 +46,7 @@ namespace Jellyfin.Dlna.Tests
                 ModelDescription = "LG WebOSTV DMRplus",
                 ModelName = "LG TV",
                 ModelNumber = "1.0",
-                Identification = new DeviceIdentification()
+                Identification = new ()
                 {
                     FriendlyName = "My Device",
                     Manufacturer = "LG Electronics",
@@ -69,7 +69,8 @@ namespace Jellyfin.Dlna.Tests
                 }
             };
 
-            Assert.True(GetManager().IsMatch(device.ToDeviceIdentification(), profile2.Identification));
+            var deviceMatch = GetManager().IsMatch(device.ToDeviceIdentification(), profile2.Identification);
+            Assert.True(deviceMatch);
         }
 
         [Fact]
@@ -90,7 +91,7 @@ namespace Jellyfin.Dlna.Tests
                 ModelDescription = "LG WebOSTV DMRplus",
                 ModelName = "LG TV",
                 ModelNumber = "1.0",
-                Identification = new DeviceIdentification()
+                Identification = new ()
                 {
                     FriendlyName = "My Device",
                     Manufacturer = "LG Electronics",
@@ -101,7 +102,29 @@ namespace Jellyfin.Dlna.Tests
                 }
             };
 
-            Assert.False(GetManager().IsMatch(device.ToDeviceIdentification(), profile.Identification));
+            var deviceMatch = GetManager().IsMatch(device.ToDeviceIdentification(), profile.Identification);
+
+            Assert.False(deviceMatch);
+        }
+
+        [Fact]
+        public void IsMatch_GivenNamesAndRegExMatch_ReturnsTrue()
+        {
+            var device = new DeviceInfo()
+            {
+                Name = "My Device"
+            };
+
+            var profile = new DeviceProfile()
+            {
+                Name = "Test Profile",
+                FriendlyName = "My .*",
+                Identification = new ()
+            };
+
+            var deviceMatch = GetManager().IsMatch(device.ToDeviceIdentification(), profile.Identification);
+
+            Assert.True(deviceMatch);
         }
     }
 }