tsk-103: Confirmed functionality is working

Icarus/Controllers/Managers/AlbumManager.cs

@@ -85,7 +85,7 @@ public class AlbumManager : BaseManager
         if (string.IsNullOrEmpty(newAlbumTitle))
             newAlbumTitle = oldAlbumTitle;
 
-        if ((string.IsNullOrEmpty(newAlbumTitle) && string.IsNullOrEmpty(newAlbumArtist) || 
+        if ((string.IsNullOrEmpty(newAlbumTitle) && string.IsNullOrEmpty(newAlbumArtist) ||
                     oldAlbumTitle!.Equals(newAlbumTitle) && oldAlbumArtist!.Equals(newAlbumArtist)))
         {
             _logger.Info("No change to the song's album");

Icarus/Controllers/Managers/ArtistManager.cs

@@ -84,7 +84,7 @@ public class ArtistManager : BaseManager
 
             _artistContext.Add(newArtistRecord);
             _artistContext.SaveChanges();
-            
+
             return newArtistRecord;
         }
         else

Icarus/Controllers/Managers/CoverArtManager.cs

@@ -48,7 +48,7 @@ public class CoverArtManager : BaseManager
         try
         {
             var stockCoverArtPath = _rootCoverArtPath + _filename;
-            if (!string.Equals(stockCoverArtPath, coverArt.ImagePath(), 
+            if (!string.Equals(stockCoverArtPath, coverArt.ImagePath(),
                         StringComparison.CurrentCultureIgnoreCase))
             {
                 _logger.Info("Song does not contain the stock cover art");
@@ -87,7 +87,7 @@ public class CoverArtManager : BaseManager
 
             var metaData = new MetadataRetriever();
             var imgBytes = metaData.RetrieveCoverArtBytes(song);
-            
+
             if (imgBytes != null)
             {
                 _logger.Info("Saving cover art to the filesystem");
@@ -121,7 +121,7 @@ public class CoverArtManager : BaseManager
             var msg = ex.Message;
             _logger.Error(msg, "An error occurred");
         }
-        
+
         return null;
     }
 
@@ -173,7 +173,7 @@ public class CoverArtManager : BaseManager
 
         if (!File.Exists(_rootCoverArtPath + _filename))
         {
-            File.WriteAllBytes(_rootCoverArtPath + _filename, 
+            File.WriteAllBytes(_rootCoverArtPath + _filename,
                     _stockCoverArt!);
             Console.WriteLine("Copied Stock Cover Art");
         }

Icarus/Controllers/Managers/DirectoryManager.cs

@@ -53,7 +53,7 @@ public class DirectoryManager : BaseManager
 
     public static string GenerateDownloadFilename(int length, string extension, string title, bool? randomize)
     {
-        if (randomize.HasValue && randomize.Value) 
+        if (randomize.HasValue && randomize.Value)
         {
             return GenerateFilename(length) + extension;
         }
@@ -100,13 +100,13 @@ public class DirectoryManager : BaseManager
             var artistDirectory = ArtistDirectory();
             if (IsDirectoryEmpty(albumDirectory))
             {
-                    Directory.Delete(albumDirectory);
-                    Console.WriteLine($"directory {albumDirectory} deleted");
+                Directory.Delete(albumDirectory);
+                Console.WriteLine($"directory {albumDirectory} deleted");
             }
             if (IsDirectoryEmpty(artistDirectory))
             {
-                    Directory.Delete(artistDirectory);
-                    Console.WriteLine($"directory {artistDirectory} deleted");
+                Directory.Delete(artistDirectory);
+                Console.WriteLine($"directory {artistDirectory} deleted");
             }
         }
         catch (Exception ex)
@@ -116,6 +116,42 @@ public class DirectoryManager : BaseManager
         }
     }
 
+    public int DeleteEmptyDirectories(string? directory, int level)
+    {
+        var deleted = 0;
+        try
+        {
+
+            var curDir = directory;
+            for (var i = 0; i < level; i++)
+            {
+
+                if (!System.IO.Directory.Exists(curDir))
+                {
+                    // return deleted;
+                    continue;
+                }
+
+                if (this.IsDirectoryEmpty(curDir))
+                {
+                    System.IO.Directory.Delete(curDir);
+                }
+
+                curDir = System.IO.Directory.GetParent(curDir).ToString();
+
+            }
+
+
+        }
+        catch (Exception ex)
+        {
+            var exMsg = ex.Message;
+            Console.WriteLine($"An error occurred {exMsg}");
+        }
+
+        return deleted;
+    }
+
     public void DeleteEmptyDirectories(Song song)
     {
         try
@@ -125,12 +161,12 @@ public class DirectoryManager : BaseManager
 
             if (IsDirectoryEmpty(albumDirectory))
             {
-                    Directory.Delete(albumDirectory);
+                Directory.Delete(albumDirectory);
                 _logger.Info("Album directory deleted");
             }
             if (IsDirectoryEmpty(artistDirectory))
             {
-                    Directory.Delete(artistDirectory);
+                Directory.Delete(artistDirectory);
                 _logger.Info("Artist directory deleted");
             }
         }
@@ -187,7 +223,7 @@ public class DirectoryManager : BaseManager
 
     private class DirEnt
     {
-        public string? Pre { get; set;}
+        public string? Pre { get; set; }
         public string? Path { get; set; }
         public string? Post { get; set; }
     }

Icarus/Controllers/Managers/SongManager.cs

@@ -110,10 +110,17 @@ public class SongManager : BaseManager
         {
             var songPath = songMetaData.SongPath();
             System.IO.File.Delete(songPath);
-            successful = true;
+            successful = !System.IO.File.Exists(songPath);
+            if (successful)
+            {
+                Console.WriteLine("Song successfully deleted");
+            }
             DirectoryManager dirMgr = new DirectoryManager(_config!, songMetaData);
-            dirMgr.DeleteEmptyDirectories();
-            Console.WriteLine("Song successfully deleted");
+            var deletedAmount = dirMgr.DeleteEmptyDirectories(songMetaData.SongDirectory, 1);
+            if (deletedAmount > 0)
+            {
+                Console.WriteLine($"{deletedAmount} directories deleted");
+            }
         }
         catch (Exception ex)
         {

Icarus/Controllers/Managers/TokenManager.cs

@@ -53,7 +53,7 @@ public class TokenManager : BaseManager
         _logger.Info("Serializing token object into JSON");
         var tokenObject = JsonConvert.SerializeObject(tokenRequest);
 
-        request.AddParameter("application/json; charset=utf-8", 
+        request.AddParameter("application/json; charset=utf-8",
             tokenObject, ParameterType.RequestBody);
 
         request.RequestFormat = DataFormat.Json;
@@ -74,7 +74,7 @@ public class TokenManager : BaseManager
 
     public LoginResult LoginSymmetric(User user)
     {
-        var tokenResult = new TokenTierOne{ TokenType = "JWT" };
+        var tokenResult = new TokenTierOne { TokenType = "JWT" };
 
         var payload = Payload();
         payload.Add(new Claim("user_id", user.Id.ToString(), ClaimValueTypes.Integer));
@@ -91,7 +91,7 @@ public class TokenManager : BaseManager
             Expires = DateTime.UtcNow.AddHours(1),
             SigningCredentials = new SigningCredentials(new SymmetricSecurityKey(key), SecurityAlgorithms.HmacSha256Signature),
             Issuer = _config["Jwt:Issuer"], // Add this line
-            Audience = _config["Jwt:Audience"] 
+            Audience = _config["Jwt:Audience"]
         };
 
         tokenResult.AccessToken = tokenHandler.WriteToken(tokenHandler.CreateToken(tokenDescriptor));
@@ -112,8 +112,11 @@ public class TokenManager : BaseManager
     {
         return new LoginResult
         {
-            UserId = user.Id, Username = user.Username, Token = token.AccessToken,
-            TokenType = token.TokenType, Expiration = token.Expiration,
+            UserId = user.Id,
+            Username = user.Username,
+            Token = token.AccessToken,
+            TokenType = token.TokenType,
+            Expiration = token.Expiration,
             Message = SUCCESSFUL_TOKEN_MESSAGE
         };
     }
@@ -162,13 +165,13 @@ public class TokenManager : BaseManager
             "download:songs",
             "read:song_details",
             "upload:songs",
-            "delete:songs", 
-            "read:albums", 
+            "delete:songs",
+            "read:albums",
             "read:artists",
-            "update:songs", 
-            "stream:songs", 
-            "read:genre", 
-            "read:year", 
+            "update:songs",
+            "stream:songs",
+            "read:genre",
+            "read:year",
             "download:cover_art"
         };
 
@@ -217,15 +220,17 @@ public class TokenManager : BaseManager
     {
         return await System.IO.File.ReadAllTextAsync(filepath);
     }
-    
+
     private TokenRequest RetrieveTokenRequest()
     {
         _logger.Info("Retrieving token object");
 
         return new TokenRequest
         {
-            ClientId = _clientId, ClientSecret = _clientSecret,
-            Audience = _audience, GrantType = _grantType
+            ClientId = _clientId,
+            ClientSecret = _clientSecret,
+            Audience = _audience,
+            GrantType = _grantType
         };
     }