4 files changed, 15 insertions, 36 deletions
diff --git a/Emby.Naming/TV/EpisodeResolver.cs b/Emby.Naming/TV/EpisodeResolver.cs
index 49a3558bd6..fccf9bdecb 100644
--- a/Emby.Naming/TV/EpisodeResolver.cs
+++ b/Emby.Naming/TV/EpisodeResolver.cs
@@ -22,17 +22,17 @@ namespace Emby.Naming.TV
                 throw new ArgumentNullException(nameof(path));
             }
 
-            var isStub = false;
+            bool isStub = false;
             string container = null;
             string stubType = null;
 
             if (!IsDirectory)
             {
-                var extension = Path.GetExtension(path) ?? string.Empty;
+                var extension = Path.GetExtension(path);
                 // Check supported extensions
                 if (!_options.VideoFileExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase))
                 {
-                    var stubResult = new StubResolver(_options).ResolveFile(path);
+                    var stubResult = StubResolver.ResolveFile(path, _options);
 
                     isStub = stubResult.IsStub;
 
diff --git a/Emby.Naming/Video/StubResolver.cs b/Emby.Naming/Video/StubResolver.cs
index 7925f381d6..f86bcbdf04 100644
--- a/Emby.Naming/Video/StubResolver.cs
+++ b/Emby.Naming/Video/StubResolver.cs
@@ -5,21 +5,14 @@ using Emby.Naming.Common;
 
 namespace Emby.Naming.Video
 {
-    public class StubResolver
+    public static class StubResolver
     {
-        private readonly NamingOptions _options;
-
-        public StubResolver(NamingOptions options)
-        {
-            _options = options;
-        }
-
-        public StubResult ResolveFile(string path)
+        public static StubResult ResolveFile(string path, NamingOptions options)
         {
             var result = new StubResult();
             var extension = Path.GetExtension(path) ?? string.Empty;
 
-            if (_options.StubFileExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase))
+            if (options.StubFileExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase))
             {
                 result.IsStub = true;
 
@@ -27,12 +20,11 @@ namespace Emby.Naming.Video
 
                 var token = (Path.GetExtension(path) ?? string.Empty).TrimStart('.');
 
-                foreach (var rule in _options.StubTypes)
+                foreach (var rule in options.StubTypes)
                 {
                     if (string.Equals(rule.Token, token, StringComparison.OrdinalIgnoreCase))
                     {
                         result.StubType = rule.StubType;
-                        result.Tokens.Add(token);
                         break;
                     }
                 }
diff --git a/Emby.Naming/Video/StubResult.cs b/Emby.Naming/Video/StubResult.cs
index 5976813372..7f9509ca56 100644
--- a/Emby.Naming/Video/StubResult.cs
+++ b/Emby.Naming/Video/StubResult.cs
@@ -1,8 +1,6 @@
-using System.Collections.Generic;
-
 namespace Emby.Naming.Video
 {
-    public class StubResult
+    public struct StubResult
     {
         /// <summary>
         /// Gets or sets a value indicating whether this instance is stub.
@@ -14,15 +12,5 @@ namespace Emby.Naming.Video
         /// </summary>
         /// <value>The type of the stub.</value>
         public string StubType { get; set; }
-        /// <summary>
-        /// Gets or sets the tokens.
-        /// </summary>
-        /// <value>The tokens.</value>
-        public List<string> Tokens { get; set; }
-
-        public StubResult()
-        {
-            Tokens = new List<string>();
-        }
     }
 }
diff --git a/Emby.Naming/Video/VideoResolver.cs b/Emby.Naming/Video/VideoResolver.cs
index 9bd0cb3dfb..a673156517 100644
--- a/Emby.Naming/Video/VideoResolver.cs
+++ b/Emby.Naming/Video/VideoResolver.cs
@@ -48,17 +48,17 @@ namespace Emby.Naming.Video
                 throw new ArgumentNullException(nameof(path));
             }
 
-            var isStub = false;
+            bool isStub = false;
             string container = null;
             string stubType = null;
 
             if (!IsDirectory)
             {
-                var extension = Path.GetExtension(path) ?? string.Empty;
+                var extension = Path.GetExtension(path);
                 // Check supported extensions
                 if (!_options.VideoFileExtensions.Contains(extension, StringComparer.OrdinalIgnoreCase))
                 {
-                    var stubResult = new StubResolver(_options).ResolveFile(path);
+                    var stubResult = StubResolver.ResolveFile(path, _options);
 
                     isStub = stubResult.IsStub;
 
@@ -79,9 +79,9 @@ namespace Emby.Naming.Video
 
             var extraResult = new ExtraResolver(_options).GetExtraInfo(path);
 
-            var name = !IsDirectory
-                ? Path.GetFileNameWithoutExtension(path)
-                : Path.GetFileName(path);
+            var name = IsDirectory
+                ? Path.GetFileName(path)
+                : Path.GetFileNameWithoutExtension(path);
 
             int? year = null;
 
@@ -91,8 +91,7 @@ namespace Emby.Naming.Video
 
                 if (string.IsNullOrEmpty(extraResult.ExtraType))
                 {
-                    name = cleanDateTimeResult.Name;
-                    name = CleanString(name).Name;
+                    name = CleanString(cleanDateTimeResult.Name).Name;
                 }
 
                 year = cleanDateTimeResult.Year;