From 8d1a9f98afa0b8ad74b3be4507d8f3158840c910 Mon Sep 17 00:00:00 2001
From: Taloth Saldono <Taloth@users.noreply.github.com>
Date: Tue, 3 Aug 2021 21:59:30 +0200
Subject: [PATCH] Simplified regex a bit.

(cherry picked from commit f107ea5678a6a3153113fd6a87a0ef77c20ab216)
---
 .../ReservedDeviceNameFixture.cs              | 33 ++++++++++---------
 .../Organizer/FileNameBuilder.cs              |  2 +-
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/ReservedDeviceNameFixture.cs b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/ReservedDeviceNameFixture.cs
index 383fbf64f..6459927ff 100644
--- a/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/ReservedDeviceNameFixture.cs
+++ b/src/NzbDrone.Core.Test/OrganizerTests/FileNameBuilderTests/ReservedDeviceNameFixture.cs
@@ -1,19 +1,14 @@
 using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
 using System.Linq;
-using System.Threading;
 using FizzWare.NBuilder;
 using FluentAssertions;
-using Moq;
 using NUnit.Framework;
+using NzbDrone.Core.CustomFormats;
 using NzbDrone.Core.MediaFiles;
-using NzbDrone.Core.MediaFiles.MediaInfo;
 using NzbDrone.Core.Movies;
 using NzbDrone.Core.Organizer;
 using NzbDrone.Core.Qualities;
 using NzbDrone.Core.Test.Framework;
-using NzbDrone.Test.Common;
 
 namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
 {
@@ -43,26 +38,32 @@ namespace NzbDrone.Core.Test.OrganizerTests.FileNameBuilderTests
             Mocker.GetMock<IQualityDefinitionService>()
                 .Setup(v => v.Get(Moq.It.IsAny<Quality>()))
                 .Returns<Quality>(v => Quality.DefaultQualityDefinitions.First(c => c.Quality == v));
+
+            Mocker.GetMock<ICustomFormatService>()
+                .Setup(v => v.All())
+                .Returns(new List<CustomFormat>());
         }
 
-        [Test]
-        public void should_replace_reserved_device_name_in_movies_folder()
+        [TestCase("Con Game", 2021, "Con_Game (2021)")]
+        [TestCase("Com1 Sat", 2021, "Com1_Sat (2021)")]
+        public void should_replace_reserved_device_name_in_movies_folder(string title, int year, string expected)
         {
-            _movie.Title = "Con Man";
-            _movie.Year = 2021;
+            _movie.Title = title;
+            _movie.Year = year;
             _namingConfig.MovieFolderFormat = "{Movie.Title} ({Release Year})";
 
-            Subject.GetMovieFolder(_movie).Should().Be("Con_Man (2021)");
+            Subject.GetMovieFolder(_movie).Should().Be($"{expected}");
         }
 
-        [Test]
-        public void should_replace_reserved_device_name_in_file_name()
+        [TestCase("Con Game", 2021, "Con_Game (2021)")]
+        [TestCase("Com1 Sat", 2021, "Com1_Sat (2021)")]
+        public void should_replace_reserved_device_name_in_file_name(string title, int year, string expected)
         {
-            _movie.Title = "Con Man";
-            _movie.Year = 2021;
+            _movie.Title = title;
+            _movie.Year = year;
             _namingConfig.StandardMovieFormat = "{Movie.Title} ({Release Year})";
 
-            Subject.BuildFileName(_movie, _movieFile).Should().Be("Con_Man (2021)");
+            Subject.BuildFileName(_movie, _movieFile).Should().Be($"{expected}");
         }
     }
 }
diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
index 3e6d91a1a..3224dc013 100644
--- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
+++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs
@@ -67,7 +67,7 @@ namespace NzbDrone.Core.Organizer
 
         private static readonly Regex TitlePrefixRegex = new Regex(@"^(The|An|A) (.*?)((?: *\([^)]+\))*)$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
-        private static readonly Regex ReservedDeviceNamesRegex = new Regex(@"^(?:aux|com1|com2|com3|com4|com5|com6|com7|com8|com9|con|lpt1|lpt2|lpt3|lpt4|lpt5|lpt6|lpt7|lpt8|lpt9|nul|prn)\.", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private static readonly Regex ReservedDeviceNamesRegex = new Regex(@"^(?:aux|com[1-9]|con|lpt[1-9]|nul|prn)\.", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         public FileNameBuilder(INamingConfigService namingConfigService,
                                IQualityDefinitionService qualityDefinitionService,