phoenix/icarus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 33 Wiki Activity

#93: Add flac support #101

Merged
kdeng00 merged 25 commits from tsk-93 into master 2024-07-27 13:19:12 -04:00
Conversation 0 Commits 25 Files Changed 50
+286 -277
41 changed files with 286 additions and 277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 37441fea45 - Show all commits
Authorization/Handlers/HasScopeHandler.cs
+1 -5
View File
@@ -1,7 +1,3 @@
using System;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authorization;
using Icarus.Authorization;
@@ -18,7 +14,7 @@ public class HasScopeHandler : AuthorizationHandler<HasScopeRequirement>
}
var scopes = context.User.FindFirst(c =>
c.Type == "scope" && c.Issuer == requirement.Issuer).Value.Split(' ');
c.Type == "scope" && c.Issuer == requirement.Issuer)!.Value.Split(' ');
if (scopes.Any(s => s == requirement.Scope))
{
Constants/FileExtensions.cs
+1 -1
View File
@@ -3,7 +3,7 @@ namespace Icarus.Constants;
public class FileExtensions
{
// Contains the default audio file extension with period at the beginning
public static string DEFAULT_AUDIO_EXTENSION = WAV_EXTENSION;
public static string DEFAULT_AUDIO_EXTENSION = WAV_EXTENSION!;
// Contains file extension with period at the beginning
public static string MP3_EXTENSION = ".mp3";
Controllers/Managers/AlbumManager.cs
+12 -12
View File
@@ -6,7 +6,7 @@ namespace Icarus.Controllers.Managers;
public class AlbumManager : BaseManager
{
#region Fields
private AlbumContext _albumContext;
private AlbumContext? _albumContext;
#endregion
@@ -33,11 +33,11 @@ public class AlbumManager : BaseManager
album.Title = song.AlbumTitle;
album.AlbumArtist = song.Artist;
album.Year = song.Year.Value;
album.Year = song.Year!.Value;
var albumTitle = song.AlbumTitle;
var albumArtist = song.Artist;
var albumRetrieved = _albumContext.Albums.FirstOrDefault(alb => alb.Title.Equals(albumTitle) && alb.AlbumArtist.Equals(albumArtist));
var albumRetrieved = _albumContext!.Albums!.FirstOrDefault(alb => alb.Title!.Equals(albumTitle) && alb.AlbumArtist!.Equals(albumArtist));
if (albumRetrieved == null)
{
@@ -58,7 +58,7 @@ public class AlbumManager : BaseManager
public void DeleteAlbumFromDatabase(Song song)
{
var album = _albumContext.Albums.FirstOrDefault(alb => alb.Title.Equals(song.AlbumTitle));
var album = _albumContext!.Albums!.FirstOrDefault(alb => alb.Title!.Equals(song.AlbumTitle));
if (album == null)
{
@@ -72,7 +72,7 @@ public class AlbumManager : BaseManager
public Album UpdateAlbumInDatabase(Song oldSong, Song newSong)
{
var albumRecord = _albumContext.Albums.FirstOrDefault(alb => alb.Title.Equals(oldSong.AlbumTitle));
var albumRecord = _albumContext!.Albums!.FirstOrDefault(alb => alb.Title!.Equals(oldSong.AlbumTitle));
var oldAlbumTitle = oldSong.AlbumTitle;
var oldAlbumArtist = oldSong.Artist;
var newAlbumTitle = newSong.AlbumTitle;
@@ -86,7 +86,7 @@ public class AlbumManager : BaseManager
newAlbumTitle = oldAlbumTitle;
if ((string.IsNullOrEmpty(newAlbumTitle) && string.IsNullOrEmpty(newAlbumArtist) ||
oldAlbumTitle.Equals(newAlbumTitle) && oldAlbumArtist.Equals(newAlbumArtist)))
oldAlbumTitle!.Equals(newAlbumTitle) && oldAlbumArtist!.Equals(newAlbumArtist)))
{
_logger.Info("No change to the song's album");
return albumRecord!;
@@ -95,7 +95,7 @@ public class AlbumManager : BaseManager
info = "Change to the song's album";
_logger.Info(info);
var existingAlbumRecord = _albumContext.Albums.FirstOrDefault(alb => alb.Title.Equals(oldSong.AlbumTitle));
var existingAlbumRecord = _albumContext.Albums!.FirstOrDefault(alb => alb.Title!.Equals(oldSong.AlbumTitle));
if (existingAlbumRecord == null)
{
_logger.Info("Creating new album record");
@@ -104,7 +104,7 @@ public class AlbumManager : BaseManager
{
Title = newAlbumTitle,
AlbumArtist = newAlbumArtist,
Year = newSong.Year.Value
Year = newSong.Year!.Value
};
_albumContext.Add(newAlbumRecord);
@@ -116,8 +116,8 @@ public class AlbumManager : BaseManager
{
_logger.Info("Updating existing album record");
existingAlbumRecord = _albumContext.Albums.FirstOrDefault(alb => alb.Title.Equals(newSong.AlbumTitle));
existingAlbumRecord.AlbumArtist = newAlbumArtist;
existingAlbumRecord = _albumContext.Albums!.FirstOrDefault(alb => alb.Title!.Equals(newSong.AlbumTitle));
existingAlbumRecord!.AlbumArtist = newAlbumArtist;
_albumContext.Update(existingAlbumRecord);
_albumContext.SaveChanges();
@@ -130,7 +130,7 @@ public class AlbumManager : BaseManager
{
if (SongsInAlbum(album) <= 1)
{
_albumContext.Remove(album);
_albumContext!.Remove(album);
_albumContext.SaveChanges();
}
}
@@ -138,7 +138,7 @@ public class AlbumManager : BaseManager
private int SongsInAlbum(Album album)
{
var sngContext = new SongContext(_connectionString!);
var songs = sngContext.Songs.Where(sng => sng.AlbumId == album.Id).ToList();
var songs = sngContext!.Songs!.Where(sng => sng.AlbumId == album.Id).ToList();
return songs.Count;
}
Controllers/Managers/ArtistManager.cs
+16 -16
View File
@@ -6,7 +6,7 @@ namespace Icarus.Controllers.Managers;
public class ArtistManager : BaseManager
{
#region Fields
private ArtistContext _artistContext;
private ArtistContext? _artistContext;
#endregion
@@ -19,7 +19,7 @@ public class ArtistManager : BaseManager
{
_config = config;
_connectionString = _config.GetConnectionString("DefaultConnection");
_artistContext = new ArtistContext(_connectionString);
_artistContext = new ArtistContext(_connectionString!);
}
#endregion
@@ -35,7 +35,7 @@ public class ArtistManager : BaseManager
SongCount = 1
};
var artistRetrieved = _artistContext.Artists.FirstOrDefault(art => art.Name.Equals(artist.Name));
var artistRetrieved = _artistContext!.Artists.FirstOrDefault(art => art.Name!.Equals(artist.Name));
if (artistRetrieved == null)
{
@@ -53,11 +53,11 @@ public class ArtistManager : BaseManager
public Artist UpdateArtistInDatabase(Song oldSongRecord, Song newSongRecord)
{
var oldArtistRecord = _artistContext.Artists.FirstOrDefault(art => art.Name.Equals(oldSongRecord.AlbumTitle));
var oldArtistName = oldArtistRecord.Name;
var oldArtistRecord = _artistContext!.Artists.FirstOrDefault(art => art.Name!.Equals(oldSongRecord.AlbumTitle));
var oldArtistName = oldArtistRecord!.Name;
var newArtistName = newSongRecord.Artist;
if (string.IsNullOrEmpty(newArtistName) || oldArtistName.Equals(newArtistName))
if (string.IsNullOrEmpty(newArtistName) || oldArtistName!.Equals(newArtistName))
{
_logger.Info("No change to the song's Artist");
return oldArtistRecord;
@@ -73,7 +73,7 @@ public class ArtistManager : BaseManager
_artistContext.SaveChanges();
}
if (!(_artistContext.Artists.FirstOrDefault(art => art.Name.Equals(oldSongRecord.AlbumTitle)) != null))
if (!(_artistContext.Artists.FirstOrDefault(art => art.Name!.Equals(oldSongRecord.AlbumTitle)) != null))
{
_logger.Info("Creating new artist record");
@@ -91,36 +91,36 @@ public class ArtistManager : BaseManager
{
_logger.Info("Updating existing artist record");
var existingArtistRecord = _artistContext.Artists.FirstOrDefault(art => art.Name.Equals(newSongRecord.AlbumTitle));
var existingArtistRecord = _artistContext.Artists.FirstOrDefault(art => art.Name!.Equals(newSongRecord.AlbumTitle));
_artistContext.Update(existingArtistRecord);
_artistContext.Update(existingArtistRecord!);
_artistContext.SaveChanges();
return existingArtistRecord;
return existingArtistRecord!;
}
}
public void DeleteArtistFromDatabase(Song song)
{
if (!(_artistContext.Artists.FirstOrDefault(art => art.Name.Equals(song.Artist)) != null))
if (!(_artistContext!.Artists.FirstOrDefault(art => art.Name!.Equals(song.Artist)) != null))
{
_logger.Info("Cannot delete the artist record because it does not exist");
return;
}
var artist = _artistContext.Artists.FirstOrDefault(art => art.Name.Equals(song.Artist));
var artist = _artistContext.Artists.FirstOrDefault(art => art.Name!.Equals(song.Artist));
if (SongsOfArtist(artist) <= 1)
if (SongsOfArtist(artist!) <= 1)
{
_artistContext.Remove(artist);
_artistContext!.Remove(artist!);
_artistContext.SaveChanges();
}
}
private int SongsOfArtist(Artist artist)
{
var sngContext = new SongContext(_connectionString);
var songs = sngContext.Songs.Where(sng => sng.ArtistId == artist.Id).ToList();
var sngContext = new SongContext(_connectionString!);
var songs = sngContext.Songs!.Where(sng => sng.ArtistId == artist.Id).ToList();
return songs.Count;
}
Controllers/Managers/CoverArtManager.cs
+15 -13
View File
@@ -8,10 +8,10 @@ namespace Icarus.Controllers.Managers;
public class CoverArtManager : BaseManager
{
#region Fields
private string _rootCoverArtPath;
private CoverArtContext _coverArtContext;
private byte[] _stockCoverArt = null;
private const string _filename = "CoverArt.png";
private string? _rootCoverArtPath;
private CoverArtContext? _coverArtContext;
private byte[]? _stockCoverArt = null;
private const string? _filename = "CoverArt.png";
#endregion
@@ -30,7 +30,7 @@ public class CoverArtManager : BaseManager
public void SaveCoverArtToDatabase(ref Song song, ref CoverArt coverArt)
{
_logger.Info("Saving cover art record to the database");
_coverArtContext.Add(coverArt);
_coverArtContext!.Add(coverArt);
_coverArtContext.SaveChanges();
song.CoverArtId = coverArt.Id;
@@ -39,7 +39,7 @@ public class CoverArtManager : BaseManager
{
_logger.Info("Attempting to delete cover art from the database");
_coverArtContext.Attach(coverArt);
_coverArtContext!.Attach(coverArt);
_coverArtContext.Remove(coverArt);
_coverArtContext.SaveChanges();
}
@@ -68,11 +68,11 @@ public class CoverArtManager : BaseManager
}
}
public CoverArt SaveCoverArt(Song song)
public CoverArt? SaveCoverArt(Song song)
{
try
{
var dirMgr = new DirectoryManager(_rootCoverArtPath);
var dirMgr = new DirectoryManager(_rootCoverArtPath!);
var defaultExtension = ".png";
dirMgr.CreateDirectory(song);
@@ -103,7 +103,7 @@ public class CoverArtManager : BaseManager
metaData.UpdateCoverArt(song, coverArt);
coverArt.Directory = this._rootCoverArtPath;
coverArt.Filename = $"{segment}{defaultExtension}";
File.WriteAllBytes(coverArt.ImagePath(), _stockCoverArt);
File.WriteAllBytes(coverArt.ImagePath(), _stockCoverArt!);
}
coverArt.Type = metaData.CoverArtFileExtensionType(coverArt);
@@ -132,7 +132,7 @@ public class CoverArtManager : BaseManager
try
{
MetadataRetriever metaData = new MetadataRetriever();
var dirMgr = new DirectoryManager(_rootCoverArtPath);
var dirMgr = new DirectoryManager(_rootCoverArtPath!);
cover.Type = metaData.FileExtensionType(data);
var defaultExtension = "." + cover.Type;
dirMgr.CreateDirectory(song);
@@ -158,12 +158,14 @@ public class CoverArtManager : BaseManager
public CoverArt GetCoverArt(Song song)
{
return _coverArtContext.CoverArtImages.FirstOrDefault(cov => cov.SongTitle.Equals(song.Title));
var title = song.Title;
var cov = _coverArtContext!.CoverArtImages!.FirstOrDefault(cov => cov.SongTitle!.Equals(title));
return cov!;
}
private void Initialize()
{
_coverArtContext = new CoverArtContext(_connectionString);
_coverArtContext = new CoverArtContext(_connectionString!);
var path = DirectoryPaths.CoverArtDirectory + DirectoryPaths.CoverArtFilename;
if (System.IO.File.Exists(path))
@@ -172,7 +174,7 @@ public class CoverArtManager : BaseManager
if (!File.Exists(_rootCoverArtPath + _filename))
{
File.WriteAllBytes(_rootCoverArtPath + _filename,
_stockCoverArt);
_stockCoverArt!);
Console.WriteLine("Copied Stock Cover Art");
}
}
Controllers/Managers/DirectoryManager.cs
+7 -7
View File
@@ -7,14 +7,14 @@ namespace Icarus.Controllers.Managers;
public class DirectoryManager : BaseManager
{
#region Fields
private Song _song;
private string _rootSongDirectory;
private string _songDirectory;
private Song? _song;
private string? _rootSongDirectory;
private string? _songDirectory;
#endregion
#region Properties
public string SongDirectory
public string? SongDirectory
{
get => _songDirectory;
set => _songDirectory = value;
@@ -65,7 +65,7 @@ public class DirectoryManager : BaseManager
public void CreateDirectory()
{
this.CreateDirectory(_song);
this.CreateDirectory(_song!);
}
public void CreateDirectory(Song song)
@@ -222,7 +222,7 @@ public class DirectoryManager : BaseManager
private string AlbumDirectory()
{
return AlbumDirectory(_song);
return AlbumDirectory(_song!);
}
private string AlbumDirectory(Song song)
{
@@ -235,7 +235,7 @@ public class DirectoryManager : BaseManager
}
private string ArtistDirectory()
{
return ArtistDirectory(_song);
return ArtistDirectory(_song!);
}
private string ArtistDirectory(Song song)
{
Controllers/Managers/GenreManager.cs
+10 -10
View File
@@ -6,7 +6,7 @@ namespace Icarus.Controllers.Managers;
public class GenreManager : BaseManager
{
#region Fields
private GenreContext _genreContext;
private GenreContext? _genreContext;
#endregion
@@ -36,7 +36,7 @@ public class GenreManager : BaseManager
};
var genreName = song.Genre;
var genreRetrieved = _genreContext.Genres.FirstOrDefault(gnr => gnr.GenreName.Equals(genreName));
var genreRetrieved = _genreContext!.Genres!.FirstOrDefault(gnr => gnr.GenreName!.Equals(genreName));
if (genreRetrieved == null)
{
@@ -53,11 +53,11 @@ public class GenreManager : BaseManager
public Genre UpdateGenreInDatabase(Song oldSongRecord, Song newSongRecord)
{
var oldGenreRecord = _genreContext.Genres.FirstOrDefault(gnr => gnr.GenreName.Equals(oldSongRecord.Genre));
var oldGenreName = oldGenreRecord.GenreName;
var oldGenreRecord = _genreContext!.Genres!.FirstOrDefault(gnr => gnr.GenreName!.Equals(oldSongRecord.Genre));
var oldGenreName = oldGenreRecord!.GenreName;
var newGenreName = newSongRecord.Genre;
if (string.IsNullOrEmpty(newGenreName) || oldGenreName.Equals(newGenreName))
if (string.IsNullOrEmpty(newGenreName) || oldGenreName!.Equals(newGenreName))
{
_logger.Info("No change to the song's Genre");
return oldGenreRecord;
@@ -73,7 +73,7 @@ public class GenreManager : BaseManager
_genreContext.SaveChanges();
}
if (!(_genreContext.Genres.FirstOrDefault(gnr => gnr.GenreName.Equals(oldSongRecord.Genre)) != null))
if (!(_genreContext.Genres!.FirstOrDefault(gnr => gnr.GenreName!.Equals(oldSongRecord.Genre)) != null))
{
_logger.Info("Creating new genre record");
@@ -91,7 +91,7 @@ public class GenreManager : BaseManager
{
_logger.Info("Updating existing genre record");
var existingGenreRecord = _genreContext.Genres.FirstOrDefault(gnr => gnr.GenreName.Equals(oldGenreRecord.GenreName));
var existingGenreRecord = _genreContext.Genres!.FirstOrDefault(gnr => gnr.GenreName!.Equals(oldGenreRecord.GenreName));
_genreContext.Update(existingGenreRecord!);
_genreContext.SaveChanges();
@@ -102,13 +102,13 @@ public class GenreManager : BaseManager
public void DeleteGenreFromDatabase(Song song)
{
if (!(_genreContext.Genres.FirstOrDefault(gnr => gnr.GenreName.Equals(song.Genre)) != null))
if (!(_genreContext!.Genres!.FirstOrDefault(gnr => gnr.GenreName!.Equals(song.Genre)) != null))
{
_logger.Info("Cannot delete the genre record because it does not exist");
return;
}
var genre = _genreContext.Genres.FirstOrDefault(gnr => gnr.GenreName.Equals(song.Genre));
var genre = _genreContext.Genres!.FirstOrDefault(gnr => gnr.GenreName!.Equals(song.Genre));
if (SongsInGenre(genre!) <= 1)
{
@@ -120,7 +120,7 @@ public class GenreManager : BaseManager
private int SongsInGenre(Genre genre)
{
var sngContext = new SongContext(_connectionString!);
var songs = sngContext.Songs.Where(sng => sng.GenreId == genre.Id).ToList();
var songs = sngContext.Songs!.Where(sng => sng.GenreId == genre.Id).ToList();
return songs.Count;
}
Controllers/Managers/SongManager.cs
+17 -17
View File
@@ -18,17 +18,17 @@ public class SongManager : BaseManager
#region Properties
public string ArchiveDirectoryRoot
public string? ArchiveDirectoryRoot
{
get => _archiveDirectoryRoot;
set => _archiveDirectoryRoot = value;
}
public string CompressedSongFilename
public string? CompressedSongFilename
{
get => _compressedSongFilename;
set => _compressedSongFilename = value;
}
public string Message
public string? Message
{
get => _message;
set => _message = value;
@@ -64,7 +64,7 @@ public class SongManager : BaseManager
try
{
var oldSongRecord = _songContext.RetrieveRecord(song);
var oldSongRecord = _songContext!.RetrieveRecord(song);
song.Filename = oldSongRecord.Filename;
song.SongDirectory = oldSongRecord.SongDirectory;
@@ -73,19 +73,19 @@ public class SongManager : BaseManager
var updatedSong = updateMetadata.UpdatedSongRecord;
var albMgr = new AlbumManager(_config);
var gnrMgr = new GenreManager(_config);
var artMgr = new ArtistManager(_config);
var updatedAlbum = albMgr.UpdateAlbumInDatabase(oldSongRecord, updatedSong);
var albMgr = new AlbumManager(_config!);
var gnrMgr = new GenreManager(_config!);
var artMgr = new ArtistManager(_config!);
var updatedAlbum = albMgr.UpdateAlbumInDatabase(oldSongRecord, updatedSong!);
oldSongRecord.AlbumId = updatedAlbum.Id;
var updatedArtist = artMgr.UpdateArtistInDatabase(oldSongRecord, updatedSong);
var updatedArtist = artMgr.UpdateArtistInDatabase(oldSongRecord, updatedSong!);
oldSongRecord.ArtistId = updatedArtist.Id;
var updatedGenre = gnrMgr.UpdateGenreInDatabase(oldSongRecord, updatedSong);
var updatedGenre = gnrMgr.UpdateGenreInDatabase(oldSongRecord, updatedSong!);
oldSongRecord.GenreId = updatedGenre.Id;
UpdateSongInDatabase(ref oldSongRecord, ref updatedSong, ref result);
UpdateSongInDatabase(ref oldSongRecord, ref updatedSong!, ref result);
DeleteEmptyDirectories(ref oldSongRecord, ref updatedSong);
}
@@ -109,7 +109,7 @@ public class SongManager : BaseManager
var songPath = songMetaData.SongPath();
File.Delete(songPath);
successful = true;
DirectoryManager dirMgr = new DirectoryManager(_config, songMetaData);
DirectoryManager dirMgr = new DirectoryManager(_config!, songMetaData);
dirMgr.DeleteEmptyDirectories();
Console.WriteLine("Song successfully deleted");
}
@@ -123,7 +123,7 @@ public class SongManager : BaseManager
public bool DoesSongExist(Song song)
{
if (!_songContext.DoesRecordExist(song))
if (!_songContext!.DoesRecordExist(song))
{
return false;
}
@@ -142,7 +142,7 @@ public class SongManager : BaseManager
}
_logger.Info("Song deleted from the filesystem");
var coverMgr = new CoverArtManager(_config);
var coverMgr = new CoverArtManager(_config!);
var coverArt = coverMgr.GetCoverArt(song);
coverMgr.DeleteCoverArt(coverArt);
@@ -166,7 +166,7 @@ public class SongManager : BaseManager
var song = await SaveSongTemp(songFile);
DirectoryManager dirMgr = new DirectoryManager(_config, song);
DirectoryManager dirMgr = new DirectoryManager(_config!, song);
dirMgr.CreateDirectory();
var tempPath = song.SongPath();
@@ -183,7 +183,7 @@ public class SongManager : BaseManager
song.SongDirectory = dirMgr.SongDirectory;
var coverMgr = new CoverArtManager(_config);
var coverMgr = new CoverArtManager(_config!);
var coverArt = coverMgr.SaveCoverArt(song);
SaveSongToDatabase(song, coverArt);
@@ -529,7 +529,7 @@ public class SongManager : BaseManager
var artistMgr = new ArtistManager(_config!);
var genreMgr = new GenreManager(_config!);
var sngContext = new SongContext(_connectionString!);
sngContext.Songs.Remove(song);
sngContext.Songs!.Remove(song);
sngContext.SaveChanges();
artistMgr.DeleteArtistFromDatabase(song);
albumMgr.DeleteAlbumFromDatabase(song);
Controllers/Managers/TokenManager.cs
+23 -23
View File
@@ -15,16 +15,16 @@ namespace Icarus.Controllers.Managers;
public class TokenManager : BaseManager
{
#region Fields
private string _clientId;
private string _clientSecret;
private string _privateKeyPath = string.Empty;
private string _privateKey = string.Empty;
private string _publicKeyPath = string.Empty;
private string _publicKey = string.Empty;
private string _audience;
private string _grantType;
private string _url;
private string SUCCESSFUL_TOKEN_MESSAGE = "Successfully retrieved token";
private string? _clientId;
private string? _clientSecret;
private string? _privateKeyPath = string.Empty;
private string? _privateKey = string.Empty;
private string? _publicKeyPath = string.Empty;
private string? _publicKey = string.Empty;
private string? _audience;
private string? _grantType;
private string? _url;
private string? SUCCESSFUL_TOKEN_MESSAGE = "Successfully retrieved token";
#endregion
@@ -46,7 +46,7 @@ public class TokenManager : BaseManager
{
_logger.Info("Preparing Auth0 API request");
var client = new RestClient(_url);
var client = new RestClient(_url!);
var request = new RestRequest("oauth/token", Method.POST);
var tokenRequest = RetrieveTokenRequest();
@@ -68,7 +68,7 @@ public class TokenManager : BaseManager
.DeserializeObject<TokenTierOne>(response.Content);
_logger.Info("Response deserialized");
return this.InitializeLoginResult(user, tokenResult);
return this.InitializeLoginResult(user, tokenResult!);
}
@@ -80,7 +80,7 @@ public class TokenManager : BaseManager
payload.Add(new Claim("user_id", user.Id.ToString(), ClaimValueTypes.Integer));
var tokenHandler = new JwtSecurityTokenHandler();
var key = Encoding.ASCII.GetBytes(_config["JWT:Secret"]);
var key = Encoding.ASCII.GetBytes(_config!["JWT:Secret"]!);
var tokenDescriptor = new SecurityTokenDescriptor
{
Subject = new ClaimsIdentity(new Claim[]
@@ -101,7 +101,7 @@ public class TokenManager : BaseManager
return cl.Type.Equals("exp");
});
var expiredDate = DateTime.Parse(expClaim.Value);
var expiredDate = DateTime.Parse(expClaim!.Value);
var exp = Math.Floor((expiredDate - DateTime.UnixEpoch).TotalSeconds);
tokenResult.Expiration = Convert.ToInt32(exp);
@@ -197,7 +197,7 @@ public class TokenManager : BaseManager
var expiredDate = currentDate.AddMinutes(expLimit);
var issuer = "http://localhost:5002";
var audience = "http://localhost:5002";
var subject = _config["JWT:Subject"];
var subject = _config!["JWT:Subject"];
var claim = new List<System.Security.Claims.Claim>()
{
@@ -205,7 +205,7 @@ public class TokenManager : BaseManager
new Claim(JwtRegisteredClaimNames.Exp, expiredDate.ToString()),
new Claim(JwtRegisteredClaimNames.Aud, audience),
new Claim(JwtRegisteredClaimNames.Iss, issuer),
new Claim(JwtRegisteredClaimNames.Sub, subject),
new Claim(JwtRegisteredClaimNames.Sub, subject!),
new Claim(JwtRegisteredClaimNames.Iat, currentDate.ToString())
};
@@ -233,7 +233,7 @@ public class TokenManager : BaseManager
{
_logger.Info("Analyzing Auth0 information");
_clientId = _config["Auth0:ClientId"];
_clientId = _config!["Auth0:ClientId"];
_clientSecret = _config["Auth0:ClientSecret"];
_audience = _config["Auth0:ApiIdentifier"];
_grantType = "client_credentials";
@@ -258,23 +258,23 @@ public class TokenManager : BaseManager
private class TokenRequest
{
[JsonProperty("client_id")]
public string ClientId { get; set; }
public string? ClientId { get; set; }
[JsonProperty("client_secret")]
public string ClientSecret { get; set; }
public string? ClientSecret { get; set; }
[JsonProperty("audience")]
public string Audience { get; set; }
public string? Audience { get; set; }
[JsonProperty("grant_type")]
public string GrantType { get; set; }
public string? GrantType { get; set; }
}
private class TokenTierOne
{
[JsonProperty("access_token")]
public string AccessToken { get; set; }
public string? AccessToken { get; set; }
[JsonProperty("expires_in")]
public int Expiration { get; set; }
[JsonProperty("token_type")]
public string TokenType { get; set; }
public string? TokenType { get; set; }
}
#endregion
}
Controllers/Utilities/MetadataRetriever.cs
+18 -19
View File
@@ -8,9 +8,9 @@ namespace Icarus.Controllers.Utilities;
public class MetadataRetriever
{
#region Fields
private static NLog.Logger _logger = NLog.Web.NLogBuilder.ConfigureNLog("nlog.config").GetCurrentClassLogger();
private List<string> _supportedAudioFileTypes = new List<string> {"wav", "flac"};
private List<string> _supportedImageFileTypes = new List<string> {"jpeg", "jpg", "png"};
private static NLog.Logger? _logger = NLog.Web.NLogBuilder.ConfigureNLog("nlog.config").GetCurrentClassLogger();
private List<string>? _supportedAudioFileTypes = new List<string> {"wav", "flac"};
private List<string>? _supportedImageFileTypes = new List<string> {"jpeg", "jpg", "png"};
private Song? _updatedSong;
private string? _message;
private string? _title;
@@ -23,12 +23,12 @@ public class MetadataRetriever
#region Properties
public Song UpdatedSongRecord
public Song? UpdatedSongRecord
{
get => _updatedSong;
set => _updatedSong = value;
}
public string Message
public string? Message
{
get => _message;
set => _message = value;
@@ -99,9 +99,9 @@ public class MetadataRetriever
public bool IsSupportedFile(IFormFile file)
{
var supportedTypes = this._supportedAudioFileTypes;
this._supportedImageFileTypes.ForEach(t =>
this._supportedImageFileTypes!.ForEach(t =>
{
if (!supportedTypes.Contains(t))
if (!supportedTypes!.Contains(t))
{
supportedTypes.Add(t);
}
@@ -109,15 +109,15 @@ public class MetadataRetriever
var extensionType = this.FileExtensionType(file).ToLower();
return supportedTypes.Contains(extensionType);
return supportedTypes!.Contains(extensionType);
}
public bool IsSupportedFile(string path)
{
var supportedTypes = this._supportedAudioFileTypes;
this._supportedImageFileTypes.ForEach(t =>
this._supportedImageFileTypes!.ForEach(t =>
{
if (!supportedTypes.Contains(t))
if (!supportedTypes!.Contains(t))
{
supportedTypes.Add(t);
}
@@ -125,7 +125,7 @@ public class MetadataRetriever
var extensionType = this.FileExtensionType(path).ToLower();
return supportedTypes.Contains(extensionType);
return supportedTypes!.Contains(extensionType);
}
public Song RetrieveMetaData(string filePath)
@@ -162,7 +162,7 @@ public class MetadataRetriever
var msg = ex.Message;
Console.WriteLine("An error occurred in MetadataRetriever");
Console.WriteLine(msg);
_logger.Error(msg, "An error occurred in MetadataRetriever");
_logger!.Error(msg, "An error occurred in MetadataRetriever");
}
return song;
@@ -170,9 +170,8 @@ public class MetadataRetriever
public int RetrieveSongDuration(string filepath)
{
var duration = 0;
var fileTag = TagLib.File.Create(filepath);
duration = (int)fileTag.Properties.Duration.TotalSeconds;
var duration = (int)fileTag.Properties.Duration.TotalSeconds;
return duration;
}
@@ -194,7 +193,7 @@ public class MetadataRetriever
catch (Exception ex)
{
var msg = ex.Message;
_logger.Error(msg, "An error occurred in MetadataRetriever");
_logger!.Error(msg, "An error occurred in MetadataRetriever");
}
return [];
@@ -214,7 +213,7 @@ public class MetadataRetriever
{
var msg = ex.Message;
Console.WriteLine($"An error occurred: {msg}");
_logger.Error(msg, "An error occurred");
_logger!.Error(msg, "An error occurred");
Message = "Failed to update metadata";
}
}
@@ -253,7 +252,7 @@ public class MetadataRetriever
try
{
Console.WriteLine($"Updating metadata of {title}");
_logger.Info($"Updating metadata of {title}");
_logger!.Info($"Updating metadata of {title}");
foreach (var key in checkedValues.Keys)
{
@@ -314,7 +313,7 @@ public class MetadataRetriever
{
var msg = ex.Message;
Console.WriteLine($"An error occurred:\n{msg}");
_logger.Error(msg, "An error occurred");
_logger!.Error(msg, "An error occurred");
}
}
private void InitializeUpdatedSong(Song song)
@@ -326,7 +325,7 @@ public class MetadataRetriever
{
var songValues = new SortedDictionary<string, bool>();
Console.WriteLine("Checking for null data");
_logger.Info("Checking for null data");
_logger!.Info("Checking for null data");
try
{
Controllers/Utilities/PasswordEncryption.cs
+1 -1
View File
@@ -60,7 +60,7 @@ public class PasswordEncryption
_logger.Error(exMsg, "An error occurred");
}
return null;
return string.Empty;
}
string GenerateHash(string password, byte[] salt)
Controllers/Utilities/SongCompression.cs
+7 -7
View File
@@ -7,14 +7,14 @@ namespace Icarus.Controllers.Utilities;
public class SongCompression
{
#region Fields
string _compressedSongFilename;
string _tempDirectory;
byte[] _uncompressedSong;
string? _compressedSongFilename;
string? _tempDirectory;
byte[]? _uncompressedSong;
#endregion
#region Propterties
public string CompressedSongFilename
public string? CompressedSongFilename
{
get => _compressedSongFilename;
set => _compressedSongFilename = value;
@@ -91,7 +91,7 @@ public class SongCompression
Console.WriteLine(exMsg);
}
if (songDetails.Filename.Contains(Constants.FileExtensions.WAV_EXTENSION))
if (songDetails.Filename!.Contains(Constants.FileExtensions.WAV_EXTENSION))
{
_compressedSongFilename = StripExtension(songDetails.Filename);
}
@@ -102,7 +102,7 @@ public class SongCompression
// Method not being used
public byte[] CompressedSong(byte[] uncompressedSong)
{
byte[] compressedSong = null;
byte[]? compressedSong = null;
try
{
Console.WriteLine("Song has been successfully compressed");
@@ -114,7 +114,7 @@ public class SongCompression
Console.WriteLine(exMsg);
}
return compressedSong;
return compressedSong!;
}
Controllers/v1/AlbumController.cs
+5 -5
View File
@@ -12,8 +12,8 @@ namespace Icarus.Controllers.V1;
public class AlbumController : BaseController
{
#region Fields
private readonly ILogger<AlbumController> _logger;
private string _connectionString;
private readonly ILogger<AlbumController>? _logger;
private string? _connectionString;
#endregion
@@ -35,9 +35,9 @@ public class AlbumController : BaseController
[HttpGet]
public IActionResult GetAlbums()
{
var albumContext = new AlbumContext(_connectionString);
var albumContext = new AlbumContext(_connectionString!);
var albums = albumContext.Albums.ToList();
var albums = albumContext.Albums!.ToList();
if (albums.Count > 0)
return Ok(albums);
@@ -50,7 +50,7 @@ public class AlbumController : BaseController
{
Album album = new Album{ Id = id };
var albumContext = new AlbumContext(_connectionString);
var albumContext = new AlbumContext(_connectionString!);
if (albumContext.DoesRecordExist(album))
{
Controllers/v1/BaseController.cs
+1 -1
View File
@@ -6,7 +6,7 @@ namespace Icarus.Controllers.V1;
public class BaseController : ControllerBase
{
#region Fiends
protected IConfiguration _config;
protected IConfiguration? _config;
#endregion
Controllers/v1/CoverArtController.cs
+11 -11
View File
@@ -13,8 +13,8 @@ namespace Icarus.Controllers.V1;
public class CoverArtController : BaseController
{
#region Fields
private readonly ILogger<CoverArtController> _logger;
private string _connectionString;
private readonly ILogger<CoverArtController>? _logger;
private string? _connectionString;
#endregion
@@ -32,18 +32,18 @@ public class CoverArtController : BaseController
[HttpGet]
public IActionResult GetCoverArts()
{
var coverArtContext = new CoverArtContext(_connectionString);
var coverArtContext = new CoverArtContext(_connectionString!);
var coverArtRecords = coverArtContext.CoverArtImages.ToList();
var coverArtRecords = coverArtContext.CoverArtImages!.ToList();
if (coverArtRecords == null)
{
_logger.LogInformation("No cover art records");
_logger!.LogInformation("No cover art records");
return NotFound();
}
else
{
_logger.LogInformation("Found cover art records");
_logger!.LogInformation("Found cover art records");
return Ok(coverArtRecords);
}
}
@@ -53,13 +53,13 @@ public class CoverArtController : BaseController
{
var coverArt = new CoverArt { Id = id };
var coverArtContext = new CoverArtContext(_connectionString);
var coverArtContext = new CoverArtContext(_connectionString!);
coverArt = coverArtContext.RetrieveRecord(coverArt);
if (coverArt != null)
{
_logger.LogInformation("Found cover art record");
_logger!.LogInformation("Found cover art record");
var coverArtBytes = System.IO.File.ReadAllBytes(
coverArt.ImagePath());
@@ -68,7 +68,7 @@ public class CoverArtController : BaseController
}
else
{
_logger.LogInformation("Cover art not found");
_logger!.LogInformation("Cover art not found");
return NotFound();
}
}
@@ -76,8 +76,8 @@ public class CoverArtController : BaseController
[HttpGet("data/download/{id}")]
public async Task<IActionResult> Download(int id, [FromQuery] bool? randomizeFilename)
{
var songContext = new SongContext(_connectionString);
var covMgr = new CoverArtManager(this._config);
var songContext = new SongContext(_connectionString!);
var covMgr = new CoverArtManager(this._config!);
var songMetaData = songContext.RetrieveRecord(new Song { Id = id});
var c = covMgr.GetCoverArt(songMetaData);
Controllers/v1/GenreController.cs
+5 -5
View File
@@ -12,8 +12,8 @@ namespace Icarus.Controllers.V1;
public class GenreController : BaseController
{
#region Fields
private readonly ILogger<GenreController> _logger;
private string _connectionString;
private readonly ILogger<GenreController>? _logger;
private string? _connectionString;
#endregion
@@ -35,9 +35,9 @@ public class GenreController : BaseController
[HttpGet]
public IActionResult GetGenres()
{
var genreStore = new GenreContext(_connectionString);
var genreStore = new GenreContext(_connectionString!);
var genres = genreStore.Genres.ToList();
var genres = genreStore!.Genres!.ToList();
if (genres.Count > 0)
{
@@ -54,7 +54,7 @@ public class GenreController : BaseController
{
var genre = new Genre { Id = id };
var genreStore = new GenreContext(_connectionString);
var genreStore = new GenreContext(_connectionString!);
if (genreStore.DoesRecordExist(genre))
{
Controllers/v1/LoginController.cs
+3 -3
View File
@@ -55,12 +55,12 @@ public class LoginController : ControllerBase
try
{
if (context.Users.FirstOrDefault(usr => usr.Username.Equals(user.Username)) != null)
if (context.Users.FirstOrDefault(usr => usr.Username!.Equals(user.Username)) != null)
{
user = context.Users.FirstOrDefault(usr => usr.Username.Equals(user.Username))!;
user = context.Users.FirstOrDefault(usr => usr.Username!.Equals(user.Username))!;
var validatePass = new PasswordEncryption();
var validated = validatePass.VerifyPassword(user!, password);
var validated = validatePass.VerifyPassword(user!, password!);
if (!validated)
{
loginRes.Message = message;
Controllers/v1/RegisterController.cs
+5 -4
View File
@@ -11,7 +11,7 @@ namespace Icarus.Controllers.V1;
public class RegisterController : ControllerBase
{
#region Fields
private IConfiguration _config;
private IConfiguration? _config;
#endregion
@@ -35,11 +35,12 @@ public class RegisterController : ControllerBase
user.Status = "Registered";
user.DateCreated = DateTime.Now;
UserContext context = null;
UserContext? context = null;
try
{
context = new UserContext(_config.GetConnectionString("DefaultConnection"));
var connString = _config!.GetConnectionString("DefaultConnection");
context = new UserContext(connString!);
context.Add(user);
context.SaveChanges();
}
@@ -56,7 +57,7 @@ public class RegisterController : ControllerBase
Username = user.Username
};
if (context.Users.FirstOrDefault(sng => sng.Username.Equals(user.Username)) != null)
if (context!.Users.FirstOrDefault(sng => sng.Username!.Equals(user.Username)) != null)
{
registerResult.Message = "Successful registration";
registerResult.SuccessfullyRegistered = true;
Controllers/v1/SongCompressedDataControllers.cs
+7 -7
View File
@@ -14,9 +14,9 @@ namespace Icarus.Controllers.V1;
public class SongCompressedDataController : BaseController
{
#region Fields
private string _connectionString;
private string _songTempDir;
private string _archiveDir;
private string? _connectionString;
private string? _songTempDir;
private string? _archiveDir;
#endregion
@@ -39,9 +39,9 @@ public class SongCompressedDataController : BaseController
[HttpGet("{id}")]
public async Task<IActionResult> DownloadCompressedSong(int id, [FromQuery] bool? randomizeFilename)
{
var context = new SongContext(_connectionString);
var context = new SongContext(_connectionString!);
SongCompression cmp = new SongCompression(_archiveDir);
SongCompression cmp = new SongCompression(_archiveDir!);
Console.WriteLine($"Archive directory root: {_archiveDir}");
@@ -49,9 +49,9 @@ public class SongCompressedDataController : BaseController
var sng = context.RetrieveRecord(new Song{ Id = id });
SongData song = await cmp.RetrieveCompressedSong(sng);
var filename = DirectoryManager.GenerateDownloadFilename(10, Constants.FileExtensions.ZIP_EXTENSION, sng.Title, randomizeFilename);
var filename = DirectoryManager.GenerateDownloadFilename(10, Constants.FileExtensions.ZIP_EXTENSION, sng.Title!, randomizeFilename);
return File(song.Data, "application/x-msdownload", filename);
return File(song.Data!, "application/x-msdownload", filename);
}
#endregion
}
Controllers/v1/SongController.cs
+9 -9
View File
@@ -13,9 +13,9 @@ namespace Icarus.Controllers.V1;
public class SongController : BaseController
{
#region Fields
private readonly ILogger<SongController> _logger;
private string _connectionString;
private SongManager _songMgr;
private readonly ILogger<SongController>? _logger;
private string? _connectionString;
private SongManager? _songMgr;
#endregion
@@ -40,11 +40,11 @@ public class SongController : BaseController
public IActionResult GetSongs()
{
Console.WriteLine("Attemtping to retrieve songs");
_logger.LogInformation("Attempting to retrieve songs");
_logger!.LogInformation("Attempting to retrieve songs");
var context = new SongContext(_connectionString);
var context = new SongContext(_connectionString!);
var songs = context.Songs.ToList();
var songs = context.Songs!.ToList();
if (songs.Count > 0)
{
@@ -59,7 +59,7 @@ public class SongController : BaseController
[HttpGet("{id}")]
public IActionResult GetSong(int id)
{
var context = new SongContext(_connectionString);
var context = new SongContext(_connectionString!);
var song = context.RetrieveRecord(new Song{ Id = id });
@@ -76,9 +76,9 @@ public class SongController : BaseController
{
song.Id = id;
Console.WriteLine("Retrieving filepath of song");
_logger.LogInformation("Retrieving filepath of song");
_logger!.LogInformation("Retrieving filepath of song");
if (!_songMgr.DoesSongExist(song))
if (!_songMgr!.DoesSongExist(song))
{
return NotFound(new SongResult
{
Controllers/v1/SongDataController.cs
+30 -31
View File
@@ -13,10 +13,10 @@ namespace Icarus.Controllers.V1;
public class SongDataController : BaseController
{
#region Fields
private string _connectionString;
private ILogger<SongDataController> _logger;
private SongManager _songMgr;
private string _songTempDir;
private string? _connectionString;
private ILogger<SongDataController>? _logger;
private SongManager? _songMgr;
private string? _songTempDir;
#endregion
@@ -31,7 +31,7 @@ public class SongDataController : BaseController
_connectionString = _config.GetConnectionString("DefaultConnection");
_logger = logger;
_songTempDir = _config.GetValue<string>("TemporaryMusicPath");
_songMgr = new SongManager(config, _songTempDir);
_songMgr = new SongManager(config, _songTempDir!);
}
#endregion
@@ -39,29 +39,29 @@ public class SongDataController : BaseController
[HttpGet("download/{id}")]
public IActionResult Download(int id, [FromQuery] bool? randomizeFilename)
{
var songContext = new SongContext(_connectionString);
var songContext = new SongContext(_connectionString!);
var songMetaData = songContext.RetrieveRecord(new Song { Id = id});
var song = _songMgr.RetrieveSong(songMetaData).Result;
var song = _songMgr!.RetrieveSong(songMetaData).Result;
string filename;
switch (songMetaData.AudioType)
{
case "wav":
filename = DirectoryManager.GenerateDownloadFilename(10, Constants.FileExtensions.WAV_EXTENSION,
songMetaData.Title, randomizeFilename);
songMetaData.Title!, randomizeFilename);
break;
case "flac":
filename = DirectoryManager.GenerateDownloadFilename(10, Constants.FileExtensions.FLAC_EXTENSION,
songMetaData.Title, randomizeFilename);
songMetaData.Title!, randomizeFilename);
break;
default:
filename = DirectoryManager.GenerateDownloadFilename(10, Constants.FileExtensions.DEFAULT_AUDIO_EXTENSION,
songMetaData.Title, randomizeFilename);
songMetaData.Title!, randomizeFilename);
break;
}
return File(song.Data, "application/x-msdownload", filename);
return File(song.Data!, "application/x-msdownload", filename);
}
// Assumes that the song already has metadata such as
@@ -82,19 +82,19 @@ public class SongDataController : BaseController
try
{
// Console.WriteLine("Uploading song...");
_logger.LogInformation("Uploading song...");
_logger!.LogInformation("Uploading song...");
var uploads = _songTempDir;
// Console.WriteLine($"Song Root Path {uploads}");
_logger.LogInformation($"Song root path {uploads}");
_logger!.LogInformation($"Song root path {uploads}");
foreach (var sng in songData)
if (sng.Length > 0)
{
// Console.WriteLine($"Song filename {sng.FileName}");
_logger.LogInformation($"Song filename {sng.FileName}");
_logger!.LogInformation($"Song filename {sng.FileName}");
_songMgr.SaveSongToFileSystem(sng).Wait();
_songMgr!.SaveSongToFileSystem(sng).Wait();
}
return Ok();
@@ -102,7 +102,7 @@ public class SongDataController : BaseController
catch (Exception ex)
{
var msg = ex.Message;
_logger.LogError(msg, "An error occurred");
_logger!.LogError(msg, "An error occurred");
}
return NotFound();
@@ -117,10 +117,10 @@ public class SongDataController : BaseController
{
try
{
if (up.SongData.Length > 0 && up.CoverArtData.Length > 0 && !string.IsNullOrEmpty(up.SongFile))
if (up.SongData!.Length > 0 && up.CoverArtData!.Length > 0 && !string.IsNullOrEmpty(up.SongFile))
{
var meta = new Utilities.MetadataRetriever();
var tmpSong = this._songMgr.SaveSongTemp(up.SongData).Result;
var tmpSong = this._songMgr!.SaveSongTemp(up.SongData).Result;
if (!meta.IsSupportedFile(tmpSong.SongPath()) && !meta.IsSupportedFile(up.CoverArtData))
{
return BadRequest("Media is not supported");
@@ -135,18 +135,17 @@ public class SongDataController : BaseController
}
var song = Newtonsoft.Json.JsonConvert.DeserializeObject<Song>(up.SongFile);
var tokMgr = new TokenManager(this._config);
var tokMgr = new TokenManager(this._config!);
var accessToken = Request.Headers["Authorization"];
var userId = tokMgr.RetrieveUserIdFromToken(accessToken);
var userId = tokMgr.RetrieveUserIdFromToken(accessToken!);
if (userId != -1)
{
song.UserId = userId;
song!.UserId = userId;
}
_logger.LogInformation($"Song title: {song.Title}");
_logger!.LogInformation($"Song title: {song!.Title}");
// var fileType =
song.Filename = tmpSong.Filename;
song.SongDirectory = tmpSong.SongDirectory;
song.DateCreated = tmpSong.DateCreated;
@@ -172,7 +171,7 @@ public class SongDataController : BaseController
}
catch (Exception ex)
{
_logger.LogError(ex.Message, "An error occurred");
_logger!.LogError(ex.Message, "An error occurred");
}
return BadRequest();
@@ -181,7 +180,7 @@ public class SongDataController : BaseController
[HttpDelete("delete/{id}")]
public IActionResult DeleteSong(int id)
{
var songContext = new SongContext(_connectionString);
var songContext = new SongContext(_connectionString!);
var songMetaData = new Song{ Id = id };
Console.WriteLine($"Id {songMetaData.Id}");
@@ -190,14 +189,14 @@ public class SongDataController : BaseController
if (string.IsNullOrEmpty(songMetaData.Title))
{
_logger.LogInformation("Song does not exist");
_logger!.LogInformation("Song does not exist");
return NotFound("Song does not exist");
}
else
{
_logger.LogInformation("Starting process of deleting song from the filesystem and database");
_logger!.LogInformation("Starting process of deleting song from the filesystem and database");
_songMgr.DeleteSong(songMetaData);
_songMgr!.DeleteSong(songMetaData);
return Ok(songMetaData);
}
@@ -207,11 +206,11 @@ public class SongDataController : BaseController
public class UploadSongWithDataForm
{
[FromForm(Name = "file")]
public IFormFile SongData { get; set; }
public IFormFile? SongData { get; set; }
// NOTE: Think about making this optional and if it is not provided, use the stock cover art
[FromForm(Name = "cover")]
public IFormFile CoverArtData { get; set; }
public IFormFile? CoverArtData { get; set; }
[FromForm(Name = "metadata")]
public string SongFile { get; set; }
public string? SongFile { get; set; }
}
}
Controllers/v1/SongStreamController.cs
+5 -5
View File
@@ -11,7 +11,7 @@ namespace Icarus.Controllers.V1;
public class SongStreamController : BaseController
{
#region Fields
private ILogger<SongStreamController> _logger;
private ILogger<SongStreamController>? _logger;
#endregion
@@ -32,11 +32,11 @@ public class SongStreamController : BaseController
[HttpGet("{id}")]
public async Task<IActionResult> StreamSong(int id)
{
var context = new SongContext(_config.GetConnectionString("DefaultConnection"));
var context = new SongContext(_config!.GetConnectionString("DefaultConnection")!);
var song = context.Songs.FirstOrDefault(sng => sng.Id == id);
var song = context.Songs!.FirstOrDefault(sng => sng.Id == id);
var stream = new FileStream(song.SongPath(), FileMode.Open, FileAccess.Read);
var stream = new FileStream(song!.SongPath(), FileMode.Open, FileAccess.Read);
stream.Position = 0;
var filename = song.Filename;
@@ -45,7 +45,7 @@ public class SongStreamController : BaseController
filename = song.GenerateFilename();
}
_logger.LogInformation("Starting to stream song...>");
_logger!.LogInformation("Starting to stream song...>");
Console.WriteLine("Starting to streamsong...");
return await Task.Run(() => {
Database/Contexts/AlbumContext.cs
+4 -3
View File
@@ -6,7 +6,7 @@ namespace Icarus.Database.Contexts;
public class AlbumContext : DbContext
{
public DbSet<Album> Albums { get; set; }
public DbSet<Album>? Albums { get; set; }
public AlbumContext(DbContextOptions<AlbumContext> options) : base(options) { }
public AlbumContext(string connString) : base(new DbContextOptionsBuilder<AlbumContext>()
@@ -22,11 +22,12 @@ public class AlbumContext : DbContext
public Album RetrieveRecord(Album album)
{
return Albums.FirstOrDefault(alb => alb.Id == album.Id);
var albm = Albums!.FirstOrDefault(alb => alb.Id == album.Id);
return albm!;
}
public bool DoesRecordExist(Album album)
{
return Albums.FirstOrDefault(alb => alb.Id == album.Id) != null ? true : false;
return Albums!.FirstOrDefault(alb => alb.Id == album.Id) != null ? true : false;
}
}
Database/Contexts/ArtistContext.cs
+1 -1
View File
@@ -23,7 +23,7 @@ public class ArtistContext : DbContext
public Artist RetrieveRecord(Artist artist)
{
return Artists.FirstOrDefault(arst => arst.Id == artist.Id);
return Artists.FirstOrDefault(arst => arst.Id == artist.Id)!;
}
Database/Contexts/CoverArtContext.cs
+5 -3
View File
@@ -6,7 +6,9 @@ namespace Icarus.Database.Contexts;
public class CoverArtContext : DbContext
{
public DbSet<CoverArt> CoverArtImages { get; set; }
#region Properties
public DbSet<CoverArt>? CoverArtImages { get; set; }
#endregion
public CoverArtContext(DbContextOptions<CoverArtContext> options) : base(options) { }
public CoverArtContext(string connString) : base(new DbContextOptionsBuilder<CoverArtContext>()
@@ -22,11 +24,11 @@ public class CoverArtContext : DbContext
public CoverArt RetrieveRecord(CoverArt cover)
{
return CoverArtImages.FirstOrDefault(cov => cov.Id == cover.Id);
return CoverArtImages!.FirstOrDefault(cov => cov.Id == cover.Id)!;
}
public bool DoesRecordExist(CoverArt cover)
{
return CoverArtImages.FirstOrDefault(cov => cov.Id == cover.Id) != null ? true : false;
return CoverArtImages!.FirstOrDefault(cov => cov.Id == cover.Id) != null ? true : false;
}
}
Database/Contexts/GenreContext.cs
+7 -3
View File
@@ -6,7 +6,10 @@ namespace Icarus.Database.Contexts;
public class GenreContext : DbContext
{
public DbSet<Genre> Genres { get; set; }
#region Properties
public DbSet<Genre>? Genres { get; set; }
#endregion
public GenreContext(DbContextOptions<GenreContext> options) : base(options) { }
public GenreContext(string connString) : base(new DbContextOptionsBuilder<GenreContext>()
.UseMySQL(connString).Options)
@@ -22,11 +25,12 @@ public class GenreContext : DbContext
public Genre RetrieveRecord(Genre genre)
{
return Genres.FirstOrDefault(gnr => gnr.Id == genre.Id);
var gnre = Genres!.FirstOrDefault(gnr => gnr.Id == genre.Id);
return gnre!;
}
public bool DoesRecordExist(Genre genre)
{
return Genres.FirstOrDefault(gnr => gnr.Id == genre.Id) != null ? true : false;
return Genres!.FirstOrDefault(gnr => gnr.Id == genre.Id) != null ? true : false;
}
}
Database/Contexts/SongContext.cs
+4 -3
View File
@@ -6,7 +6,7 @@ namespace Icarus.Database.Contexts;
public class SongContext : DbContext
{
public DbSet<Song> Songs { get; set; }
public DbSet<Song>? Songs { get; set; }
public SongContext(string connString) : base(new DbContextOptionsBuilder<SongContext>()
.UseMySQL(connString).Options)
@@ -41,12 +41,13 @@ public class SongContext : DbContext
public Song RetrieveRecord(Song song)
{
return Songs.FirstOrDefault(sng => sng.Id == song.Id);
var sng = Songs!.FirstOrDefault(sng => sng.Id == song.Id);
return sng!;
}
public bool DoesRecordExist(Song song)
{
return Songs.FirstOrDefault(sng => sng.Id == song.Id) != null ? true : false;
return Songs!.FirstOrDefault(sng => sng.Id == song.Id) != null ? true : false;
}
}
Database/Contexts/UserContext.cs
+1 -1
View File
@@ -32,7 +32,7 @@ public class UserContext : DbContext
public User RetrieveRecord(User user)
{
return Users.FirstOrDefault(usr => usr.Id == user.Id);
return Users.FirstOrDefault(usr => usr.Id == user.Id)!;
}
public bool DoesRecordExist(User user)
Models/Album.cs
+4 -2
View File
@@ -6,16 +6,18 @@ namespace Icarus.Models;
public class Album
{
#region Properties
[JsonProperty("id")]
public int Id { get; set; }
[JsonProperty("title")]
public string Title { get; set; }
public string? Title { get; set; }
[JsonProperty("album_artist")]
[Column("Artist")]
public string AlbumArtist { get; set; }
public string? AlbumArtist { get; set; }
[JsonProperty("song_count")]
[NotMapped]
public int SongCount { get; set; }
[JsonProperty("year")]
public int Year { get; set; }
#endregion
}
Models/Artist.cs
+3 -1
View File
@@ -6,12 +6,14 @@ namespace Icarus.Models;
public class Artist
{
#region Properties
[JsonProperty("id")]
public int Id { get; set; }
[JsonProperty("name")]
[Column("Artist")]
public string Name { get; set; }
public string? Name { get; set; }
[JsonProperty("song_count")]
[NotMapped]
public int SongCount { get; set; }
#endregion
}
Models/BaseResult.cs
+1 -1
View File
@@ -5,5 +5,5 @@ namespace Icarus.Models;
public class BaseResult
{
[JsonProperty("message")]
public string Message { get; set; }
public string? Message { get; set; }
}
Models/CoverArt.cs
+5 -5
View File
@@ -8,13 +8,13 @@ public class CoverArt
[JsonProperty("id")]
public int Id { get; set; }
[JsonProperty("title")]
public string SongTitle { get; set; }
public string? SongTitle { get; set; }
[JsonIgnore]
public string Directory { get; set; }
public string? Directory { get; set; }
[JsonProperty("filename")]
public string Filename { get; set; }
public string? Filename { get; set; }
[JsonProperty("type")]
public string Type { get; set; }
public string? Type { get; set; }
#endregion
@@ -23,7 +23,7 @@ public class CoverArt
{
var fullPath = this.Directory;
if (fullPath[fullPath.Length -1] != '/')
if (fullPath![fullPath.Length -1] != '/')
{
fullPath += "/";
}
Models/Genre.cs
+3 -1
View File
@@ -6,12 +6,14 @@ namespace Icarus.Models;
public class Genre
{
#region Properties
[JsonProperty("id")]
public int Id { get; set; }
[JsonProperty("genre")]
[Column("Category")]
public string GenreName { get; set; }
public string? GenreName { get; set; }
[JsonProperty("song_count")]
[NotMapped]
public int SongCount { get; set; }
#endregion
}
Models/LoginResult.cs
+5 -3
View File
@@ -4,14 +4,16 @@ namespace Icarus.Models;
public class LoginResult : BaseResult
{
#region Properties
[JsonProperty("user_id")]
public int UserId { get; set; }
[JsonProperty("username")]
public string Username { get; set; }
public string? Username { get; set; }
[JsonProperty("token")]
public string Token { get; set; }
public string? Token { get; set; }
[JsonProperty("token_type")]
public string TokenType { get; set; }
public string? TokenType { get; set; }
[JsonProperty("expiration")]
public int Expiration { get; set; }
#endregion
}
Models/RegisterResult.cs
+3 -1
View File
@@ -4,8 +4,10 @@ namespace Icarus.Models;
public class RegisterResult : BaseResult
{
#region Properties
[JsonProperty("username")]
public string Username { get; set; }
public string? Username { get; set; }
[JsonProperty("successfully_registered")]
public bool SuccessfullyRegistered { get; set; }
#endregion
}
Models/Song.cs
+1 -3
View File
@@ -80,7 +80,7 @@ public class Song
{
var fullPath = SongDirectory;
if (fullPath[fullPath.Length -1] != '/')
if (fullPath![fullPath.Length -1] != '/')
{
fullPath += "/";
}
@@ -95,7 +95,6 @@ public class Song
int length = Constants.DirectoryPaths.FILENAME_LENGTH;
string chars = Constants.DirectoryPaths.FILENAME_CHARACTERS;
var filename = this.Generate(length, chars);
// var extension = Icarus.Constants.FileExtensions.DEFAULT_AUDIO_EXTENSION;
var extension = this.DetermineFileExtension(flag);
return includeExtension ? $"{filename}{extension}" : filename;
@@ -104,7 +103,6 @@ public class Song
{
int length = Constants.DirectoryPaths.FILENAME_LENGTH;
string chars = Constants.DirectoryPaths.FILENAME_CHARACTERS;
// var extension = Icarus.Constants.FileExtensions.DEFAULT_AUDIO_EXTENSION;
var extension = this.DetermineFileExtension(flag);
var filename = await Task.Run(() =>
{
Models/SongData.cs
+3 -1
View File
@@ -2,7 +2,9 @@ namespace Icarus.Models;
public class SongData
{
#region Properties
public int ID { get; set; }
public byte[] Data { get; set; }
public byte[]? Data { get; set; }
public int SongID { get; set; }
#endregion
}
Models/SongResult.cs
+4 -2
View File
@@ -4,8 +4,10 @@ namespace Icarus.Models;
public class SongResult
{
#region Properties
[JsonProperty("message")]
public string Message { get; set; }
public string? Message { get; set; }
[JsonProperty("song_title")]
public string SongTitle { get; set; }
public string? SongTitle { get; set; }
#endregion
}
Models/Token.cs
+6 -14
View File
@@ -1,6 +1,3 @@
using System;
using System.Linq;
using Newtonsoft.Json;
@@ -10,13 +7,13 @@ public class Token
{
#region Properties
[JsonProperty("scope")]
public string Scope { get; set; }
public string? Scope { get; set; }
[JsonProperty("exp")]
public int Expiration { get; set; }
[JsonProperty("aud")]
public string Audience { get; set; }
public string? Audience { get; set; }
[JsonProperty("iss")]
public string Issuer { get; set; }
public string? Issuer { get; set; }
[JsonProperty("iat")]
public int Issued { get; set; }
#endregion
@@ -24,29 +21,24 @@ public class Token
#region Methods
public bool TokenExpired()
{
var result = false;
var currentDate = DateTime.Now;
var currentDateInSeconds = Math.Floor((currentDate - DateTime.UnixEpoch).TotalSeconds);
result = (currentDateInSeconds >= Expiration) ? true : false;
var result = (currentDateInSeconds >= Expiration) ? true : false;
return result;
}
public bool ContainsScope(string desiredScope)
{
var result = false;
result = Scope.Contains(desiredScope);
var result = Scope!.Contains(desiredScope);
return result;
}
public bool Erroneous()
{
var result = true;
Func<string, bool> isEmpty = a => string.IsNullOrEmpty(a);
result = (!isEmpty(Scope) && !isEmpty(Audience) && !isEmpty(Issuer) &&
var result = (!isEmpty(Scope!) && !isEmpty(Audience!) && !isEmpty(Issuer!) &&
Expiration > 0 && Issued > 0) ? false : true;
return result;
Models/User.cs
+10 -10
View File
@@ -14,39 +14,39 @@ public class User
[Key]
public int Id { get; set; }
[JsonProperty("username")]
public string Username { get; set; }
public string? Username { get; set; }
[JsonProperty("password")]
public string Password { get; set; }
public string? Password { get; set; }
[JsonProperty("email")]
public string Email { get; set; }
public string? Email { get; set; }
[JsonProperty("phone")]
[Column("Phone")]
public string Phone { get; set; }
public string? Phone { get; set; }
[JsonProperty("firstname")]
public string Firstname { get; set; }
public string? Firstname { get; set; }
[JsonProperty("lastname")]
public string Lastname { get; set; }
public string? Lastname { get; set; }
[JsonProperty("email_verified")]
[NotMapped]
public bool EmailVerified { get; set; }
[JsonProperty("date_created")]
public DateTime DateCreated { get; set; }
[JsonProperty("status")]
public string Status { get; set; }
public string? Status { get; set; }
[JsonProperty("last_login")]
public DateTime? LastLogin { get; set; }
[JsonIgnore]
[NotMapped]
public System.Collections.Generic.IEnumerable<string> Roles { get; set; }
public System.Collections.Generic.IEnumerable<string>? Roles { get; set; }
#endregion
#region Methods
public System.Collections.Generic.IEnumerable<System.Security.Claims.Claim> Claims()
{
var claims = new System.Collections.Generic.List<System.Security.Claims.Claim> { new System.Security.Claims.Claim(System.Security.Claims.ClaimTypes.Name, Username) };
claims.AddRange(Roles.Select(role => new System.Security.Claims.Claim(System.Security.Claims.ClaimTypes.Role, role)));
var claims = new System.Collections.Generic.List<System.Security.Claims.Claim> { new System.Security.Claims.Claim(System.Security.Claims.ClaimTypes.Name, Username!) };
claims.AddRange(Roles!.Select(role => new System.Security.Claims.Claim(System.Security.Claims.ClaimTypes.Role, role)));
return claims;
}
Program.cs
+7 -7
View File
@@ -64,16 +64,16 @@ builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme).AddJw
ValidateLifetime = true,
ValidAudience = Configuration["JWT:Audience"],
ValidIssuer = Configuration["JWT:Issuer"],
IssuerSigningKey = new SymmetricSecurityKey(System.Text.Encoding.UTF8.GetBytes(Configuration["JWT:Secret"]))
IssuerSigningKey = new SymmetricSecurityKey(System.Text.Encoding.UTF8.GetBytes(Configuration["JWT:Secret"]!))
};
});
builder.Services.AddDbContext<SongContext>(options => options.UseMySQL(connString));
builder.Services.AddDbContext<AlbumContext>(options => options.UseMySQL(connString));
builder.Services.AddDbContext<ArtistContext>(options => options.UseMySQL(connString));
builder.Services.AddDbContext<UserContext>(options => options.UseMySQL(connString));
builder.Services.AddDbContext<GenreContext>(options => options.UseMySQL(connString));
builder.Services.AddDbContext<CoverArtContext>(options => options.UseMySQL(connString));
builder.Services.AddDbContext<SongContext>(options => options.UseMySQL(connString!));
builder.Services.AddDbContext<AlbumContext>(options => options.UseMySQL(connString!));
builder.Services.AddDbContext<ArtistContext>(options => options.UseMySQL(connString!));
builder.Services.AddDbContext<UserContext>(options => options.UseMySQL(connString!));
builder.Services.AddDbContext<GenreContext>(options => options.UseMySQL(connString!));
builder.Services.AddDbContext<CoverArtContext>(options => options.UseMySQL(connString!));
builder.Services.AddControllers()
.AddNewtonsoftJson();