Fix for {collectionFolder}

TV-Rename · Nov 27, 2021 · c2b39ff · c2b39ff
1 parent 02be9d2
commit c2b39ff
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/TVRename/Settings/CustomMovieName.cs b/TVRename/Settings/CustomMovieName.cs
@@ -38,7 +38,19 @@ public static List<string> ExamplePresets(MovieConfiguration s)
         public static string NameFor(MovieConfiguration? m, string styleString) => NameFor(m, styleString, false, true);
 
         [NotNull]
-        public static string DirectoryNameFor(MovieConfiguration? m, string styleString) => NameFor(m, styleString, false, false);
+        public static string DirectoryNameFor(MovieConfiguration? m, string styleString)
+        {
+            if (styleString.StartsWith("{collectionFolder}", StringComparison.OrdinalIgnoreCase))
+            {
+                if (m?.InCollection ?? false)
+                {
+                    return m.CachedMovie?.CollectionName + "\\" + NameFor(m, styleString.RemoveFirst("{collectionFolder}/".Length), false, false);
+                }
+                return NameFor(m, styleString.RemoveFirst("{collectionFolder}/".Length), false, false);
+            }
+            return NameFor(m, styleString, false, false);
+        }
+
         [NotNull]
         public static string NameFor(MovieConfiguration m, string styleString, string? extension)
         {
@@ -84,7 +96,7 @@ public static string NameFor(MovieConfiguration? m, string styleString, bool url
             name = name.ReplaceInsensitive("{Imdb}", m.CachedMovie?.Imdb);
             name = name.ReplaceInsensitive("{CollectionName}", m.CachedMovie?.CollectionName);
             name = name.ReplaceInsensitive("{MovieType}", m.CachedMovie?.MovieType);
-            return isfilename ? TVSettings.DirectoryFriendly(name.Trim()) : name.Trim();
+            return isfilename ? TVSettings.Instance.FilenameFriendly(name.Trim()) : TVSettings.DirectoryFriendly(name.Trim());
         }
 
         [NotNull]