From 64c65ee687e48eba84fd704f57472b635219e81f Mon Sep 17 00:00:00 2001
From: fiso64 <sokfilix@gmail.com>
Date: Tue, 2 Jan 2024 12:00:37 +0100
Subject: [PATCH] subdirs in --name-format

---
 slsk-batchdl/Program.cs          | 15 ++++++++++-----
 slsk-batchdl/slsk-batchdl.csproj |  2 +-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/slsk-batchdl/Program.cs b/slsk-batchdl/Program.cs
index a9bd831..8d7a92c 100644
--- a/slsk-batchdl/Program.cs
+++ b/slsk-batchdl/Program.cs
@@ -2251,10 +2251,10 @@ static class Program
             if (format.Contains("{title}") && string.IsNullOrEmpty(file.Tag.Title))
                 return filepath;
 
-            newName = newName.Replace("{artist}", file.Tag.FirstPerformer ?? "")
-                             .Replace("{artists}", string.Join(" & ", file.Tag.Performers))
-                             .Replace("{album_artist}", file.Tag.FirstAlbumArtist ?? "")
-                             .Replace("{album_artists}", string.Join(" & ", file.Tag.AlbumArtists))
+            newName = newName.Replace("{artist}", (file.Tag.FirstPerformer ?? "").RemoveFt())
+                             .Replace("{artists}", string.Join(" & ", file.Tag.Performers).RemoveFt())
+                             .Replace("{album_artist}", (file.Tag.FirstAlbumArtist ?? "").RemoveFt())
+                             .Replace("{album_artists}", string.Join(" & ", file.Tag.AlbumArtists).RemoveFt())
                              .Replace("{title}", file.Tag.Title ?? "")
                              .Replace("{album}", file.Tag.Album ?? "")
                              .Replace("{year}", file.Tag.Year.ToString() ?? "")
@@ -2264,8 +2264,13 @@ static class Program
             if (newName != format)
             {
                 string directory = Path.GetDirectoryName(filepath);
+                string dirsep = Path.DirectorySeparatorChar.ToString();
                 string extension = Path.GetExtension(filepath);
-                string newFilePath = Path.Combine(directory, ReplaceInvalidChars(newName, " ") + extension);
+                newName = newName.Replace(new string[] { "/", "\\" }, dirsep);
+                var x = newName.Split(dirsep, StringSplitOptions.RemoveEmptyEntries);
+                newName = string.Join(dirsep, x.Select(x => ReplaceInvalidChars(x, " ")));
+                string newFilePath = Path.Combine(directory, newName + extension);
+                System.IO.Directory.CreateDirectory(Path.GetDirectoryName(newFilePath));
                 System.IO.File.Move(filepath, newFilePath);
                 return newFilePath;
             }
diff --git a/slsk-batchdl/slsk-batchdl.csproj b/slsk-batchdl/slsk-batchdl.csproj
index 9c6e3cf..bc57dad 100644
--- a/slsk-batchdl/slsk-batchdl.csproj
+++ b/slsk-batchdl/slsk-batchdl.csproj
@@ -25,7 +25,7 @@
     <PackageReference Include="SpotifyAPI.Web" Version="7.0.2" />
     <PackageReference Include="SpotifyAPI.Web.Auth" Version="7.0.2" />
     <PackageReference Include="TagLibSharp" Version="2.3.0" />
-    <PackageReference Include="YoutubeExplode" Version="6.3.9" />
+    <PackageReference Include="YoutubeExplode" Version="6.3.10" />
   </ItemGroup>
 
 </Project>