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

Implemented #56

Browse Source
This commit is contained in:
kdeng00
2019-08-11 23:24:23 -04:00
parent 51d40f270d
commit da8d4a9002
4 changed files with 57 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Controllers/Managers/CoverArtManager.cs
+9 -50
View File
@@ -54,59 +54,18 @@ namespace Icarus.Controllers.Managers
public CoverArt SaveCoverArt(Song song)
{
try
var sng = SongManager.ConvertSongToSng(song);
var cov = ConvertCoverArtToCovArt(new CoverArt
{
// TODO: Change logic so it attempts to create the directory
// after it has been determined that the song does not have
// a cover art image
var strCount = _rootCoverArtPath.Length + song.Artist.Length +
song.AlbumTitle.Length + 2;
var imgPath = new StringBuilder(strCount);
SongTitle = song.Title,
ImagePath = _rootCoverArtPath
});
DirectoryManager.create_directory(SongManager.ConvertSongToSng(song),
_rootCoverArtPath, imgPath);
MetadataRetriever.update_cover_art(ref cov,
ref sng, _rootCoverArtPath);
var imagePath = imgPath.ToString().Substring(0, strCount) +
song.Title + ".png";
var coverArt = new CoverArt
{
SongTitle = song.Title,
ImagePath = imagePath
};
var cov = ConvertCoverArtToCovArt(coverArt);
var stock_path = _rootCoverArtPath + "CoverArt.png";
//var metaData = new MetadataRetriever();
// TODO: Work on the function on the c++ side
// I left some TODO's
MetadataRetriever.update_cover_art(ref cov, stock_path, song.SongPath);
/**
var imgBytes = metaData.RetrieveCoverArtBytes(song);
if (imgBytes != null)
{
_logger.Info("Saving cover art to the filesystem");
File.WriteAllBytes(coverArt.ImagePath, imgBytes);
}
else
{
_logger.Info("Song has no cover art, applying stock cover art");
coverArt.ImagePath = _rootCoverArtPath + "CoverArt.png";
metaData.UpdateCoverArt(song, coverArt);
}
*/
return coverArt;
}
catch (Exception ex)
{
var msg = ex.Message;
_logger.Error(msg, "An error occurred");
}
return null;
return ConvertCovArtToCoverArt(cov);
}
public static CovArt ConvertCoverArtToCovArt(CoverArt cover)
Controllers/Utilities/MetadataRetriever.cs
+6 -43
View File
@@ -58,54 +58,17 @@ namespace Icarus.Controllers.Utilities
#region C++ Libs
[DllImport("libicarus.so")]
public static extern void retrieve_metadata(ref Sng sng, string file_path);
public static extern void retrieve_metadata(ref Sng sng,
string file_path);
[DllImport("libicarus.so")]
public static extern void update_metadata(ref Sng sng_updated, ref Sng sng_old);
public static extern void update_metadata(ref Sng sng_updated,
ref Sng sng_old);
[DllImport("libicarus.so")]
public static extern void update_cover_art(ref CovArt cov, string stock_cover_path, string song_path);
public static extern void update_cover_art(ref CovArt cov,
ref Sng sng, string root_cover_path);
#endregion
// TODO: Remove this when the update_cover_art(..) has been implemented
/**
public byte[] RetrieveCoverArtBytes(Song song)
{
try
{
Console.WriteLine("Fetching image");
var tag = TagLib.File.Create(song.SongPath);
byte[] imgBytes = tag.Tag.Pictures[0].Data.Data;
return imgBytes;
}
catch (Exception ex)
{
var msg = ex.Message;
_logger.Error(msg, "An error occurred in MetadataRetriever");
}
return null;
}
*/
// TODO: Remove this when the update_cover_art(..) has been implemented
public void UpdateCoverArt(Song song, CoverArt coverArt)
{
Console.WriteLine("Updating song's cover art");
var tag = TagLib.File.Create(song.SongPath);
var pics = tag.Tag.Pictures;
Array.Resize(ref pics, 1);
pics[0] = new Picture(coverArt.ImagePath)
{
Description = "Cover Art"
};
tag.Tag.Pictures = pics;
tag.Save();
}
#endregion
}
}