diff --git a/Constants/DirectoryPaths.cs b/Constants/DirectoryPaths.cs index 8aab732..016cd53 100644 --- a/Constants/DirectoryPaths.cs +++ b/Constants/DirectoryPaths.cs @@ -1,5 +1,3 @@ -using System.IO; - namespace Icarus.Constants; public class DirectoryPaths diff --git a/Controllers/Managers/ArtistManager.cs b/Controllers/Managers/ArtistManager.cs index 31b4f83..3fb7ac3 100644 --- a/Controllers/Managers/ArtistManager.cs +++ b/Controllers/Managers/ArtistManager.cs @@ -29,13 +29,13 @@ public class ArtistManager : BaseManager { _logger.Info("Starting process to save the artist record of the song to the database"); - var artist = new Artist(); + var artist = new Artist + { + Name = song.Artist, + SongCount = 1 + }; - artist.Name = song.Artist; - artist.SongCount = 1; - var artistTitle = artist.Name; - - var artistRetrieved = _artistContext.Artists.FirstOrDefault(art => art.Name.Equals(artistTitle)); + var artistRetrieved = _artistContext.Artists.FirstOrDefault(art => art.Name.Equals(artist.Name)); if (artistRetrieved == null) { diff --git a/Controllers/Managers/CoverArtManager.cs b/Controllers/Managers/CoverArtManager.cs index 4026d21..8988305 100644 --- a/Controllers/Managers/CoverArtManager.cs +++ b/Controllers/Managers/CoverArtManager.cs @@ -97,7 +97,7 @@ public class CoverArtManager : BaseManager else { _logger.Info("Song has no cover art, applying stock cover art"); - // coverArt.ImagePath = _rootCoverArtPath + $"{segment}{defaultExtension}"; + var coverArtFilePath = _rootCoverArtPath + $"{segment}{defaultExtension}"; coverArt.ImagePath = DirectoryPaths.CoverArtPath; metaData.UpdateCoverArt(song, coverArt); diff --git a/Controllers/Managers/SongManager.cs b/Controllers/Managers/SongManager.cs index 7e4a93c..8234e06 100644 --- a/Controllers/Managers/SongManager.cs +++ b/Controllers/Managers/SongManager.cs @@ -107,7 +107,7 @@ public class SongManager : BaseManager try { var songPath = songMetaData.SongPath(); - System.IO.File.Delete(songPath); + File.Delete(songPath); successful = true; DirectoryManager dirMgr = new DirectoryManager(_config, songMetaData); dirMgr.DeleteEmptyDirectories(); diff --git a/Controllers/Managers/TokenManager.cs b/Controllers/Managers/TokenManager.cs index 9d7e785..2c2e03e 100644 --- a/Controllers/Managers/TokenManager.cs +++ b/Controllers/Managers/TokenManager.cs @@ -194,9 +194,7 @@ public class TokenManager : BaseManager var expLimit = 30; var currentDate = DateTime.Now; var expiredDate = currentDate.AddMinutes(expLimit); - // var issuer = "https://soaricarus.auth0.com"; var issuer = "http://localhost:5002"; - // var audience = "https://icarus/api"; var audience = "http://localhost:5002"; var subject = _config["JWT:Subject"]; diff --git a/Controllers/Utilities/SongCompression.cs b/Controllers/Utilities/SongCompression.cs index 4c6d4aa..ef7035a 100644 --- a/Controllers/Utilities/SongCompression.cs +++ b/Controllers/Utilities/SongCompression.cs @@ -1,9 +1,4 @@ -using System; -using System.IO; -using System.Threading.Tasks; - using Ionic.Zip; -using Microsoft.AspNetCore.Http; using Icarus.Models; diff --git a/Controllers/v1/AlbumController.cs b/Controllers/v1/AlbumController.cs index d333872..85bbea2 100644 --- a/Controllers/v1/AlbumController.cs +++ b/Controllers/v1/AlbumController.cs @@ -1,11 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; - using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Logging; using Icarus.Models; using Icarus.Database.Contexts; @@ -41,11 +35,9 @@ public class AlbumController : BaseController [HttpGet] public IActionResult GetAlbums() { - List albums = new List(); - var albumContext = new AlbumContext(_connectionString); - albums = albumContext.Albums.ToList(); + var albums = albumContext.Albums.ToList(); if (albums.Count > 0) return Ok(albums); @@ -56,10 +48,7 @@ public class AlbumController : BaseController [HttpGet("{id}")] public IActionResult GetAlbum(int id) { - Album album = new Album - { - AlbumID = id - }; + Album album = new Album{ AlbumID = id }; var albumContext = new AlbumContext(_connectionString); diff --git a/Controllers/v1/ArtistController.cs b/Controllers/v1/ArtistController.cs index 3281774..e6d021d 100644 --- a/Controllers/v1/ArtistController.cs +++ b/Controllers/v1/ArtistController.cs @@ -1,10 +1,5 @@ -using System; -using System.Linq; - using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Logging; using Icarus.Models; using Icarus.Database.Contexts; @@ -67,7 +62,9 @@ public class ArtistController : BaseController return Ok(artist); } else + { return NotFound(); + } } #endregion } diff --git a/Controllers/v1/BaseController.cs b/Controllers/v1/BaseController.cs index 093b470..e04b9aa 100644 --- a/Controllers/v1/BaseController.cs +++ b/Controllers/v1/BaseController.cs @@ -1,8 +1,4 @@ -using System; -using System.Linq; - using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Configuration; namespace Icarus.Controllers.V1; diff --git a/Controllers/v1/GenreController.cs b/Controllers/v1/GenreController.cs index 6dd4590..3e8a387 100644 --- a/Controllers/v1/GenreController.cs +++ b/Controllers/v1/GenreController.cs @@ -1,11 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Linq; - using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Logging; using Icarus.Models; using Icarus.Database.Contexts; @@ -41,25 +35,24 @@ public class GenreController : BaseController [HttpGet] public IActionResult GetGenres() { - var genres = new List(); - var genreStore = new GenreContext(_connectionString); - genres = genreStore.Genres.ToList(); + var genres = genreStore.Genres.ToList(); if (genres.Count > 0) + { return Ok(genres); + } else + { return NotFound(new List()); + } } [HttpGet("{id}")] public IActionResult GetGenre(int id) { - var genre = new Genre - { - GenreID = id - }; + var genre = new Genre{ GenreID = id }; var genreStore = new GenreContext(_connectionString); @@ -70,7 +63,9 @@ public class GenreController : BaseController return Ok(genre); } else + { return NotFound(new Genre()); + } } #endregion } diff --git a/Controllers/v1/LogoutController.cs b/Controllers/v1/LogoutController.cs deleted file mode 100644 index e69de29..0000000 diff --git a/Controllers/v1/RegisterController.cs b/Controllers/v1/RegisterController.cs index 9493f85..2bad355 100644 --- a/Controllers/v1/RegisterController.cs +++ b/Controllers/v1/RegisterController.cs @@ -1,13 +1,5 @@ -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Linq; -using System.Threading.Tasks; - using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Configuration; -using Icarus.Controllers.Managers; using Icarus.Controllers.Utilities; using Icarus.Models; using Icarus.Database.Contexts; @@ -19,7 +11,6 @@ namespace Icarus.Controllers.V1; public class RegisterController : ControllerBase { #region Fields - private string _connectionString; private IConfiguration _config; #endregion @@ -32,7 +23,6 @@ public class RegisterController : ControllerBase public RegisterController(IConfiguration config) { _config = config; - _connectionString = _config.GetConnectionString("DefaultConnection"); } #endregion diff --git a/Controllers/v1/SongCompressedDataControllers.cs b/Controllers/v1/SongCompressedDataControllers.cs index 2668aa8..7d094cf 100644 --- a/Controllers/v1/SongCompressedDataControllers.cs +++ b/Controllers/v1/SongCompressedDataControllers.cs @@ -42,7 +42,6 @@ public class SongCompressedDataController : BaseController var context = new SongContext(_connectionString); SongCompression cmp = new SongCompression(_archiveDir); - Console.WriteLine($"Archive directory root: {_archiveDir}"); diff --git a/Controllers/v1/SongController.cs b/Controllers/v1/SongController.cs index eed435e..0def6aa 100644 --- a/Controllers/v1/SongController.cs +++ b/Controllers/v1/SongController.cs @@ -1,16 +1,7 @@ -using System; -using System.Collections.Generic; -using System.Configuration; -using System.Linq; -using System.Threading.Tasks; - -using Microsoft.AspNetCore.Authorization; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Logging; using Icarus.Controllers.Managers; -using Icarus.Controllers.Utilities; using Icarus.Models; using Icarus.Database.Contexts; @@ -36,8 +27,8 @@ public class SongController : BaseController public SongController(IConfiguration config, ILogger logger) { _config = config; - _connectionString = _config.GetConnectionString("DefaultConnection"); _logger = logger; + _connectionString = _config.GetConnectionString("DefaultConnection"); _songMgr = new SongManager(config); } #endregion @@ -45,23 +36,24 @@ public class SongController : BaseController #region Methods #region HTTP Endpoints - - [HttpGet] public IActionResult GetSongs() { - List songs = new List(); Console.WriteLine("Attemtping to retrieve songs"); _logger.LogInformation("Attempting to retrieve songs"); var context = new SongContext(_connectionString); - songs = context.Songs.ToList(); + var songs = context.Songs.ToList(); if (songs.Count > 0) + { return Ok(songs); + } else + { return NotFound(); + } } [HttpGet("{id}")] @@ -69,8 +61,7 @@ public class SongController : BaseController { var context = new SongContext(_connectionString); - Song song = new Song { SongID = id }; - song = context.RetrieveRecord(song); + var song = context.RetrieveRecord(new Song{ SongID = id }); Console.WriteLine("Here"); @@ -83,8 +74,6 @@ public class SongController : BaseController [HttpPut("{id}")] public IActionResult UpdateSong(int id, [FromBody] Song song) { - var context = new SongContext(_connectionString); - song.SongID = id; Console.WriteLine("Retrieving filepath of song"); _logger.LogInformation("Retrieving filepath of song"); diff --git a/Controllers/v1/SongStreamController.cs b/Controllers/v1/SongStreamController.cs index 7e5aa07..f65937c 100644 --- a/Controllers/v1/SongStreamController.cs +++ b/Controllers/v1/SongStreamController.cs @@ -1,19 +1,6 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Net.Http.Headers; -using System.Web; -using System.Threading.Tasks; - -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Logging; -using Icarus.Models; -using Icarus.Controllers.Managers; using Icarus.Database.Contexts; namespace Icarus.Controllers.V1; @@ -25,7 +12,6 @@ public class SongStreamController : BaseController { #region Fields private ILogger _logger; - private string _connectionString; #endregion @@ -38,7 +24,6 @@ public class SongStreamController : BaseController { _logger = logger; _config = config; - _connectionString = _config.GetConnectionString("DefaultConnection"); } #endregion @@ -63,11 +48,9 @@ public class SongStreamController : BaseController _logger.LogInformation("Starting to stream song...>"); Console.WriteLine("Starting to streamsong..."); - var file = await Task.Run(() => { + return await Task.Run(() => { return File(stream, "application/octet-stream", filename); }); - - return file; } #endregion } diff --git a/Database/Contexts/AlbumContext.cs b/Database/Contexts/AlbumContext.cs index 107c5c5..9d5dc55 100644 --- a/Database/Contexts/AlbumContext.cs +++ b/Database/Contexts/AlbumContext.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; - using Microsoft.EntityFrameworkCore; using Icarus.Models; diff --git a/Database/Contexts/ArtistContext.cs b/Database/Contexts/ArtistContext.cs index b77fe6e..b2007f1 100644 --- a/Database/Contexts/ArtistContext.cs +++ b/Database/Contexts/ArtistContext.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; - using Microsoft.EntityFrameworkCore; using Icarus.Models; diff --git a/Database/Contexts/CoverArtContext.cs b/Database/Contexts/CoverArtContext.cs index f1b285e..f6cd149 100644 --- a/Database/Contexts/CoverArtContext.cs +++ b/Database/Contexts/CoverArtContext.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; - using Microsoft.EntityFrameworkCore; using Icarus.Models; diff --git a/Database/Contexts/GenreContext.cs b/Database/Contexts/GenreContext.cs index 0b09c93..5dacdf3 100644 --- a/Database/Contexts/GenreContext.cs +++ b/Database/Contexts/GenreContext.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; - using Microsoft.EntityFrameworkCore; using Icarus.Models; diff --git a/Database/Contexts/SongContext.cs b/Database/Contexts/SongContext.cs index ff7ed98..897fd8b 100644 --- a/Database/Contexts/SongContext.cs +++ b/Database/Contexts/SongContext.cs @@ -1,7 +1,3 @@ -using System; -using System.Collections.Generic; -using System.Linq; - using Microsoft.EntityFrameworkCore; using Icarus.Models; @@ -27,19 +23,19 @@ public class SongContext : DbContext modelBuilder.Entity() .Property(s => s.Year) - .IsRequired(false); + .IsRequired(false); modelBuilder.Entity() .Property(s => s.GenreID) - .IsRequired(false); + .IsRequired(false); modelBuilder.Entity() .Property(s => s.ArtistID) - .IsRequired(false); + .IsRequired(false); modelBuilder.Entity() .Property(s => s.AlbumID) - .IsRequired(false); + .IsRequired(false); modelBuilder.Entity() - .Property(s => s.CoverArtID) - .IsRequired(false); + .Property(s => s.CoverArtID) + .IsRequired(false); } diff --git a/Database/Contexts/UserContext.cs b/Database/Contexts/UserContext.cs index d83287e..f8b7c6b 100644 --- a/Database/Contexts/UserContext.cs +++ b/Database/Contexts/UserContext.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; - using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.DependencyInjection; using Icarus.Models;