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

Fixed issue with special characters not being recorded properly

Browse Source
This commit is contained in:
kdeng00
2020-02-15 17:32:52 -05:00
parent f2d0947b36
commit 437a6b1453
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/utility/MetadataRetriever.h
+6
View File
@@ -4,6 +4,12 @@
#include <iostream> #include <iostream>
#include <string> #include <string>
#include <attachedpictureframe.h>
#include <textidentificationframe.h>
#include <fileref.h>
#include <mpegfile.h>
#include <tag.h>
#include "model/Models.h" #include "model/Models.h"
namespace utility { namespace utility {
src/utility/MetadataRetriever.cpp
+7 -11
View File
@@ -6,11 +6,6 @@
#include <sstream> #include <sstream>
#include <string.h> #include <string.h>
#include <attachedpictureframe.h>
#include <textidentificationframe.h>
#include <fileref.h>
#include <mpegfile.h>
#include <tag.h>
#include "manager/DirectoryManager.h" #include "manager/DirectoryManager.h"
#include "utility/ImageFile.h" #include "utility/ImageFile.h"
@@ -22,12 +17,13 @@ namespace utility {
model::Song MetadataRetriever::retrieveMetadata(model::Song& song) { model::Song MetadataRetriever::retrieveMetadata(model::Song& song) {
TagLib::MPEG::File sameFile(song.songPath.c_str()); TagLib::MPEG::File sameFile(song.songPath.c_str());
auto tag = sameFile.ID3v2Tag(); auto tag = sameFile.ID3v2Tag();
song.title = tag->title().toCString(); song.title = tag->title().toCString(true);
song.artist = tag->artist().toCString(); song.artist = tag->artist().toCString(true);
song.album = tag->album().toCString(); song.album = tag->album().toCString(true);
song.genre = tag->genre().toCString(); song.genre = tag->genre().toCString(true);
song.year = tag->year(); song.year = tag->year();
song.track = tag->track(); song.track = tag->track();
song.duration = sameFile.audioProperties()->lengthInSeconds(); song.duration = sameFile.audioProperties()->lengthInSeconds();
constexpr auto id3DiscName = "TPOS"; constexpr auto id3DiscName = "TPOS";
@@ -49,12 +45,12 @@ namespace utility {
if (albumArtistFrame.isEmpty()) { if (albumArtistFrame.isEmpty()) {
TagLib::ID3v2::TextIdentificationFrame *emptyFrame = TagLib::ID3v2::TextIdentificationFrame *emptyFrame =
new TagLib::ID3v2::TextIdentificationFrame(id3DiscName); new TagLib::ID3v2::TextIdentificationFrame(id3AlbumArtistName);
tag->addFrame(emptyFrame); tag->addFrame(emptyFrame);
emptyFrame->setText(song.artist.c_str()); emptyFrame->setText(song.artist.c_str());
sameFile.save(); sameFile.save();
} else { } else {
song.albumArtist = albumArtistFrame.front()->toString().toCString(); song.albumArtist = albumArtistFrame.front()->toString().toCString(true);
} }
return song; return song;