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

Modified Song model, added more functionality to the Album context and store, and need to work on how album records are handled when uploading songs. I left TODO's on where to pick up. #22, #25, #29

Browse Source
This commit is contained in:
amazing-username
2019-05-06 20:32:34 -04:00
parent 6b4b762207
commit 66f9a05341
8 changed files with 635 additions and 467 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Controllers/Managers/SongManager.cs
+447 -428
View File
@@ -12,468 +12,487 @@ using Id3;
using Id3.Frames; using Id3.Frames;
using MySql.Data; using MySql.Data;
using MySql.Data.MySqlClient; using MySql.Data.MySqlClient;
using NLog;
using TagLib; using TagLib;
using Icarus.Models;
using Icarus.Controllers.Utilities; using Icarus.Controllers.Utilities;
using Icarus.Models;
using Icarus.Models.Context;
namespace Icarus.Controllers.Managers namespace Icarus.Controllers.Managers
{ {
public class SongManager public class SongManager
{ {
#region Fields #region Fields
private MySqlConnection _conn; private static Logger _logger = NLog.Web.NLogBuilder.ConfigureNLog("nlog.config").GetCurrentClassLogger();
private MySqlCommand _cmd; private MySqlConnection _conn;
private MySqlDataAdapter _dataDump; private MySqlCommand _cmd;
private DataTable _results; private MySqlDataAdapter _dataDump;
private List<Song> _songs; private DataTable _results;
private Song _song; private List<Song> _songs;
private IConfiguration _config; private Song _song;
private string _connectionString; private IConfiguration _config;
private string _tempDirectoryRoot; private string _connectionString;
private string _archiveDirectoryRoot; private string _tempDirectoryRoot;
private string _compressedSongFilename; private string _archiveDirectoryRoot;
#endregion private string _compressedSongFilename;
#endregion
#region Properties #region Properties
public Song SongDetails public Song SongDetails
{
get => _song;
set => _song = value;
}
public string ArchiveDirectoryRoot
{
get => _archiveDirectoryRoot;
set => _archiveDirectoryRoot = value;
}
public string CompressedSongFilename
{
get => _compressedSongFilename;
set => _compressedSongFilename = value;
}
#endregion
#region Constructors
public SongManager()
{
Initialize();
InitializeConnection();
}
public SongManager(Song song)
{
Initialize();
InitializeConnection();
_song = song;
}
public SongManager(IConfiguration config)
{
_config = config;
Initialize();
InitializeConnection();
}
public SongManager(IConfiguration config, string tempDirectoryRoot)
{
_config = config;
_tempDirectoryRoot = tempDirectoryRoot;
Initialize();
InitializeConnection();
}
#endregion
#region Methods
public bool DeleteSongFromFileSystem(Song songMetaData)
{
bool successful = false;
try
{
var songPath = songMetaData.SongPath;
System.IO.File.Delete(songPath);
successful = true;
DirectoryManager dirMgr = new DirectoryManager(_config, songMetaData);
dirMgr.DeleteEmptyDirectories();
Console.WriteLine("Song successfully deleted");
}
catch (Exception ex)
{
var exMsg = ex.Message;
}
return successful;
}
public void SaveSongDetails()
{
try
{
using (MySqlConnection conn = new MySqlConnection(_connectionString))
{ {
conn.Open(); get => _song;
string query = "INSERT INTO Songs(Title, Album, Artist, Year, Genre, Duration, " + set => _song = value;
"Filename, SongPath) VALUES(@Title, @Album, @Artist, @Year, @Genre, " +
"@Duration, @Filename, @SongPath)";
using (MySqlCommand cmd = new MySqlCommand(query, conn))
{
cmd.Parameters.AddWithValue("@Title", _song.Title);
cmd.Parameters.AddWithValue("@Album", _song.Album);
cmd.Parameters.AddWithValue("@Artist", _song.Artist);
cmd.Parameters.AddWithValue("@Year", _song.Year);
cmd.Parameters.AddWithValue("@Genre", _song.Genre);
cmd.Parameters.AddWithValue("@Duration", _song.Duration);
cmd.Parameters.AddWithValue("@Filename", _song.Filename);
cmd.Parameters.AddWithValue("@SongPath", _song.SongPath);
cmd.ExecuteNonQuery();
}
} }
}
catch (Exception ex)
{
var exMsg = ex.Message;
Console.WriteLine($"An Error Occurred: {exMsg}");
}
}
public void SaveSongDetails(Song song)
{
try
{
using (MySqlConnection conn = new MySqlConnection(_connectionString))
{
conn.Open();
string query = "INSERT INTO Songs(Title, Album, Artist, Year, Genre, Duration, " +
", Filename, SongPath) VALUES(@Title, @Album, @Artist, @Year, @Genre, " +
"@Duration, @Filename, @SongPath)";
using (MySqlCommand cmd = new MySqlCommand(query, conn))
{
cmd.Parameters.AddWithValue("@Title", song.Title);
cmd.Parameters.AddWithValue("@Album", song.Album);
cmd.Parameters.AddWithValue("@Artist", song.Artist);
cmd.Parameters.AddWithValue("@Year", song.Year);
cmd.Parameters.AddWithValue("@Genre", song.Genre);
cmd.Parameters.AddWithValue("@Duration", song.Duration);
cmd.Parameters.AddWithValue("@Filename", song.Filename);
cmd.Parameters.AddWithValue("@SongPath", song.SongPath);
cmd.ExecuteNonQuery(); public string ArchiveDirectoryRoot
} {
get => _archiveDirectoryRoot;
set => _archiveDirectoryRoot = value;
} }
} public string CompressedSongFilename
catch (Exception ex)
{
var exMsg = ex.Message;
Console.WriteLine($"An Error Occurred: {exMsg}");
}
}
public async Task SaveSong(SongData songData)
{
try
{
using (MySqlConnection conn = new MySqlConnection(_connectionString))
{ {
conn.Open(); get => _compressedSongFilename;
string query = "INSERT INTO SongData(Data) VALUES(@Data)"; set => _compressedSongFilename = value;
using (MySqlCommand cmd = new MySqlCommand(query, conn))
{
cmd.Parameters.AddWithValue("@Data", songData.Data);
cmd.ExecuteNonQuery();
}
} }
} #endregion
catch(Exception ex)
{
var exMsg = ex.Message;
Console.WriteLine($"An error occurred: {exMsg}");
}
}
public async Task SaveSongToFileSystem(IFormFile song)
{
try
{
Console.WriteLine("Saving song to the filesystem");
var filePath = Path.Combine(_tempDirectoryRoot, song.FileName);
Console.WriteLine("Saving song to the filePath");
await SaveSongToFileSystemTemp(song, filePath);
System.IO.File.Delete(filePath);
DirectoryManager dirMgr = new DirectoryManager(_config, _song); #region Constructors
dirMgr.CreateDirectory(); public SongManager()
filePath = dirMgr.SongDirectory;
if (!song.FileName.EndsWith(".mp3"))
filePath += $"{song.FileName}.mp3";
else
filePath += $"{song.FileName}";
Console.WriteLine($"Full path {filePath}");
using (var fileStream = new FileStream(filePath, FileMode.Create))
{ {
await song.CopyToAsync(fileStream); Initialize();
_song.SongPath = filePath; InitializeConnection();
Console.WriteLine($"Writing song to the directory: {filePath}");
} }
}
catch (Exception ex)
{
var exMsg = ex.Message;
Console.WriteLine($"An error occurred: {exMsg}");
}
}
public async Task<List<Song>> RetrieveAllSongDetails() public SongManager(Song song)
{
try
{
InitializeResults();
_songs = new List<Song>();
_conn.Open();
string query = "SELECT * FROM Songs";
_cmd = new MySqlCommand(query, _conn);
_cmd.ExecuteNonQuery();
_dataDump = new MySqlDataAdapter(_cmd);
_dataDump.Fill(_results);
_dataDump.Dispose();
await PopulateSongDetails();
_conn.Close();
}
catch (Exception ex)
{
var exMsg = ex.Message;
Console.WriteLine($"An error ocurred: {exMsg}");
}
return _songs;
}
public async Task<Song> RetrieveSongDetails(int id)
{
DataTable results = new DataTable();
try
{
using (MySqlConnection conn = new MySqlConnection(_connectionString))
{ {
conn.Open(); Initialize();
string query = "SELECT * FROM Songs WHERE Id=@Id"; InitializeConnection();
using (MySqlCommand cmd = new MySqlCommand(query, conn)) _song = song;
{ }
cmd.Parameters.AddWithValue("@Id", id); public SongManager(IConfiguration config)
{
cmd.ExecuteNonQuery(); _config = config;
Initialize();
InitializeConnection();
}
public SongManager(IConfiguration config, string tempDirectoryRoot)
{
_config = config;
_tempDirectoryRoot = tempDirectoryRoot;
Initialize();
InitializeConnection();
}
#endregion
using (MySqlDataAdapter dataDump = new MySqlDataAdapter(cmd))
#region Methods
public bool DeleteSongFromFileSystem(Song songMetaData)
{
bool successful = false;
try
{
var songPath = songMetaData.SongPath;
System.IO.File.Delete(songPath);
successful = true;
DirectoryManager dirMgr = new DirectoryManager(_config, songMetaData);
dirMgr.DeleteEmptyDirectories();
Console.WriteLine("Song successfully deleted");
}
catch (Exception ex)
{
var exMsg = ex.Message;
}
return successful;
}
public void SaveSongDetails()
{
try
{
using (MySqlConnection conn = new MySqlConnection(_connectionString))
{
conn.Open();
string query = "INSERT INTO Songs(Title, Album, Artist, Year, Genre, Duration, " +
"Filename, SongPath) VALUES(@Title, @Album, @Artist, @Year, @Genre, " +
"@Duration, @Filename, @SongPath)";
using (MySqlCommand cmd = new MySqlCommand(query, conn))
{
cmd.Parameters.AddWithValue("@Title", _song.Title);
cmd.Parameters.AddWithValue("@Album", _song.Album);
cmd.Parameters.AddWithValue("@Artist", _song.Artist);
cmd.Parameters.AddWithValue("@Year", _song.Year);
cmd.Parameters.AddWithValue("@Genre", _song.Genre);
cmd.Parameters.AddWithValue("@Duration", _song.Duration);
cmd.Parameters.AddWithValue("@Filename", _song.Filename);
cmd.Parameters.AddWithValue("@SongPath", _song.SongPath);
cmd.ExecuteNonQuery();
}
}
}
catch (Exception ex)
{
var exMsg = ex.Message;
Console.WriteLine($"An Error Occurred: {exMsg}");
}
}
public void SaveSongDetails(Song song)
{
try
{
using (MySqlConnection conn = new MySqlConnection(_connectionString))
{
conn.Open();
string query = "INSERT INTO Songs(Title, Album, Artist, Year, Genre, Duration, " +
", Filename, SongPath) VALUES(@Title, @Album, @Artist, @Year, @Genre, " +
"@Duration, @Filename, @SongPath)";
using (MySqlCommand cmd = new MySqlCommand(query, conn))
{
cmd.Parameters.AddWithValue("@Title", song.Title);
cmd.Parameters.AddWithValue("@Album", song.Album);
cmd.Parameters.AddWithValue("@Artist", song.Artist);
cmd.Parameters.AddWithValue("@Year", song.Year);
cmd.Parameters.AddWithValue("@Genre", song.Genre);
cmd.Parameters.AddWithValue("@Duration", song.Duration);
cmd.Parameters.AddWithValue("@Filename", song.Filename);
cmd.Parameters.AddWithValue("@SongPath", song.SongPath);
cmd.ExecuteNonQuery();
}
}
}
catch (Exception ex)
{
var exMsg = ex.Message;
Console.WriteLine($"An Error Occurred: {exMsg}");
}
}
public async Task SaveSong(SongData songData)
{
try
{
using (MySqlConnection conn = new MySqlConnection(_connectionString))
{
conn.Open();
string query = "INSERT INTO SongData(Data) VALUES(@Data)";
using (MySqlCommand cmd = new MySqlCommand(query, conn))
{
cmd.Parameters.AddWithValue("@Data", songData.Data);
cmd.ExecuteNonQuery();
}
}
}
catch(Exception ex)
{
var exMsg = ex.Message;
Console.WriteLine($"An error occurred: {exMsg}");
}
}
public async Task SaveSongToFileSystem(IFormFile song)
{
try
{
Console.WriteLine("Saving song to the filesystem");
var filePath = Path.Combine(_tempDirectoryRoot, song.FileName);
Console.WriteLine("Saving song to the filePath");
await SaveSongToFileSystemTemp(song, filePath);
System.IO.File.Delete(filePath);
DirectoryManager dirMgr = new DirectoryManager(_config, _song);
dirMgr.CreateDirectory();
filePath = dirMgr.SongDirectory;
if (!song.FileName.EndsWith(".mp3"))
filePath += $"{song.FileName}.mp3";
else
filePath += $"{song.FileName}";
Console.WriteLine($"Full path {filePath}");
using (var fileStream = new FileStream(filePath, FileMode.Create))
{
await song.CopyToAsync(fileStream);
_song.SongPath = filePath;
Console.WriteLine($"Writing song to the directory: {filePath}");
}
}
catch (Exception ex)
{
var exMsg = ex.Message;
Console.WriteLine($"An error occurred: {exMsg}");
}
}
public async Task SaveSongToFileSystem(IFormFile song, MusicStoreContext sStoreContext,
AlbumStoreContext alStoreContext,
ArtistStoreContext arStoreContext)
{
try
{ {
dataDump.Fill(results); // TODO: Define and implement method that will take care of the
// song and album records, eventually will address the artist
// records. Make use of helper functions
}
catch (Exception ex)
{
var msg = ex.Message;
_logger.Error(msg, "An error occurred");
} }
}
} }
}
catch (Exception ex) public async Task<List<Song>> RetrieveAllSongDetails()
{ {
var exMsg = ex.Message; try
Console.WriteLine($"An error occurred"); {
} InitializeResults();
_songs = new List<Song>();
_conn.Open();
string query = "SELECT * FROM Songs";
_cmd = new MySqlCommand(query, _conn);
_cmd.ExecuteNonQuery();
_dataDump = new MySqlDataAdapter(_cmd);
_dataDump.Fill(_results);
_dataDump.Dispose();
await PopulateSongDetails();
_conn.Close();
}
catch (Exception ex)
{
var exMsg = ex.Message;
Console.WriteLine($"An error ocurred: {exMsg}");
}
return _songs;
}
public async Task<Song> RetrieveSongDetails(int id)
{
DataTable results = new DataTable();
try
{
using (MySqlConnection conn = new MySqlConnection(_connectionString))
{
conn.Open();
string query = "SELECT * FROM Songs WHERE Id=@Id";
using (MySqlCommand cmd = new MySqlCommand(query, conn))
{
cmd.Parameters.AddWithValue("@Id", id);
cmd.ExecuteNonQuery();
using (MySqlDataAdapter dataDump = new MySqlDataAdapter(cmd))
{
dataDump.Fill(results);
}
}
}
}
catch (Exception ex)
{
var exMsg = ex.Message;
Console.WriteLine($"An error occurred");
}
DataRow row = results.Rows[0]; DataRow row = results.Rows[0];
return new Song return new Song
{ {
Id = Int32.Parse(row["Id"].ToString()), Id = Int32.Parse(row["Id"].ToString()),
Filename = row["Filename"].ToString(), Filename = row["Filename"].ToString(),
SongPath = row["SongPath"].ToString() SongPath = row["SongPath"].ToString()
}; };
}
public async Task<SongData> RetrieveSong(int id)
{
SongData song = new SongData();
try
{
_song = await RetrieveSongDetails(id);
song = await RetrieveSongFromFileSystem(_song);
}
catch (Exception ex)
{
var exMsg = ex.Message;
Console.WriteLine($"An error occurred: {exMsg}");
}
return song;
}
public async Task<SongData> RetrieveSong(Song songMetaData)
{
SongData song = new SongData();
try
{
Console.WriteLine("Fetching song from filesystem");
song = await RetrieveSongFromFileSystem(songMetaData);
}
catch (Exception ex)
{
var exMsg = ex.Message;
Console.WriteLine($"An error occurred: {exMsg}");
}
return song;
}
Song RetrieveMetaData(string filePath)
{
Song newSong = new Song
{
Title = "Untitled",
Artist = "Untitled",
Album = "Untitled",
Year = 0,
Genre = "Untitled",
Duration = 0,
SongPath = ""
};
string title, artist, album, genre;
int year, duration;
Console.WriteLine("Stripping song metadata");
try
{
TagLib.File tfile = TagLib.File.Create(filePath);
using (var mp3 = new Mp3(filePath))
{
Id3Tag tag = mp3.GetTag(Id3TagFamily.Version2X);
title = tag.Title;
Console.WriteLine("Title: {0}", title);
newSong.Title = title;
artist = tag.Artists;
Console.WriteLine("Artist: {0}", artist);
newSong.Artist = artist;
album = tag.Album;
Console.WriteLine("Album: {0}", album);
newSong.Album = album;
genre = "Not Implemented";
Console.WriteLine("Genre: {0}", genre);
newSong.Genre = genre;
year = (int)tag.Year;
Console.WriteLine("Year: {0}", year);
newSong.Year = year;
duration = (int)tfile.Properties.Duration.TotalSeconds;
Console.WriteLine("Duration: {0}", duration);
newSong.Duration = duration;
}
_song = newSong;
} }
catch (Exception ex) public async Task<SongData> RetrieveSong(int id)
{ {
var msg = ex.Message; SongData song = new SongData();
Console.WriteLine($"An error occurred when stripping metadata\n{msg}"); try
_song = newSong; {
_song = await RetrieveSongDetails(id);
song = await RetrieveSongFromFileSystem(_song);
}
catch (Exception ex)
{
var exMsg = ex.Message;
Console.WriteLine($"An error occurred: {exMsg}");
}
return song;
}
public async Task<SongData> RetrieveSong(Song songMetaData)
{
SongData song = new SongData();
try
{
Console.WriteLine("Fetching song from filesystem");
song = await RetrieveSongFromFileSystem(songMetaData);
}
catch (Exception ex)
{
var exMsg = ex.Message;
Console.WriteLine($"An error occurred: {exMsg}");
}
return song;
} }
return newSong;
}
async Task<SongData> RetrieveSongFromFileSystem(Song details) Song RetrieveMetaData(string filePath)
{ {
byte[] uncompressedSong = System.IO.File.ReadAllBytes(details.SongPath); Song newSong = new Song
{
Title = "Untitled",
Artist = "Untitled",
Album = "Untitled",
Year = 0,
Genre = "Untitled",
Duration = 0,
SongPath = ""
};
string title, artist, album, genre;
int year, duration;
return new SongData Console.WriteLine("Stripping song metadata");
{ try
Data = uncompressedSong {
}; TagLib.File tfile = TagLib.File.Create(filePath);
}
async Task SaveSongToFileSystemTemp(IFormFile song, string filePath) using (var mp3 = new Mp3(filePath))
{ {
using (var fileStream = new FileStream(filePath, FileMode.Create)) Id3Tag tag = mp3.GetTag(Id3TagFamily.Version2X);
{ title = tag.Title;
Console.WriteLine("Retrieving song and storing it in memory"); Console.WriteLine("Title: {0}", title);
await song.CopyToAsync(fileStream); newSong.Title = title;
Console.WriteLine($"Retrieving metadata of song from filepath {filePath}"); artist = tag.Artists;
MetadataRetriever meta = new MetadataRetriever(); Console.WriteLine("Artist: {0}", artist);
_song = meta.RetrieveMetaData(filePath); newSong.Artist = artist;
//_song = RetrieveMetaData(filePath); album = tag.Album;
Console.WriteLine("Assigning song filename"); Console.WriteLine("Album: {0}", album);
_song.Filename = song.FileName; newSong.Album = album;
Console.WriteLine($"Song filename retrieved: {song.FileName}"); genre = "Not Implemented";
} Console.WriteLine("Genre: {0}", genre);
} newSong.Genre = genre;
year = (int)tag.Year;
Console.WriteLine("Year: {0}", year);
newSong.Year = year;
duration = (int)tfile.Properties.Duration.TotalSeconds;
Console.WriteLine("Duration: {0}", duration);
newSong.Duration = duration;
}
void Initialize() _song = newSong;
{ }
try catch (Exception ex)
{ {
_connectionString = _config.GetConnectionString("IcarusDev"); var msg = ex.Message;
} Console.WriteLine($"An error occurred when stripping metadata\n{msg}");
catch (Exception ex) _song = newSong;
{ }
Console.WriteLine($"Error Occurred: {ex.Message}");
} return newSong;
}
async Task<SongData> RetrieveSongFromFileSystem(Song details)
{
byte[] uncompressedSong = System.IO.File.ReadAllBytes(details.SongPath);
} return new SongData
void InitializeConnection() {
{ Data = uncompressedSong
_conn = new MySqlConnection(_connectionString); };
} }
void InitializeResults()
{
_results = new DataTable(); async Task SaveSongToFileSystemTemp(IFormFile song, string filePath)
} {
async Task PopulateSongDetails() using (var fileStream = new FileStream(filePath, FileMode.Create))
{ {
foreach (DataRow row in _results.Rows) Console.WriteLine("Retrieving song and storing it in memory");
{ await song.CopyToAsync(fileStream);
Song song = new Song(); Console.WriteLine($"Retrieving metadata of song from filepath {filePath}");
foreach (DataColumn col in _results.Columns) MetadataRetriever meta = new MetadataRetriever();
{ _song = meta.RetrieveMetaData(filePath);
string colStr = col.ToString().ToUpper();
switch (colStr) Console.WriteLine("Assigning song filename");
{ _song.Filename = song.FileName;
case "ID": Console.WriteLine($"Song filename retrieved: {song.FileName}");
song.Id = Int32.Parse(row[col].ToString()); }
break; }
case "TITLE":
song.Title = row[col].ToString(); void Initialize()
break; {
case "ALBUM": try
song.Album = row[col].ToString(); {
break; _connectionString = _config.GetConnectionString("IcarusDev");
case "ARTIST": }
song.Artist = row[col].ToString(); catch (Exception ex)
break; {
case "YEAR": Console.WriteLine($"Error Occurred: {ex.Message}");
song.Year = Int32.Parse(row[col].ToString()); }
break;
case "GENRE": }
song.Genre = row[col].ToString(); void InitializeConnection()
break; {
case "DURATION": _conn = new MySqlConnection(_connectionString);
song.Duration = Int32.Parse(row[col].ToString()); }
break; void InitializeResults()
case "FILENAME": {
song.Filename = row[col].ToString(); _results = new DataTable();
break; }
case "SONGPATH": async Task PopulateSongDetails()
song.SongPath = row[col].ToString(); {
break; foreach (DataRow row in _results.Rows)
} {
} Song song = new Song();
_songs.Add(song); foreach (DataColumn col in _results.Columns)
} {
} string colStr = col.ToString().ToUpper();
#endregion switch (colStr)
} {
case "ID":
song.Id = Int32.Parse(row[col].ToString());
break;
case "TITLE":
song.Title = row[col].ToString();
break;
case "ALBUM":
song.Album = row[col].ToString();
break;
case "ARTIST":
song.Artist = row[col].ToString();
break;
case "YEAR":
song.Year = Int32.Parse(row[col].ToString());
break;
case "GENRE":
song.Genre = row[col].ToString();
break;
case "DURATION":
song.Duration = Int32.Parse(row[col].ToString());
break;
case "FILENAME":
song.Filename = row[col].ToString();
break;
case "SONGPATH":
song.SongPath = row[col].ToString();
break;
}
}
_songs.Add(song);
}
}
#endregion
}
} }
Controllers/SongDataController.cs
+42 -31
View File
@@ -9,6 +9,7 @@ using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using Icarus.Controllers.Managers; using Icarus.Controllers.Managers;
using Icarus.Models; using Icarus.Models;
@@ -16,12 +17,13 @@ using Icarus.Models.Context;
namespace Icarus.Controllers namespace Icarus.Controllers
{ {
[Route("api/song/data")] [Route("api/song/data")]
[ApiController] [ApiController]
public class SongDataController : ControllerBase public class SongDataController : ControllerBase
{ {
#region Fields #region Fields
private IConfiguration _config; private IConfiguration _config;
private ILogger<SongDataController> _logger;
private SongManager _songMgr; private SongManager _songMgr;
private string _songTempDir; private string _songTempDir;
#endregion #endregion
@@ -32,24 +34,24 @@ namespace Icarus.Controllers
#region Constructor #region Constructor
public SongDataController(IConfiguration config) public SongDataController(IConfiguration config, ILogger<SongDataController> logger)
{ {
_config = config; _config = config;
_logger = logger;
_songTempDir = _config.GetValue<string>("TemporaryMusicPath"); _songTempDir = _config.GetValue<string>("TemporaryMusicPath");
_songMgr = new SongManager(config, _songTempDir); _songMgr = new SongManager(config, _songTempDir);
} }
#endregion #endregion
[HttpGet("{id}")] [HttpGet("{id}")]
[Route("private-scoped")] [Route("private-scoped")]
[Authorize("download:songs")] [Authorize("download:songs")]
public async Task<IActionResult> Get(int id) public async Task<IActionResult> Get(int id)
{ {
MusicStoreContext context = HttpContext MusicStoreContext context = HttpContext
.RequestServices .RequestServices
.GetService(typeof(MusicStoreContext)) .GetService(typeof(MusicStoreContext)) as MusicStoreContext;
as MusicStoreContext;
var songMetaData = context.GetSong(id); var songMetaData = context.GetSong(id);
SongData song = await _songMgr.RetrieveSong(songMetaData); SongData song = await _songMgr.RetrieveSong(songMetaData);
@@ -57,46 +59,55 @@ namespace Icarus.Controllers
return File(song.Data, "application/x-msdownload", songMetaData.Filename); return File(song.Data, "application/x-msdownload", songMetaData.Filename);
} }
[HttpPost] [HttpPost]
[Authorize("upload:songs")] [Authorize("upload:songs")]
public async Task Post([FromForm(Name = "file")] List<IFormFile> songData) public async Task Post([FromForm(Name = "file")] List<IFormFile> songData)
{ {
try try
{ {
MusicStoreContext context = HttpContext MusicStoreContext songStoreContext = HttpContext
.RequestServices .RequestServices
.GetService(typeof(MusicStoreContext)) .GetService(typeof(MusicStoreContext)) as MusicStoreContext;
as MusicStoreContext; AlbumStoreContext albumStoreContext = HttpContext
.RequestServices
.GetService(typeof(AlbumStoreContext)) as AlbumStoreContext;
ArtistStoreContext artistStoreContext = HttpContext
.RequestServices
.GetService(typeof(ArtistStoreContext)) as ArtistStoreContext;
Console.WriteLine("Uploading song..."); Console.WriteLine("Uploading song...");
_logger.LogInformation("Uploading song...");
var uploads = _songTempDir; var uploads = _songTempDir;
Console.WriteLine($"Song Root Path {uploads}"); Console.WriteLine($"Song Root Path {uploads}");
_logger.LogInformation($"Song root path {uploads}");
foreach (var sng in songData) foreach (var sng in songData)
{ {
if (sng.Length > 0) { if (sng.Length > 0) {
Console.WriteLine($"Song filename {sng.FileName}"); Console.WriteLine($"Song filename {sng.FileName}");
await _songMgr.SaveSongToFileSystem(sng); _logger.LogInformation($"Song filename {sng.FileName}");
// TODO: Add functionality for overloaded method
await _songMgr.SaveSongToFileSystem(sng, songStoreContext,
albumStoreContext, artistStoreContext);
var song = _songMgr.SongDetails; var song = _songMgr.SongDetails;
context.SaveSong(song); songStoreContext.SaveSong(song);
Console.WriteLine("Song successfully saved");
} }
} }
} }
catch (Exception ex) catch (Exception ex)
{ {
Console.WriteLine($"An error occurred: {ex.Message}"); var msg = ex.Message;
_logger.LogError(msg, "An error occurred");
} }
} }
[HttpDelete("{id}")] [HttpDelete("{id}")]
[Authorize("delete:songs")] [Authorize("delete:songs")]
public void Delete(int id) public void Delete(int id)
{ {
MusicStoreContext context = HttpContext MusicStoreContext context = HttpContext
.RequestServices .RequestServices
.GetService(typeof(MusicStoreContext)) .GetService(typeof(MusicStoreContext)) as MusicStoreContext;
as MusicStoreContext;
var songMetaData = context.GetSong(id); var songMetaData = context.GetSong(id);
@@ -107,5 +118,5 @@ namespace Icarus.Controllers
context.DeleteSong(songMetaData.Id); context.DeleteSong(songMetaData.Id);
} }
} }
} }
} }
Models/Album.cs
+4
View File
@@ -1,4 +1,6 @@
using System; using System;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations.Schema;
using Newtonsoft.Json; using Newtonsoft.Json;
@@ -14,5 +16,7 @@ namespace Icarus.Models
public string AlbumArtist { get; set; } public string AlbumArtist { get; set; }
[JsonProperty("song_count")] [JsonProperty("song_count")]
public int SongCount { get; set; } public int SongCount { get; set; }
[JsonIgnore]
public List<Song> Songs { get; set; }
} }
} }
Models/Context/AlbumStoreContext.cs
+81
View File
@@ -69,6 +69,87 @@ namespace Icarus.Models.Context
return albums; return albums;
} }
public bool DoesAlbumExist(Album album)
{
try
{
}
catch (Exception ex)
{
var msg = ex.Message;
_logger.Error(msg, "An error occurred");
}
return false;
}
public void SaveAlbum(Album album)
{
try
{
using (MySqlConnection conn = GetConnection())
{
conn.Open();
var query = "INSERT INTO Album(Title, AlbumArtist, " +
"SongCount) VALUES (@Title, @AlbumArtist, " +
"SongCount)";
using (MySqlCommand cmd = new MySqlCommand(query, conn))
{
cmd.Parameters.AddWithValue("@Title", album.Title);
cmd.Parameters.AddWithValue("@AlbumArtist", album.AlbumArtist);
cmd.Parameters.AddWithValue("@SongCount", album.SongCount);
cmd.ExecuteNonQuery();
}
}
}
catch (Exception ex)
{
var msg = ex.Message;
_logger.Error(msg, "An error occurred");
}
}
private List<Album> ParseData(MySqlDataReader reader)
{
List<Album> albums = new List<Album>();
while (reader.Read())
{
var id = Convert.ToInt32(reader["Id"]);
var title = reader["Title"].ToString();
var albumArtist = reader["AlbumArtist"].ToString();
var songCount = Convert.ToInt32(reader["SongCount"]);
albums.Add(new Album
{
Id = id,
Title = title,
AlbumArtist = albumArtist,
SongCount = songCount
});
}
return albums;
}
private Album ParseSingleData(MySqlDataReader reader)
{
Album album = new Album();
while (reader.Read())
{
var id = Convert.ToInt32(reader["Id"]);
var title = reader["Title"].ToString();
var albumArtist = reader["AlbumArtist"].ToString();
var songCount = Convert.ToInt32(reader["SongCount"]);
album = new Album
{
Id = id,
Title = title,
AlbumArtist = albumArtist,
SongCount = songCount
};
}
return album;
}
#endregion #endregion
} }
} }
Models/Context/MusicStoreContext.cs
+49 -7
View File
@@ -6,7 +6,7 @@ using NLog;
namespace Icarus.Models.Context namespace Icarus.Models.Context
{ {
public class MusicStoreContext public class MusicStoreContext : BaseStoreContext
{ {
#region Fields #region Fields
private static Logger _logger = NLog.LogManager.GetCurrentClassLogger(); private static Logger _logger = NLog.LogManager.GetCurrentClassLogger();
@@ -14,14 +14,13 @@ namespace Icarus.Models.Context
#region Properties #region Properties
public string ConnectionString { get; set; }
#endregion #endregion
#region Constructors #region Constructors
public MusicStoreContext(string connectionString) public MusicStoreContext(string connectionString)
{ {
this.ConnectionString = connectionString; _connectionString = connectionString;
} }
#endregion #endregion
@@ -202,10 +201,53 @@ namespace Icarus.Models.Context
return song; return song;
} }
private MySqlConnection GetConnection() private List<Song> ParseData(MySqlDataReader reader)
{ {
return new MySqlConnection(ConnectionString);
} List<Song> songs = new List<Song>();
while (reader.Read())
{
songs.Add(new Song
{
Id = Convert.ToInt32(reader["Id"]),
Title = reader["Title"].ToString(),
Album = reader["Album"].ToString(),
Artist = reader["Artist"].ToString(),
Year = Convert.ToInt32(reader["Year"]),
Genre = reader["Genre"].ToString(),
Duration = Convert.ToInt32(reader["Duration"]),
Filename = reader["Filename"].ToString(),
SongPath = reader["SongPath"].ToString()
});
}
return songs;
}
private Song ParseSingleData(MySqlDataReader reader)
{
Song song = new Song();
while (reader.Read())
{
song = new Song
{
Id = Convert.ToInt32(reader["Id"]),
Title = reader["Title"].ToString(),
Album = reader["Album"].ToString(),
Artist = reader["Artist"].ToString(),
Year = Convert.ToInt32(reader["Year"]),
Genre = reader["Genre"].ToString(),
Duration = Convert.ToInt32(reader["Duration"]),
Filename = reader["Filename"].ToString(),
SongPath = reader["SongPath"].ToString()
};
}
return song;
}
#endregion #endregion
} }
} }
Models/Context/SongContext.cs
+5 -1
View File
@@ -21,7 +21,11 @@ namespace Icarus.Models.Context
protected override void OnModelCreating(ModelBuilder modelBuilder) protected override void OnModelCreating(ModelBuilder modelBuilder)
{ {
modelBuilder.Entity<Song>(); modelBuilder.Entity<Song>()
.HasOne(s => s.AlbumObject)
.WithMany(a => a.Songs)
.HasForeignKey(s => s.AlbumId)
.HasConstraintName("ForeignKey_Song_Album");
} }
} }
} }
Models/Song.cs
+5
View File
@@ -1,4 +1,5 @@
using System; using System;
using System.ComponentModel.DataAnnotations.Schema;
using Newtonsoft.Json; using Newtonsoft.Json;
@@ -29,5 +30,9 @@ namespace Icarus.Models
public string Filename { get; set; } public string Filename { get; set; }
[JsonProperty("song_path")] [JsonProperty("song_path")]
public string SongPath { get; set; } public string SongPath { get; set; }
[JsonIgnore]
public Album AlbumObject { get; set; }
[JsonIgnore]
public int AlbumId { get; set; }
} }
} }
Startup.cs
+2
View File
@@ -100,6 +100,8 @@ namespace Icarus
.GetConnectionString("DefaultConnection")))); .GetConnectionString("DefaultConnection"))));
services.AddDbContext<SongContext>(options => options.UseMySQL(connString)); services.AddDbContext<SongContext>(options => options.UseMySQL(connString));
services.AddDbContext<AlbumContext>(options => options.UseMySQL(connString));
services.AddDbContext<ArtistContext>(options => options.UseMySQL(connString));
services.AddDbContext<UserContext>(options => options.UseMySQL(connString)); services.AddDbContext<UserContext>(options => options.UseMySQL(connString));
} }