From d0ed9fb2797b1ff30f41ed58a0829cb3dc355987 Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 26 Mar 2025 19:26:04 -0400 Subject: [PATCH 1/3] Bug fix --- Icarus/Controllers/Managers/DirectoryManager.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Icarus/Controllers/Managers/DirectoryManager.cs b/Icarus/Controllers/Managers/DirectoryManager.cs index 158cc0c..34bf4cb 100644 --- a/Icarus/Controllers/Managers/DirectoryManager.cs +++ b/Icarus/Controllers/Managers/DirectoryManager.cs @@ -98,12 +98,12 @@ public class DirectoryManager : BaseManager { var albumDirectory = AlbumDirectory(); var artistDirectory = ArtistDirectory(); - if (IsDirectoryEmpty(albumDirectory)) + if (Directory.Exists(albumDirectory) && IsDirectoryEmpty(albumDirectory)) { Directory.Delete(albumDirectory); Console.WriteLine($"directory {albumDirectory} deleted"); } - if (IsDirectoryEmpty(artistDirectory)) + if (Directory.Exists(artistDirectory) && IsDirectoryEmpty(artistDirectory)) { Directory.Delete(artistDirectory); Console.WriteLine($"directory {artistDirectory} deleted"); @@ -157,12 +157,12 @@ public class DirectoryManager : BaseManager var albumDirectory = AlbumDirectory(song); var artistDirectory = ArtistDirectory(song); - if (IsDirectoryEmpty(albumDirectory)) + if (Directory.Exists(albumDirectory) && IsDirectoryEmpty(albumDirectory)) { Directory.Delete(albumDirectory); _logger.Info("Album directory deleted"); } - if (IsDirectoryEmpty(artistDirectory)) + if (Directory.Exists(artistDirectory) && IsDirectoryEmpty(artistDirectory)) { Directory.Delete(artistDirectory); _logger.Info("Artist directory deleted"); @@ -251,7 +251,9 @@ public class DirectoryManager : BaseManager private bool IsDirectoryEmpty(string path) { - return !Directory.EnumerateFileSystemEntries(path).Any(); + var paths = Directory.EnumerateFileSystemEntries(path); + + return !paths.Any(); } private string AlbumDirectory() -- 2.47.3 From 982ee24b60235d3bf6e05a01ec360cde99b63181 Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 26 Mar 2025 19:28:49 -0400 Subject: [PATCH 2/3] Removed some code --- .../Controllers/Managers/DirectoryManager.cs | 86 ------------------- 1 file changed, 86 deletions(-) diff --git a/Icarus/Controllers/Managers/DirectoryManager.cs b/Icarus/Controllers/Managers/DirectoryManager.cs index 34bf4cb..53f6191 100644 --- a/Icarus/Controllers/Managers/DirectoryManager.cs +++ b/Icarus/Controllers/Managers/DirectoryManager.cs @@ -92,29 +92,6 @@ public class DirectoryManager : BaseManager } } - public void DeleteEmptyDirectories() - { - try - { - var albumDirectory = AlbumDirectory(); - var artistDirectory = ArtistDirectory(); - if (Directory.Exists(albumDirectory) && IsDirectoryEmpty(albumDirectory)) - { - Directory.Delete(albumDirectory); - Console.WriteLine($"directory {albumDirectory} deleted"); - } - if (Directory.Exists(artistDirectory) && IsDirectoryEmpty(artistDirectory)) - { - Directory.Delete(artistDirectory); - Console.WriteLine($"directory {artistDirectory} deleted"); - } - } - catch (Exception ex) - { - var exMsg = ex.Message; - Console.WriteLine($"An error occurred {exMsg}"); - } - } public int DeleteEmptyDirectories(string? directory, int level) { @@ -175,66 +152,7 @@ public class DirectoryManager : BaseManager } } - public string RetrieveAlbumPath(Song song) - { - _logger.Info("Retrieving album song path"); - var albumPath = string.Empty; - albumPath = AlbumDirectory(song); - - return albumPath; - } - public string RetrieveArtistPath(Song song) - { - _logger.Info("Retrieving artist path"); - - var artistPath = string.Empty; - artistPath = ArtistDirectory(song); - - return artistPath; - } - - public string GenerateSongPath(Song song) - { - _logger.Info("Generating song path"); - - var artistPath = ArtistDirectory(song); - var albumPath = AlbumDirectory(song); - - GenerateDirectories(new List{ - new DirEnt - { - Pre = "Artist path does not exist", - Path = artistPath, - Post = "Creating artist path" - }, - new DirEnt - { - Pre = "Album path does not exist", - Path = albumPath, - Post = "Created album path" - } - }); - - return albumPath; - } - - private class DirEnt - { - public string? Pre { get; set; } - public string? Path { get; set; } - public string? Post { get; set; } - } - - private void GenerateDirectories(List dirs) - { - foreach (var di in dirs) - { - _logger.Info(di.Pre); - Directory.CreateDirectory(di.Path!); - _logger.Info(di.Post); - } - } private void Initialize(DirectoryType dirTypes = DirectoryType.Music) { @@ -269,10 +187,6 @@ public class DirectoryManager : BaseManager return directory; } - private string ArtistDirectory() - { - return ArtistDirectory(_song!); - } private string ArtistDirectory(Song song) { var directory = _rootSongDirectory; -- 2.47.3 From d66ceee9591af3c93f102439b761581e257d3e7f Mon Sep 17 00:00:00 2001 From: phoenix Date: Wed, 26 Mar 2025 19:32:33 -0400 Subject: [PATCH 3/3] Simplifying method --- Icarus/Controllers/Managers/DirectoryManager.cs | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Icarus/Controllers/Managers/DirectoryManager.cs b/Icarus/Controllers/Managers/DirectoryManager.cs index 53f6191..8d2cd08 100644 --- a/Icarus/Controllers/Managers/DirectoryManager.cs +++ b/Icarus/Controllers/Managers/DirectoryManager.cs @@ -167,12 +167,8 @@ public class DirectoryManager : BaseManager } } - private bool IsDirectoryEmpty(string path) - { - var paths = Directory.EnumerateFileSystemEntries(path); - - return !paths.Any(); - } + private bool IsDirectoryEmpty(string path) => + !(Directory.EnumerateFileSystemEntries(path).Any()); private string AlbumDirectory() { -- 2.47.3