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

Completed all TODO tasks, what's left is to go over the code and do some cleanup regarding the album API functonality. #22, #25

Browse Source
This commit is contained in:
amazing-username
2019-05-08 22:06:19 -04:00
parent 677646bb62
commit f7d6580253
10 changed files with 110 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Controllers/AlbumController.cs
+15
View File
@@ -7,6 +7,7 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using Icarus.Models;
using Icarus.Models.Context;
namespace Icarus.Controllers
{
@@ -37,6 +38,13 @@ namespace Icarus.Controllers
{
List<Album> albums = new List<Album>();
AlbumStoreContext albumStoreContext = HttpContext
.RequestServices
.GetService(typeof(AlbumStoreContext)) as AlbumStoreContext;
albums = albumStoreContext.GetAlbums();
return Ok(albums);
}
@@ -44,6 +52,13 @@ namespace Icarus.Controllers
public IActionResult Get(int id)
{
Album album = new Album();
album.AlbumId = id;
AlbumStoreContext albumStoreContext = HttpContext
.RequestServices
.GetService(typeof(AlbumStoreContext)) as AlbumStoreContext;
album = albumStoreContext.GetAlbum(album);
return Ok(album);
}
Controllers/Managers/SongManager.cs
+23 -22
View File
@@ -116,13 +116,13 @@ namespace Icarus.Controllers.Managers
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, " +
string query = "INSERT INTO Songs(Title, AlbumTitle, Artist, Year, Genre, Duration, " +
"Filename, SongPath) VALUES(@Title, @AlbumTitle, @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("@AlbumTitle", _song.AlbumTitle);
cmd.Parameters.AddWithValue("@Artist", _song.Artist);
cmd.Parameters.AddWithValue("@Year", _song.Year);
cmd.Parameters.AddWithValue("@Genre", _song.Genre);
@@ -147,13 +147,13 @@ namespace Icarus.Controllers.Managers
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, " +
string query = "INSERT INTO Songs(Title, AlbumTitle, Artist, Year, Genre, Duration, " +
", Filename, SongPath) VALUES(@Title, @AlbumTitle, @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("@AlbumTitle", song.AlbumTitle);
cmd.Parameters.AddWithValue("@Artist", song.Artist);
cmd.Parameters.AddWithValue("@Year", song.Year);
cmd.Parameters.AddWithValue("@Genre", song.Genre);
@@ -235,12 +235,8 @@ namespace Icarus.Controllers.Managers
{
try
{
// 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
_logger.Info("Starting process to save song to the filesystem");
var fileTempPath = Path.Combine(_tempDirectoryRoot, songFile.FileName);
//await SaveSongToFileSystemTemp(song, fileTempPath);
var song = await SaveSongTemp(songFile, fileTempPath);
System.IO.File.Delete(fileTempPath);
@@ -372,13 +368,13 @@ namespace Icarus.Controllers.Managers
}
Song RetrieveMetaData(string filePath)
private Song RetrieveMetaData(string filePath)
{
Song newSong = new Song
{
Title = "Untitled",
Artist = "Untitled",
Album = "Untitled",
AlbumTitle = "Untitled",
Year = 0,
Genre = "Untitled",
Duration = 0,
@@ -404,7 +400,7 @@ namespace Icarus.Controllers.Managers
newSong.Artist = artist;
album = tag.Album;
Console.WriteLine("Album: {0}", album);
newSong.Album = album;
newSong.AlbumTitle = album;
genre = "Not Implemented";
Console.WriteLine("Genre: {0}", genre);
newSong.Genre = genre;
@@ -428,7 +424,7 @@ namespace Icarus.Controllers.Managers
return newSong;
}
async Task<SongData> RetrieveSongFromFileSystem(Song details)
private async Task<SongData> RetrieveSongFromFileSystem(Song details)
{
byte[] uncompressedSong = System.IO.File.ReadAllBytes(details.SongPath);
@@ -497,31 +493,36 @@ namespace Icarus.Controllers.Managers
private void SaveSongToDatabase(Song song, MusicStoreContext songStore, AlbumStoreContext albumStore,
ArtistStoreContext artistStore)
{
// TODO: Not finished and have not been tested
song.AlbumId = 1;
var album = new Album();
album.Title = song.Album;
album.Title = song.AlbumTitle;
album.AlbumArtist = song.Artist;
if (!albumStore.DoesAlbumExist(song))
{
album.SongCount = 1;
_logger.Info("Saving album to database");
_logger.Info($"Ablum song count before retrieving from store: {album.SongCount}");
_logger.Info($"Ablum Id before retrieving from store: {album.AlbumId}");
albumStore.SaveAlbum(album);
_logger.Info("Album suuccessfully saved to database");
album = albumStore.GetAlbum(album);
album = albumStore.GetAlbum(song);
_logger.Info($"Ablum song count after retrieving from store: {album.SongCount}");
_logger.Info($"Ablum Id after retrieving from store: {album.AlbumId}");
}
else
{
var albumRetrieved = albumStore.GetAlbum(song);
album.Id = albumRetrieved.Id;
album.AlbumId = albumRetrieved.AlbumId;
album.SongCount = albumRetrieved.SongCount + 1;
// TODO: Add functionality to the method below
albumStore.UpdateAlbum(album);
}
song.AlbumId = album.Id;
// TODO: Update the method below to save the newly added AlbumId value
song.AlbumId = album.AlbumId;
_logger.Info($"Song;\nTitle {song.Title}\nAlbum {song.AlbumTitle}\nAlbum Id {song.AlbumId}");
songStore.SaveSong(song);
_logger.Info("Successfully saved song to database");
}
private async Task PopulateSongDetails()
@@ -541,7 +542,7 @@ namespace Icarus.Controllers.Managers
song.Title = row[col].ToString();
break;
case "ALBUM":
song.Album = row[col].ToString();
song.AlbumTitle = row[col].ToString();
break;
case "ARTIST":
song.Artist = row[col].ToString();
Controllers/SongDataController.cs
+1 -3
View File
@@ -86,11 +86,9 @@ namespace Icarus.Controllers
if (sng.Length > 0) {
Console.WriteLine($"Song filename {sng.FileName}");
_logger.LogInformation($"Song filename {sng.FileName}");
// TODO: Add functionality for overloaded method
await _songMgr.SaveSongToFileSystem(sng, songStoreContext,
albumStoreContext, artistStoreContext);
var song = _songMgr.SongDetails;
songStoreContext.SaveSong(song);
}
}
}
Controllers/Utilities/MetadataRetriever.cs
+5 -5
View File
@@ -59,7 +59,7 @@ namespace Icarus.Controllers.Utilities
song.Title = _title;
song.Artist = _artist;
song.Album = _album;
song.AlbumTitle = _album;
song.Genre = _genre;
song.Year = _year;
song.Duration = _duration;
@@ -120,7 +120,7 @@ namespace Icarus.Controllers.Utilities
var filePath = updatedSong.SongPath;
var title = updatedSong.Title;
var artist = updatedSong.Artist;
var album = updatedSong.Album;
var album = updatedSong.AlbumTitle;
var genre = updatedSong.Genre;
var year = updatedSong.Year;
TagLib.File fileTag = TagLib.File.Create(filePath);
@@ -144,7 +144,7 @@ namespace Icarus.Controllers.Utilities
fileTag.Tag.Artists = new []{artist};
break;
case "album":
_updatedSong.Album = album;
_updatedSong.AlbumTitle = album;
fileTag.Tag.Album = album;
break;
case "genre":
@@ -175,7 +175,7 @@ namespace Icarus.Controllers.Utilities
{
Id = song.Id,
Title = song.Title,
Album = song.Album,
AlbumTitle = song.AlbumTitle,
Artist = song.Artist,
Genre = song.Genre,
Year = song.Year,
@@ -230,7 +230,7 @@ namespace Icarus.Controllers.Utilities
{
songValues["Title"] = String.IsNullOrEmpty(song.Title);
songValues["Artists"] = String.IsNullOrEmpty(song.Artist);
songValues["Album"] = String.IsNullOrEmpty(song.Album);
songValues["Album"] = String.IsNullOrEmpty(song.AlbumTitle);
songValues["Genre"] = String.IsNullOrEmpty(song.Genre);
if (song.Year==0)
{