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

#93: Uploading wav songs works. Moving on to flac support

Browse Source
This commit is contained in:
kdeng00
2024-07-22 19:50:03 -04:00
parent 829eb2925b
commit 43b2bf27be
6 changed files with 66 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Controllers/Managers/CoverArtManager.cs
+4 -3
View File
@@ -11,6 +11,7 @@ public class CoverArtManager : BaseManager
private string _rootCoverArtPath;
private CoverArtContext _coverArtContext;
private byte[] _stockCoverArt = null;
private const string _filename = "CoverArt.png";
#endregion
@@ -46,7 +47,7 @@ public class CoverArtManager : BaseManager
{
try
{
var stockCoverArtPath = _rootCoverArtPath + "CoverArt.png";
var stockCoverArtPath = _rootCoverArtPath + _filename;
if (!string.Equals(stockCoverArtPath, coverArt.ImagePath(),
StringComparison.CurrentCultureIgnoreCase))
{
@@ -168,9 +169,9 @@ public class CoverArtManager : BaseManager
if (System.IO.File.Exists(path))
_stockCoverArt = File.ReadAllBytes(path);
if (!File.Exists(_rootCoverArtPath + "CoverArt.png"))
if (!File.Exists(_rootCoverArtPath + _filename))
{
File.WriteAllBytes(_rootCoverArtPath + "CoverArt.png",
File.WriteAllBytes(_rootCoverArtPath + _filename,
_stockCoverArt);
Console.WriteLine("Copied Stock Cover Art");
}
Controllers/Managers/SongManager.cs
+36 -32
View File
@@ -178,18 +178,7 @@ public class SongManager : BaseManager
await Task.Run(() =>
{
using (var fileStream = new FileStream(filePath, FileMode.Create))
{
var songBytes = System.IO.File.ReadAllBytes(tempPath);
_logger.Info("Saving song to the filesystem");
fileStream.Write(songBytes, 0, songBytes.Count());
System.IO.File.Delete(tempPath);
_logger.Info("Deleting temp file");
_logger.Info("Song successfully saved to filesystem");
}
this.MoveSongToFinalDestination(tempPath, filePath);
});
song.SongDirectory = dirMgr.SongDirectory;
@@ -197,8 +186,7 @@ public class SongManager : BaseManager
var coverMgr = new CoverArtManager(_config);
var coverArt = coverMgr.SaveCoverArt(song);
coverMgr.SaveCoverArtToDatabase(ref song, ref coverArt);
SaveSongToDatabase(song);
SaveSongToDatabase(song, coverArt);
}
catch (Exception ex)
{
@@ -208,7 +196,7 @@ public class SongManager : BaseManager
}
// Change the name of this method to only focus on wav files
public void SaveSongToFileSystem(IFormFile songFile, IFormFile coverArtData, Song song)
public Song SaveSongToFileSystem(IFormFile songFile, IFormFile coverArtData, Song song)
{
if (string.IsNullOrEmpty(song.SongDirectory))
{
@@ -246,24 +234,45 @@ public class SongManager : BaseManager
var filePath = song.SongPath();
_logger.Info($"Absolute song path: {filePath}");
using (var fileStream = new FileStream(filePath, FileMode.Create))
this.MoveSongToFinalDestination(tempPath, filePath);
SaveSongToDatabase(song, coverArt);
return song;
}
// TODO: Needs to be implemented
public Song SaveFlacSongToFileSystem(IFormFile songFile, IFormFile coverArtData, Song song)
{
// Save temp song (Should already be saved to the filesystem by the time it gets to this method)
// Save cover art
// Update the song's metadata with the song object
// Save song to its final directory
// Save cover art to the database
// Save song to the database
return song;
}
private void MoveSongToFinalDestination(string sourcePath, string targetPath)
{
using (var fileStream = new FileStream(targetPath, FileMode.Create))
{
var songBytes = System.IO.File.ReadAllBytes(tempPath);
var songBytes = System.IO.File.ReadAllBytes(sourcePath);
try
{
if (System.IO.File.Exists(filePath) && System.IO.File.Exists(tempPath) && fileStream.Length > 0)
if (System.IO.File.Exists(sourcePath) && System.IO.File.Exists(sourcePath) && fileStream.Length > 0)
{
System.IO.File.Delete(tempPath);
_logger.Info("Deleted temp song from filesystem: {0}", tempPath);
System.IO.File.Delete(sourcePath);
_logger.Info("Deleted temp song from filesystem: {0}", sourcePath);
}
else
{
fileStream.Write(songBytes, 0, songBytes.Count());
_logger.Info("Saved song to filesystem: {0}", filePath);
_logger.Info("Saved song to filesystem: {0}", targetPath);
System.IO.File.Delete(tempPath);
_logger.Info("Deleted temp song from filesystem: {0}", tempPath);
System.IO.File.Delete(sourcePath);
_logger.Info("Deleted temp song from filesystem: {0}", sourcePath);
}
}
catch (Exception ex)
@@ -274,14 +283,6 @@ public class SongManager : BaseManager
_logger.Info("Song successfully saved to filesystem");
}
coverMgr.SaveCoverArtToDatabase(ref song, ref coverArt);
SaveSongToDatabase(song);
}
// TODO: Needs to be implemented
public void SaveFlacSongToFileSystem(IFormFile songFile, IFormFile coverArtData, Song song)
{
}
public async Task<SongData> RetrieveSong(Song songMetaData)
@@ -382,13 +383,14 @@ public class SongManager : BaseManager
private void SaveSongToDatabase(Song song)
private void SaveSongToDatabase(Song song, CoverArt? cover)
{
_logger.Info("Starting process to save the song to the database");
var albumMgr = new AlbumManager(_config);
var artistMgr = new ArtistManager(_config);
var genreMgr = new GenreManager(_config);
var coverMgr = new CoverArtManager(_config);
albumMgr.SaveAlbumToDatabase(ref song);
artistMgr.SaveArtistToDatabase(ref song);
genreMgr.SaveGenreToDatabase(ref song);
@@ -398,6 +400,8 @@ public class SongManager : BaseManager
_songContext.Add(song);
_songContext.SaveChanges();
coverMgr.SaveCoverArtToDatabase(ref song, ref cover);
}