Changes as requested

sjww233 · Apr 21, 2021 · 53e1b30 · 53e1b30
1 parent 39eb5da
commit 53e1b30
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 11 deletions.
diff --git a/Emby.Dlna/DlnaManager.cs b/Emby.Dlna/DlnaManager.cs
@@ -150,13 +150,13 @@ private void LogUnmatchedProfile(DeviceIdentification profile)
         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 → ...s/Jellyfin.Dlna.Tests/DlnaManagerTests.cs b/tests/Jellyfin.Dlna.Tests/ProfileTester.cs → ...s/Jellyfin.Dlna.Tests/DlnaManagerTests.cs
@@ -46,7 +46,7 @@ public void IsMatch_GivenMatchingName_ReturnsTrue()
                 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 @@ public void IsMatch_GivenMatchingName_ReturnsTrue()
                 }
             };
 
-            Assert.True(GetManager().IsMatch(device.ToDeviceIdentification(), profile2.Identification));
+            var deviceMatch = GetManager().IsMatch(device.ToDeviceIdentification(), profile2.Identification);
+            Assert.True(deviceMatch);
         }
 
         [Fact]
@@ -90,7 +91,7 @@ public void IsMatch_GivenNamesAndManufacturersDoNotMatch_ReturnsFalse()
                 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 @@ public void IsMatch_GivenNamesAndManufacturersDoNotMatch_ReturnsFalse()
                 }
             };
 
-            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);
         }
     }
 }