Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2024-12-17 20:09:50 +01:00
Code Issues Releases Wiki Activity

Write FMPS metadata (rating, playcount) to MP3 files in tagreader + corresponding test cases

Browse Source
This commit is contained in:
Arnaud Bienner 2013-02-23 20:12:17 +01:00
parent ba1a3f45ec
commit 39e1275980
3 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ext/libclementine-tagreader/tagreader.cpp
View File

@ -428,7 +428,8 @@ bool TagReader::SaveFile(const QString& filename,
SetTextFrame("TCOM", song.composer(), tag); SetTextFrame("TCOM", song.composer(), tag);
SetTextFrame("TPE2", song.albumartist(), tag); SetTextFrame("TPE2", song.albumartist(), tag);
SetTextFrame("TCMP", std::string(song.compilation() ? "1" : "0"), tag); SetTextFrame("TCMP", std::string(song.compilation() ? "1" : "0"), tag);
SetTextFrame("TXXX", QString::number(song.rating()), tag); SetUserTextFrame("FMPS_Rating", QString::number(song.rating()), tag);
SetUserTextFrame("FMPS_PlayCount", QString::number(song.playcount()), tag);
} }
else if (TagLib::Ogg::Vorbis::File* file = dynamic_cast<TagLib::Ogg::Vorbis::File*>(fileref->file())) { else if (TagLib::Ogg::Vorbis::File* file = dynamic_cast<TagLib::Ogg::Vorbis::File*>(fileref->file())) {
TagLib::Ogg::XiphComment* tag = file->tag(); TagLib::Ogg::XiphComment* tag = file->tag();
@ -473,6 +474,34 @@ bool TagReader::SaveFile(const QString& filename,
return ret; return ret;
} }
void TagReader::SetUserTextFrame(const QString& description, const QString& value,
TagLib::ID3v2::Tag* tag) const {
const QByteArray descr_utf8(description.toUtf8());
const QByteArray value_utf8(value.toUtf8());
SetUserTextFrame(std::string(descr_utf8.constData(), descr_utf8.length()),
std::string(value_utf8.constData(), value_utf8.length()),
tag);
}
void TagReader::SetUserTextFrame(const std::string& description,
const std::string& value,
TagLib::ID3v2::Tag* tag) const {
const TagLib::String t_description = StdStringToTaglibString(description);
// Remove the frame if it already exists
TagLib::ID3v2::UserTextIdentificationFrame* frame =
TagLib::ID3v2::UserTextIdentificationFrame::find(tag, t_description);
if (frame) {
tag->removeFrame(frame);
}
// Create and add a new frame
frame = new TagLib::ID3v2::UserTextIdentificationFrame(TagLib::String::UTF8);
frame->setDescription(t_description);
frame->setText(StdStringToTaglibString(value));
tag->addFrame(frame);
}
void TagReader::SetTextFrame(const char* id, const QString& value, void TagReader::SetTextFrame(const char* id, const QString& value,
TagLib::ID3v2::Tag* tag) const { TagLib::ID3v2::Tag* tag) const {
const QByteArray utf8(value.toUtf8()); const QByteArray utf8(value.toUtf8());

5
ext/libclementine-tagreader/tagreader.h
View File

@ -78,6 +78,11 @@ class TagReader {
pb::tagreader::SongMetadata* song) const; pb::tagreader::SongMetadata* song) const;
pb::tagreader::SongMetadata_Type GuessFileType(TagLib::FileRef* fileref) const; pb::tagreader::SongMetadata_Type GuessFileType(TagLib::FileRef* fileref) const;
void SetUserTextFrame(const QString& description, const QString& value,
TagLib::ID3v2::Tag* tag) const;
void SetUserTextFrame(const std::string& description, const std::string& value,
TagLib::ID3v2::Tag* tag) const;
void SetTextFrame(const char* id, const QString& value, void SetTextFrame(const char* id, const QString& value,
TagLib::ID3v2::Tag* tag) const; TagLib::ID3v2::Tag* tag) const;
void SetTextFrame(const char* id, const std::string& value, void SetTextFrame(const char* id, const std::string& value,

17
tests/song_test.cpp
View File

@ -55,6 +55,13 @@ class SongTest : public ::testing::Test {
song.InitFromProtobuf(pb_song); song.InitFromProtobuf(pb_song);
return song; return song;
} }
static void WriteSongToFile(const Song& song, const QString& filename) {
TagReader tag_reader;
::pb::tagreader::SongMetadata pb_song;
song.ToProtobuf(&pb_song);
tag_reader.SaveFile(filename, pb_song);
}
}; };
@ -96,6 +103,11 @@ TEST_F(SongTest, FMPSRatingUser) {
TemporaryResource r(":/testdata/fmpsratinguser.mp3"); TemporaryResource r(":/testdata/fmpsratinguser.mp3");
Song song = ReadSongFromFile(r.fileName()); Song song = ReadSongFromFile(r.fileName());
EXPECT_FLOAT_EQ(0.10, song.rating()); EXPECT_FLOAT_EQ(0.10, song.rating());
song.set_rating(0.20);
WriteSongToFile(song, r.fileName());
Song new_song = ReadSongFromFile(r.fileName());
EXPECT_FLOAT_EQ(0.20, new_song.rating());
} }
TEST_F(SongTest, FMPSRatingBoth) { TEST_F(SongTest, FMPSRatingBoth) {
@ -108,6 +120,11 @@ TEST_F(SongTest, FMPSPlayCount) {
TemporaryResource r(":/testdata/fmpsplaycount.mp3"); TemporaryResource r(":/testdata/fmpsplaycount.mp3");
Song song = ReadSongFromFile(r.fileName()); Song song = ReadSongFromFile(r.fileName());
EXPECT_EQ(123, song.playcount()); EXPECT_EQ(123, song.playcount());
song.set_playcount(69);
WriteSongToFile(song, r.fileName());
Song new_song = ReadSongFromFile(r.fileName());
EXPECT_EQ(69, new_song.playcount());
} }
TEST_F(SongTest, FMPSPlayCountUser) { TEST_F(SongTest, FMPSPlayCountUser) {