From b2a10609af703b1c513570d6c397ff22e0214bb0 Mon Sep 17 00:00:00 2001
From: sushilicious <*>
Date: Wed, 4 Aug 2021 23:25:54 -0700
Subject: [PATCH] Made CleanStringParser go through regexps only once

---
 Emby.Naming/Common/NamingOptions.cs    |  4 ++--
 Emby.Naming/Video/CleanStringParser.cs | 33 ++++++--------------------
 2 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/Emby.Naming/Common/NamingOptions.cs b/Emby.Naming/Common/NamingOptions.cs
index eb95c9b9c3..a745532c4f 100644
--- a/Emby.Naming/Common/NamingOptions.cs
+++ b/Emby.Naming/Common/NamingOptions.cs
@@ -139,9 +139,9 @@ namespace Emby.Naming.Common
             {
                 @"^\s*(?<cleaned>.+?)[ _\,\.\(\)\[\]\-](3d|sbs|tab|hsbs|htab|mvc|HDR|HDC|UHD|UltraHD|4k|ac3|dts|custom|dc|divx|divx5|dsr|dsrip|dutch|dvd|dvdrip|dvdscr|dvdscreener|screener|dvdivx|cam|fragment|fs|hdtv|hdrip|hdtvrip|internal|limited|multisubs|ntsc|ogg|ogm|pal|pdtv|proper|repack|rerip|retail|cd[1-9]|r3|r5|bd5|bd|se|svcd|swedish|german|read.nfo|nfofix|unrated|ws|telesync|ts|telecine|tc|brrip|bdrip|480p|480i|576p|576i|720p|720i|1080p|1080i|2160p|hrhd|hrhdtv|hddvd|bluray|blu-ray|x264|x265|h264|h265|xvid|xvidvd|xxx|www.www|AAC|DTS|\[.*\])([ _\,\.\(\)\[\]\-]|$)",
                 @"^(?<cleaned>.+?)(\[.*\])",
-                @"^\s*(?<cleaned>.+?)\WE\d+(-|~)E?\d+(\W|$)",
+                @"^\s*(?<cleaned>.+?)\WE[0-9]+(-|~)E?[0-9]+(\W|$)",
                 @"^\s*\[[^\]]+\](?!\.\w+$)\s*(?<cleaned>.+)",
-                @"^\s*(?<cleaned>.+?)\s+-\s+\d+\s*$"
+                @"^\s*(?<cleaned>.+?)\s+-\s+[0-9]+\s*$"
             };
 
             SubtitleFileExtensions = new[]
diff --git a/Emby.Naming/Video/CleanStringParser.cs b/Emby.Naming/Video/CleanStringParser.cs
index 0518095705..63a5953578 100644
--- a/Emby.Naming/Video/CleanStringParser.cs
+++ b/Emby.Naming/Video/CleanStringParser.cs
@@ -25,37 +25,18 @@ namespace Emby.Naming.Video
                 return false;
             }
 
-            // Iteratively remove extra cruft until we're left with the string
-            // we want.
-            newName = ReadOnlySpan<char>.Empty;
-            const int maxTries = 100;       // This is just a precautionary
-                                            // measure. Should not be neccesary.
-            var loopCounter = 0;
-            for (; loopCounter < maxTries; loopCounter++)
+            // Iteratively apply the regexps to clean the string.
+            bool cleaned = false;
+            for (int i = 0; i < expressions.Count; i++)
             {
-                bool cleaned = false;
-                var len = expressions.Count;
-                for (int i = 0; i < len; i++)
-                {
-                    if (TryClean(name, expressions[i], out newName))
-                    {
-                        cleaned = true;
-                        name = newName.ToString();
-                        break;
-                    }
-                }
-
-                if (!cleaned)
+                if (TryClean(name, expressions[i], out newName))
                 {
-                    break;
+                    cleaned = true;
+                    name = newName.ToString();
                 }
             }
 
-            if (loopCounter > 0)
-            {
-                newName = name.AsSpan();
-            }
-
+            newName = cleaned ? name.AsSpan() : ReadOnlySpan<char>.Empty;
             return newName != ReadOnlySpan<char>.Empty;
         }