mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-07-18 04:54:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #515 from TsudaKageyu/empty-id3v2-frame

Browse Source 
Skip empty ID3v2 frames when saving an ID3v2 tag.
This commit is contained in:
Scott Wheeler
2015-05-18 21:36:37 +02:00
parent bba562b557 8da0013482
commit bd3c4dc1b2
2 changed files with 40 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
taglib/mpeg/id3v2/id3v2tag.cpp
View File

@ -591,12 +591,19 @@ ByteVector ID3v2::Tag::render(int version) const
for(FrameList::ConstIterator it = frameList.begin(); it != frameList.end(); it++) {
(*it)->header()->setVersion(version);
if((*it)->header()->frameID().size() != 4) {
debug("A frame of unsupported or unknown type \'"
debug("An ID3v2 frame of unsupported or unknown type \'"
+ String((*it)->header()->frameID()) + "\' has been discarded");
continue;
}
if(!(*it)->header()->tagAlterPreservation())
if(!(*it)->header()->tagAlterPreservation()) {
const ByteVector frameData = (*it)->render();
if(frameData.size() == Frame::headerSize((*it)->header()->version())) {
debug("An empty ID3v2 frame \'"
+ String((*it)->header()->frameID()) + "\' has been discarded");
continue;
}
tagData.append((*it)->render());
}
}
// Compute the amount of padding, and append that to tagData.

31
tests/test_id3v2.cpp
View File

@ -92,6 +92,7 @@ class TestID3v2 : public CppUnit::TestFixture
CPPUNIT_TEST(testParseTableOfContentsFrame);
CPPUNIT_TEST(testRenderTableOfContentsFrame);
CPPUNIT_TEST(testShrinkPadding);
CPPUNIT_TEST(testEmptyFrame);
CPPUNIT_TEST_SUITE_END();
public:
@ -1086,6 +1087,36 @@ public:
}
}
void testEmptyFrame()
{
ScopedFileCopy copy("xing", ".mp3");
string newname = copy.fileName();
{
MPEG::File f(newname.c_str());
ID3v2::Tag *tag = f.ID3v2Tag(true);
ID3v2::UrlLinkFrame *frame1 = new ID3v2::UrlLinkFrame(
ByteVector("WOAF\x00\x00\x00\x01\x00\x00\x00", 11));
tag->addFrame(frame1);
ID3v2::TextIdentificationFrame *frame2 = new ID3v2::TextIdentificationFrame("TIT2");
frame2->setText("Title");
tag->addFrame(frame2);
f.save();
}
{
MPEG::File f(newname.c_str());
CPPUNIT_ASSERT_EQUAL(true, f.hasID3v2Tag());
ID3v2::Tag *tag = f.ID3v2Tag();
CPPUNIT_ASSERT_EQUAL(String("Title"), tag->title());
CPPUNIT_ASSERT_EQUAL(true, tag->frameListMap()["WOAF"].isEmpty());
}
}
};
CPPUNIT_TEST_SUITE_REGISTRATION(TestID3v2);