Taken suggestions from code review and created test for ExtraRuleType.Regex instead of throwing exception there.

3 files changed, 6 insertions, 13 deletions

diff --git a/Emby.Naming/AudioBook/AudioBookListResolver.cs b/Emby.Naming/AudioBook/AudioBookListResolver.cs
index 54c1fe5bd..95817efc3 100644
--- a/Emby.Naming/AudioBook/AudioBookListResolver.cs
+++ b/Emby.Naming/AudioBook/AudioBookListResolver.cs
@@ -73,6 +73,7 @@ namespace Emby.Naming.AudioBook
 
             var haveChaptersOrPages = stackFiles.Any(x => x.ChapterNumber != null || x.PartNumber != null);
             var groupedBy = stackFiles.GroupBy(file => new { file.ChapterNumber, file.PartNumber });
+            var nameWithReplacedDots = nameParserResult.Name.Replace(" ", ".");
 
             foreach (var group in groupedBy)
             {
@@ -86,9 +87,9 @@ namespace Emby.Naming.AudioBook
                         foreach (var audioFile in group)
                         {
                             var name = Path.GetFileNameWithoutExtension(audioFile.Path);
-                            if (name == "audiobook" ||
+                            if (name.Equals("audiobook") ||
                                 name.Contains(nameParserResult.Name, StringComparison.OrdinalIgnoreCase) ||
-                                name.Contains(nameParserResult.Name.Replace(" ", "."), StringComparison.OrdinalIgnoreCase))
+                                name.Contains(nameWithReplacedDots, StringComparison.OrdinalIgnoreCase))
                             {
                                 alt.Add(audioFile);
                             }
diff --git a/Emby.Naming/Video/ExtraResolver.cs b/Emby.Naming/Video/ExtraResolver.cs
index dd934d91b..1d3b36a1a 100644
--- a/Emby.Naming/Video/ExtraResolver.cs
+++ b/Emby.Naming/Video/ExtraResolver.cs
@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Text.RegularExpressions;
 using Emby.Naming.Audio;
 using Emby.Naming.Common;
 
@@ -52,11 +53,6 @@ namespace Emby.Naming.Video
                     return result;
                 }
             }
-            else
-            {
-                // Currently unreachable code if new rule.MediaType is desired add if clause with proper tests
-                throw new InvalidOperationException();
-            }
 
             if (rule.RuleType == ExtraRuleType.Filename)
             {
@@ -80,9 +76,6 @@ namespace Emby.Naming.Video
             }
             else if (rule.RuleType == ExtraRuleType.Regex)
             {
-                // Currently unreachable code if new rule.MediaType is desired add if clause with proper tests
-                throw new InvalidOperationException();
-                /*
                 var filename = Path.GetFileName(path);
 
                 var regex = new Regex(rule.Token, RegexOptions.IgnoreCase);
@@ -92,7 +85,6 @@ namespace Emby.Naming.Video
                     result.ExtraType = rule.ExtraType;
                     result.Rule = rule;
                 }
-                */
             }
             else if (rule.RuleType == ExtraRuleType.DirectoryName)
             {
diff --git a/Emby.Naming/Video/VideoListResolver.cs b/Emby.Naming/Video/VideoListResolver.cs
index 1e18c4452..2fd2d3e8b 100644
--- a/Emby.Naming/Video/VideoListResolver.cs
+++ b/Emby.Naming/Video/VideoListResolver.cs
@@ -230,8 +230,8 @@ namespace Emby.Naming.Video
 
                 testFilename = testFilename.Substring(folderName.Length).Trim();
                 return string.IsNullOrEmpty(testFilename)
-                   || testFilename[0] == '-'
-                   || testFilename[0].Equals( '_')
+                   || testFilename[0].Equals('-')
+                   || testFilename[0].Equals('_')
                    || string.IsNullOrWhiteSpace(Regex.Replace(testFilename, @"\[([^]]*)\]", string.Empty));
             }