Merge pull request #87 from kdeng00/update_namespace

Migrating to modern c# namespace

Authorization/Handlers/HasScopeHandler.cs

@@ -6,8 +6,8 @@ using Microsoft.AspNetCore.Authorization;
 
 using Icarus.Authorization;
 
-namespace Icarus.Authorization.Handlers
-{
+namespace Icarus.Authorization.Handlers;
+
 public class HasScopeHandler : AuthorizationHandler<HasScopeRequirement>
 {
     protected override Task HandleRequirementAsync(AuthorizationHandlerContext context, HasScopeRequirement requirement)
@@ -28,4 +28,3 @@ namespace Icarus.Authorization.Handlers
         return Task.CompletedTask;
     }
 }
-}

Authorization/HasScopeRequirement.cs

@@ -2,8 +2,8 @@ using System;
 
 using Microsoft.AspNetCore.Authorization;
 
-namespace Icarus.Authorization
-{
+namespace Icarus.Authorization;
+
 public class HasScopeRequirement : IAuthorizationRequirement
 {
     public string Issuer { get; }
@@ -16,4 +16,3 @@ namespace Icarus.Authorization
         Issuer = issuer ?? throw new ArgumentNullException(nameof(issuer));
     }
 }
-}

Certs/Signing.cs

@@ -6,8 +6,8 @@ using Org.BouncyCastle.Crypto.Parameters;
 using Org.BouncyCastle.OpenSsl;
 
 
-namespace Icarus.Certs
-{
+namespace Icarus.Certs;
+
 public class SigningIssuerCertificate : IDisposable
 {
     private readonly RSACryptoServiceProvider _rsa;
@@ -77,4 +77,3 @@ namespace Icarus.Certs
         _rsa?.Dispose();
     }
 }
-}

Constants/DirectoryPaths.cs

@@ -1,11 +1,10 @@
 using System;
 using System.IO;
 
-namespace Icarus.Constants
-{
+namespace Icarus.Constants;
+
 public class DirectoryPaths
 {
     public static string CoverArtPath =>
         Directory.GetCurrentDirectory() + "/Images/Stock/CoverArt.png";
 }
-}

Controllers/Managers/AlbumManager.cs

@@ -9,8 +9,8 @@ using Icarus.Controllers.Utilities;
 using Icarus.Models;
 using Icarus.Database.Contexts;
 
-namespace Icarus.Controllers.Managers
-{
+namespace Icarus.Controllers.Managers;
+
 public class AlbumManager : BaseManager
 {
     #region Fields
@@ -152,4 +152,3 @@ namespace Icarus.Controllers.Managers
     }
     #endregion
 }
-}

Controllers/Managers/ArtistManager.cs

@@ -9,8 +9,8 @@ using Icarus.Controllers.Utilities;
 using Icarus.Models;
 using Icarus.Database.Contexts;
 
-namespace Icarus.Controllers.Managers
-{
+namespace Icarus.Controllers.Managers;
+
 public class ArtistManager : BaseManager
 {
     #region Fields
@@ -134,4 +134,3 @@ namespace Icarus.Controllers.Managers
     }
     #endregion
 }
-}

Controllers/Managers/BaseManagers.cs

@@ -3,8 +3,8 @@ using System;
 using Microsoft.Extensions.Configuration;
 using NLog;
 
-namespace Icarus.Controllers.Managers
-{
+namespace Icarus.Controllers.Managers;
+
 public class BaseManager
 {
     #region Fields
@@ -13,4 +13,3 @@ namespace Icarus.Controllers.Managers
     protected string _connectionString;
     #endregion
 }
-}

Controllers/Managers/CoverArtManager.cs

@@ -12,8 +12,8 @@ using Icarus.Database.Contexts;
 using Icarus.Models;
 using Icarus.Types;
 
-namespace Icarus.Controllers.Managers
-{
+namespace Icarus.Controllers.Managers;
+
 public class CoverArtManager : BaseManager
 {
     #region Fields
@@ -169,4 +169,3 @@ namespace Icarus.Controllers.Managers
     }
     #endregion
 }
-}

Controllers/Managers/DirectoryManager.cs

@@ -7,8 +7,8 @@ using Microsoft.Extensions.Configuration;
 using Icarus.Models;
 using Icarus.Types;
 
-namespace Icarus.Controllers.Managers
-{
+namespace Icarus.Controllers.Managers;
+
 // NOTE: Do not use metadata for the song's metadata
 public class DirectoryManager : BaseManager
 {
@@ -229,4 +229,3 @@ namespace Icarus.Controllers.Managers
     }
     #endregion
 }
-}

Controllers/Managers/GenreManager.cs

@@ -9,8 +9,8 @@ using Icarus.Controllers.Utilities;
 using Icarus.Models;
 using Icarus.Database.Contexts;
 
-namespace Icarus.Controllers.Managers
-{
+namespace Icarus.Controllers.Managers;
+
 public class GenreManager : BaseManager
 {
     #region Fields
@@ -134,4 +134,3 @@ namespace Icarus.Controllers.Managers
     }
     #endregion
 }
-}

Controllers/Managers/SongManager.cs

@@ -15,8 +15,8 @@ using Icarus.Controllers.Utilities;
 using Icarus.Models;
 using Icarus.Database.Contexts;
 
-namespace Icarus.Controllers.Managers
-{
+namespace Icarus.Controllers.Managers;
+
 public class SongManager : BaseManager
 {
     #region Fields
@@ -504,4 +504,3 @@ namespace Icarus.Controllers.Managers
     }
     #endregion    
 }
-}

Controllers/Managers/TokenManager.cs

@@ -16,13 +16,12 @@ using Org.BouncyCastle.Crypto;
 using Org.BouncyCastle.Crypto.Parameters;
 using Org.BouncyCastle.OpenSsl;
 using Org.BouncyCastle.Security;
-
 using RestSharp;
 
 using Icarus.Models;
 
-namespace Icarus.Controllers.Managers
-{
+namespace Icarus.Controllers.Managers;
+
 #region Classes
 public class TokenManager : BaseManager
 {
@@ -407,4 +406,3 @@ namespace Icarus.Controllers.Managers
     #endregion
 }
 #endregion
-}

Controllers/Utilities/MetadataRetriever.cs

@@ -7,8 +7,8 @@ using TagLib;
 
 using Icarus.Models;
 
-namespace Icarus.Controllers.Utilities
-{
+namespace Icarus.Controllers.Utilities;
+
 public class MetadataRetriever
 {
     #region Fields
@@ -342,4 +342,3 @@ namespace Icarus.Controllers.Utilities
     }
     #endregion
 }
-}

Controllers/Utilities/PasswordEncryption.cs

@@ -7,8 +7,8 @@ using NLog;
 
 using Icarus.Models;
 
-namespace Icarus.Controllers.Utilities
-{
+namespace Icarus.Controllers.Utilities;
+
 public class PasswordEncryption
 {
     #region Fields
@@ -87,4 +87,3 @@ namespace Icarus.Controllers.Utilities
     }
     #endregion
 }
-}

Controllers/Utilities/SongCompression.cs

@@ -2,14 +2,13 @@ using System;
 using System.IO;
 using System.Threading.Tasks;
 
-using Microsoft.AspNetCore.Http;
-
 using Ionic.Zip;
+using Microsoft.AspNetCore.Http;
 
 using Icarus.Models;
 
-namespace Icarus.Controllers.Utilities
-{
+namespace Icarus.Controllers.Utilities;
+
 public class SongCompression
 {
     #region Fields
@@ -127,4 +126,3 @@ namespace Icarus.Controllers.Utilities
     }
     #endregion
 }
-}

Controllers/v1/AlbumController.cs

@@ -10,8 +10,8 @@ using Microsoft.Extensions.Logging;
 using Icarus.Models;
 using Icarus.Database.Contexts;
 
-namespace Icarus.Controllers.V1
-{
+namespace Icarus.Controllers.V1;
+
 [Route("api/v1/album")]
 [ApiController]
 [Authorize]
@@ -74,4 +74,3 @@ namespace Icarus.Controllers.V1
     }
     #endregion
 }
-}

Controllers/v1/ArtistController.cs

@@ -9,8 +9,8 @@ using Microsoft.Extensions.Logging;
 using Icarus.Models;
 using Icarus.Database.Contexts;
 
-namespace Icarus.Controllers.V1
-{
+namespace Icarus.Controllers.V1;
+
 [Route("api/v1/artist")]
 [ApiController]
 [Authorize]
@@ -71,4 +71,3 @@ namespace Icarus.Controllers.V1
     }
     #endregion
 }
-}

Controllers/v1/BaseController.cs

@@ -7,8 +7,8 @@ using Microsoft.Extensions.Configuration;
 using Icarus.Controllers.Managers;
 
 
-namespace Icarus.Controllers.V1
-{
+namespace Icarus.Controllers.V1;
+
 public class BaseController : ControllerBase
 {
     #region Fiends
@@ -50,4 +50,3 @@ namespace Icarus.Controllers.V1
     }
     #endregion
 }
-}

Controllers/v1/CoverArtController.cs

@@ -11,8 +11,8 @@ using Icarus.Controllers.Managers;
 using Icarus.Database.Contexts;
 using Icarus.Models;
 
-namespace Icarus.Controllers.V1
-{
+namespace Icarus.Controllers.V1;
+
 [Route("api/v1/coverart")]
 [ApiController]
 [Authorize]
@@ -80,4 +80,3 @@ namespace Icarus.Controllers.V1
     }
     #endregion
 }
-}

Controllers/v1/GenreController.cs

@@ -10,8 +10,8 @@ using Microsoft.Extensions.Logging;
 using Icarus.Models;
 using Icarus.Database.Contexts;
 
-namespace Icarus.Controllers.V1
-{
+namespace Icarus.Controllers.V1;
+
 [Route("api/v1/genre")]
 [ApiController]
 [Authorize]
@@ -74,4 +74,3 @@ namespace Icarus.Controllers.V1
     }
     #endregion
 }
-}

Controllers/v1/LoginController.cs

@@ -10,8 +10,8 @@ using Icarus.Controllers.Utilities;
 using Icarus.Models;
 using Icarus.Database.Contexts;
 
-namespace Icarus.Controllers.V1
-{
+namespace Icarus.Controllers.V1;
+
 [Route("api/v1/login")]
 [ApiController]
 public class LoginController : ControllerBase
@@ -94,4 +94,3 @@ namespace Icarus.Controllers.V1
     }
     #endregion
 }
-}

Controllers/v1/RegisterController.cs

@@ -12,8 +12,8 @@ using Icarus.Controllers.Utilities;
 using Icarus.Models;
 using Icarus.Database.Contexts;
 
-namespace Icarus.Controllers.V1
-{
+namespace Icarus.Controllers.V1;
+
 [Route("api/v1/register")]
 [ApiController]
 public class RegisterController : ControllerBase
@@ -82,4 +82,3 @@ namespace Icarus.Controllers.V1
         }
     }
 }
-}

Controllers/v1/SongCompressedDataControllers.cs

@@ -15,8 +15,8 @@ using Icarus.Controllers.Utilities;
 using Icarus.Models;
 using Icarus.Database.Contexts;
 
-namespace Icarus.Controllers.V1
-{
+namespace Icarus.Controllers.V1;
+
 [Route("api/v1/song/compressed/data")]
 [ApiController]
 [Authorize]
@@ -61,4 +61,3 @@ namespace Icarus.Controllers.V1
     }
     #endregion
 }
-}

Controllers/v1/SongController.cs

@@ -14,8 +14,8 @@ using Icarus.Controllers.Utilities;
 using Icarus.Models;
 using Icarus.Database.Contexts;
 
-namespace Icarus.Controllers.V1
-{
+namespace Icarus.Controllers.V1;
+
 [Route("api/v1/song")]
 [ApiController]
 [Authorize]
@@ -104,4 +104,3 @@ namespace Icarus.Controllers.V1
     #endregion
     #endregion
 }
-}

Controllers/v1/SongDataController.cs

@@ -16,8 +16,8 @@ using Icarus.Controllers.Managers;
 using Icarus.Models;
 using Icarus.Database.Contexts;
 
-namespace Icarus.Controllers.V1
-{
+namespace Icarus.Controllers.V1;
+
 [Route("api/v1/song/data")]
 [ApiController]
 [Authorize]
@@ -164,4 +164,3 @@ namespace Icarus.Controllers.V1
         public string SongFile { get; set; }
     }
 }
-}

Controllers/v1/SongStreamController.cs

@@ -16,8 +16,8 @@ using Icarus.Models;
 using Icarus.Controllers.Managers;
 using Icarus.Database.Contexts;
 
-namespace Icarus.Controllers.V1
-{
+namespace Icarus.Controllers.V1;
+
 [Route("api/v1/song/stream")]
 [ApiController]
 [Authorize]
@@ -66,4 +66,3 @@ namespace Icarus.Controllers.V1
     }
     #endregion
 }
-}

Database/Contexts/AlbumContext.cs

@@ -6,8 +6,8 @@ using Microsoft.EntityFrameworkCore;
 
 using Icarus.Models;
 
-namespace Icarus.Database.Contexts
-{
+namespace Icarus.Database.Contexts;
+
 public class AlbumContext : DbContext
 {
     public DbSet<Album> Albums { get; set; }
@@ -34,4 +34,3 @@ namespace Icarus.Database.Contexts
         return Albums.FirstOrDefault(alb => alb.AlbumID == album.AlbumID) != null ? true : false;
     }
 }
-}

Database/Contexts/ArtistContext.cs

@@ -6,8 +6,8 @@ using Microsoft.EntityFrameworkCore;
 
 using Icarus.Models;
 
-namespace Icarus.Database.Contexts
-{
+namespace Icarus.Database.Contexts;
+
 public class ArtistContext : DbContext
 {
     public DbSet<Artist> Artists { get; set; }
@@ -36,4 +36,3 @@ namespace Icarus.Database.Contexts
         return Artists.FirstOrDefault(arst => arst.ArtistID == artist.ArtistID) != null ? true : false;
     }
 }
-}

Database/Contexts/CoverArtContext.cs

@@ -6,8 +6,8 @@ using Microsoft.EntityFrameworkCore;
 
 using Icarus.Models;
 
-namespace Icarus.Database.Contexts
-{
+namespace Icarus.Database.Contexts;
+
 public class CoverArtContext : DbContext
 {
     public DbSet<CoverArt> CoverArtImages { get; set; }
@@ -34,4 +34,3 @@ namespace Icarus.Database.Contexts
         return CoverArtImages.FirstOrDefault(cov => cov.CoverArtID == cover.CoverArtID) != null ? true : false;
     }
 }
-}

Database/Contexts/GenreContext.cs

@@ -6,8 +6,8 @@ using Microsoft.EntityFrameworkCore;
 
 using Icarus.Models;
 
-namespace Icarus.Database.Contexts
-{
+namespace Icarus.Database.Contexts;
+
 public class GenreContext : DbContext
 {
     public DbSet<Genre> Genres { get; set; }
@@ -34,4 +34,3 @@ namespace Icarus.Database.Contexts
         return Genres.FirstOrDefault(gnr => gnr.GenreID == genre.GenreID) != null ? true : false;
     }
 }
-}

Database/Contexts/SongContext.cs

@@ -6,8 +6,8 @@ using Microsoft.EntityFrameworkCore;
 
 using Icarus.Models;
         
-namespace Icarus.Database.Contexts
-{    
+namespace Icarus.Database.Contexts;
+
 public class SongContext : DbContext
 {
     public DbSet<Song> Songs { get; set; }
@@ -86,4 +86,3 @@ namespace Icarus.Database.Contexts
         return Songs.FirstOrDefault(sng => sng.SongID == song.SongID) != null ? true : false;
     }
 }
-}  

Database/Contexts/UserContext.cs

@@ -12,8 +12,8 @@ using Microsoft.Extensions.DependencyInjection;
 
 using Icarus.Models;
         
-namespace Icarus.Database.Contexts
-{    
+namespace Icarus.Database.Contexts;
+
 public class UserContext : DbContext
 {
     public DbSet<User> Users { get; set; }
@@ -50,4 +50,3 @@ namespace Icarus.Database.Contexts
         return Users.FirstOrDefault(usr => usr.UserID == user.UserID) != null ? true : false;
     }
 }
-}  

Models/Album.cs

@@ -4,8 +4,8 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 using Newtonsoft.Json;
 
-namespace Icarus.Models
-{
+namespace Icarus.Models;
+
 public class Album
 {
     [JsonProperty("album_id")]
@@ -25,4 +25,3 @@ namespace Icarus.Models
     [NotMapped]
     public List<Song> Songs { get; set; }
 }
-}

Models/Artist.cs

@@ -4,8 +4,8 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 using Newtonsoft.Json;
 
-namespace Icarus.Models
-{
+namespace Icarus.Models;
+
 public class Artist
 {
     [JsonProperty("artist_id")]
@@ -16,9 +16,7 @@ namespace Icarus.Models
     [JsonProperty("song_count")]
     [NotMapped]
     public int SongCount { get; set; }
-
     [JsonIgnore]
     [NotMapped]
     public List<Song> Songs { get; set; }
 }
-}

Models/BaseResult.cs

@@ -2,11 +2,10 @@ using System;
 
 using Newtonsoft.Json;
 
-namespace Icarus.Models
-{
+namespace Icarus.Models;
+
 public class BaseResult
 {
     [JsonProperty("message")]
     public string Message { get; set; }
 }
-}

Models/CoverArt.cs

@@ -6,8 +6,8 @@ using System.Text;
 
 using Newtonsoft.Json;
 
-namespace Icarus.Models
-{
+namespace Icarus.Models;
+
 public class CoverArt
 {
     #region Properties
@@ -40,4 +40,3 @@ namespace Icarus.Models
     }
     #endregion
 }
-}

Models/Genre.cs

@@ -4,8 +4,8 @@ using System.ComponentModel.DataAnnotations.Schema;
 
 using Newtonsoft.Json;
 
-namespace Icarus.Models
-{
+namespace Icarus.Models;
+
 public class Genre
 {
     [JsonProperty("genre_id")]
@@ -20,4 +20,3 @@ namespace Icarus.Models
     [NotMapped]
     public List<Song> Songs { get; set; }
 }
-}

Models/LoginResult.cs

@@ -2,8 +2,8 @@ using System;
 
 using Newtonsoft.Json;
 
-namespace Icarus.Models
-{
+namespace Icarus.Models;
+
 public class LoginResult : BaseResult
 {
     [JsonProperty("user_id")]
@@ -17,4 +17,3 @@ namespace Icarus.Models
     [JsonProperty("expiration")]
     public int Expiration { get; set; }
 }
-}

Models/RegisterResult.cs

@@ -2,8 +2,8 @@ using System;
 
 using Newtonsoft.Json;
 
-namespace Icarus.Models
-{
+namespace Icarus.Models;
+
 public class RegisterResult : BaseResult
 {
     [JsonProperty("username")]
@@ -11,4 +11,3 @@ namespace Icarus.Models
     [JsonProperty("successfully_registered")]
     public bool SuccessfullyRegistered { get; set; }
 }
-}

Models/Song.cs

@@ -5,8 +5,8 @@ using System.Threading.Tasks;
 
 using Newtonsoft.Json;
 
-namespace Icarus.Models
-{
+namespace Icarus.Models;
+
 public class Song
 {
     #region Properties
@@ -99,4 +99,3 @@ namespace Icarus.Models
     }
     #endregion
 }
-}

Models/SongData.cs

@@ -1,12 +1,11 @@
 using System;
 using System.Text;
 
-namespace Icarus.Models
-{
+namespace Icarus.Models;
+
 public class SongData
 {
     public int ID { get; set; }
     public byte[] Data { get; set; }
     public int SongID { get; set; }
 }
-}

Models/SongResult.cs

@@ -2,8 +2,8 @@ using System;
 
 using Newtonsoft.Json;
 
-namespace Icarus.Models
-{
+namespace Icarus.Models;
+
 public class SongResult
 {
     [JsonProperty("message")]
@@ -11,4 +11,3 @@ namespace Icarus.Models
     [JsonProperty("song_title")]
     public string SongTitle { get; set; }
 }
-}

Models/Token.cs

@@ -4,8 +4,8 @@ using System.Linq;
 using Newtonsoft.Json;
 
 
-namespace Icarus.Models
-{
+namespace Icarus.Models;
+
 public class Token
 {
     #region Properties
@@ -53,4 +53,3 @@ namespace Icarus.Models
     }
     #endregion
 }
-}

Models/User.cs

@@ -5,8 +5,8 @@ using System.Linq;
 
 using Newtonsoft.Json;
 
-namespace Icarus.Models
-{
+namespace Icarus.Models;
+
 [Table("User")]
 public class User
 {
@@ -54,4 +54,3 @@ namespace Icarus.Models
     }
     #endregion
 }
-}

Program.cs

@@ -11,8 +11,8 @@ using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
 using NLog.Web;
 
-namespace Icarus
-{
+namespace Icarus;
+
 public class Program
 {
     public static void Main(string[] args)
@@ -43,4 +43,3 @@ namespace Icarus
                 webBuilder.UseStartup<Startup>();
             });
 }
-}

Startup.cs

@@ -20,8 +20,7 @@ using NLog.Web.AspNetCore;
 
 using Icarus.Database.Contexts;
 
-namespace Icarus
-{
+namespace Icarus;
 public class Startup
 {
     #region Constructors
@@ -124,4 +123,3 @@ namespace Icarus
     }
     #endregion
 }
-}

Types/CoverArtTypes.cs

@@ -1,10 +1,9 @@
 using System;
 
-namespace Icarus.Types
-{
+namespace Icarus.Types;
+
 public enum CoverArtField
 {
     SongTitle = 0,
     ImagePath
 };
-}

Types/DirectoryTypes.cs

@@ -1,10 +1,9 @@
 using System;
 
-namespace Icarus.Types
-{
+namespace Icarus.Types;
+
 public enum DirectoryType
 {
     Music = 0,
     CoverArt
 };
-}