mirror/taglib
1
0
Fork 0
mirror of https://github.com/taglib/taglib.git synced 2025-11-03 16:26:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'robinst/dont-copy-from-id3v1-when-only-saving-id3v2'

Browse Source
This commit is contained in:
Lukáš Lalinský
2012-07-14 21:03:16 +02:00
parent fbb1c7e554 7279b4fb7b
commit 411d318f34
2 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
taglib/mpeg/mpegfile.cpp
View File

@ -207,12 +207,12 @@ bool MPEG::File::save(int tags, bool stripOthers, int id3v2Version)
}
// Create the tags if we've been asked to. Copy the values from the tag that
// does exist into the new tag.
// does exist into the new tag, except if the existing tag is to be stripped.
if((tags & ID3v2) && ID3v1Tag())
if((tags & ID3v2) && ID3v1Tag() && !(stripOthers && !(tags & ID3v1)))
Tag::duplicate(ID3v1Tag(), ID3v2Tag(true), false);
if((tags & ID3v1) && d->tag[ID3v2Index])
if((tags & ID3v1) && d->tag[ID3v2Index] && !(stripOthers && !(tags & ID3v2)))
Tag::duplicate(ID3v2Tag(), ID3v1Tag(true), false);
bool success = true;

23
tests/test_id3v2.cpp
View File

@ -71,6 +71,7 @@ class TestID3v2 : public CppUnit::TestFixture
CPPUNIT_TEST(testCompressedFrameWithBrokenLength);
CPPUNIT_TEST(testPropertyInterface);
CPPUNIT_TEST(testPropertyInterface2);
CPPUNIT_TEST(testSaveAndStripID3v1ShouldNotAddFrameFromID3v1ToId3v2);
CPPUNIT_TEST_SUITE_END();
public:
@ -628,6 +629,28 @@ public:
CPPUNIT_ASSERT(tag.frameList("TIPL").isEmpty());
}
void testSaveAndStripID3v1ShouldNotAddFrameFromID3v1ToId3v2()
{
ScopedFileCopy copy("xing", ".mp3");
string newname = copy.fileName();
{
MPEG::File foo(newname.c_str());
foo.tag()->setArtist("Artist");
foo.save(MPEG::File::ID3v1 | MPEG::File::ID3v2);
}
{
MPEG::File bar(newname.c_str());
bar.ID3v2Tag()->removeFrames("TPE1");
// Should strip ID3v1 here and not add old values to ID3v2 again
bar.save(MPEG::File::ID3v2, true);
}
MPEG::File f(newname.c_str());
CPPUNIT_ASSERT(!f.ID3v2Tag()->frameListMap().contains("TPE1"));
}
};
CPPUNIT_TEST_SUITE_REGISTRATION(TestID3v2);