Skip to content

Allow for an empty / null inputs to Tags by removing that frame #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
czipperz wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Allow for an empty / null inputs to Tags by removing that frame #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f82ecb
If inputs are null or empty string, instead clear that frame
czipperz Apr 10, 2019
65dc6fa
Add tests for null and empty strings
czipperz Apr 10, 2019
90f32ad
Add setChapters and setChapterTOC tests
czipperz Apr 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 90 additions & 30 deletions src/main/java/com/mpatric/mp3agic/AbstractID3v2Tag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,9 @@ public String getTrack() {

@Override
public void setTrack(String track) {
if (track != null && track.length() > 0) {
if (track == null || track.isEmpty()) {
clearFrameSet(ID_TRACK);
} else {
invalidateDataLength();
ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(track));
addFrame(createFrame(ID_TRACK, frameData.toBytes()), true);
Expand All @@ -410,7 +412,9 @@ public String getPartOfSet() {

@Override
public void setPartOfSet(String partOfSet) {
if (partOfSet != null && partOfSet.length() > 0) {
if (partOfSet == null || partOfSet.isEmpty()) {
clearFrameSet(ID_PART_OF_SET);
} else {
invalidateDataLength();
ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(partOfSet));
addFrame(createFrame(ID_PART_OF_SET, frameData.toBytes()), true);
Expand Down Expand Up @@ -441,7 +445,9 @@ public String getGrouping() {

@Override
public void setGrouping(String grouping) {
if (grouping != null && grouping.length() > 0) {
if (grouping == null || grouping.isEmpty()) {
clearFrameSet(ID_GROUPING);
} else {
invalidateDataLength();
ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(grouping));
addFrame(createFrame(ID_GROUPING, frameData.toBytes()), true);
Expand All @@ -457,7 +463,9 @@ public String getArtist() {

@Override
public void setArtist(String artist) {
if (artist != null && artist.length() > 0) {
if (artist == null || artist.isEmpty()) {
clearFrameSet(ID_ARTIST);
} else {
invalidateDataLength();
ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(artist));
addFrame(createFrame(ID_ARTIST, frameData.toBytes()), true);
Expand All @@ -473,7 +481,9 @@ public String getAlbumArtist() {

@Override
public void setAlbumArtist(String albumArtist) {
if (albumArtist != null && albumArtist.length() > 0) {
if (albumArtist == null || albumArtist.isEmpty()) {
clearFrameSet(ID_ALBUM_ARTIST);
} else {
invalidateDataLength();
ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(albumArtist));
addFrame(createFrame(ID_ALBUM_ARTIST, frameData.toBytes()), true);
Expand All @@ -489,7 +499,9 @@ public String getTitle() {

@Override
public void setTitle(String title) {
if (title != null && title.length() > 0) {
if (title == null || title.isEmpty()) {
clearFrameSet(ID_TITLE);
} else {
invalidateDataLength();
ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(title));
addFrame(createFrame(ID_TITLE, frameData.toBytes()), true);
Expand All @@ -505,7 +517,9 @@ public String getAlbum() {

@Override
public void setAlbum(String album) {
if (album != null && album.length() > 0) {
if (album == null || album.isEmpty()) {
clearFrameSet(ID_ALBUM);
} else {
invalidateDataLength();
ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(album));
addFrame(createFrame(ID_ALBUM, frameData.toBytes()), true);
Expand All @@ -521,7 +535,9 @@ public String getYear() {

@Override
public void setYear(String year) {
if (year != null && year.length() > 0) {
if (year == null || year.isEmpty()) {
clearFrameSet(ID_YEAR);
} else {
invalidateDataLength();
ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(year));
addFrame(createFrame(ID_YEAR, frameData.toBytes()), true);
Expand All @@ -537,7 +553,9 @@ public String getDate() {

@Override
public void setDate(String date) {
if (date != null && date.length() > 0) {
if (date == null || date.isEmpty()) {
clearFrameSet(ID_DATE);
} else {
invalidateDataLength();
ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(date));
addFrame(createFrame(ID_DATE, frameData.toBytes()), true);
Expand Down Expand Up @@ -613,7 +631,9 @@ public String getKey() {

@Override
public void setKey(String key) {
if (key != null && key.length() > 0) {
if (key == null || key.isEmpty()) {
clearFrameSet(ID_KEY);
} else {
invalidateDataLength();
ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(key));
addFrame(createFrame(ID_KEY, frameData.toBytes()), true);
Expand Down Expand Up @@ -687,7 +707,9 @@ public String getComment() {

@Override
public void setComment(String comment) {
if (comment != null && comment.length() > 0) {
if (comment == null || comment.isEmpty()) {
clearFrameSet(ID_COMMENT);
} else {
invalidateDataLength();
ID3v2CommentFrameData frameData = new ID3v2CommentFrameData(useFrameUnsynchronisation(), "eng", null, new EncodedText(comment));
addFrame(createFrame(ID_COMMENT, frameData.toBytes()), true);
Expand All @@ -703,7 +725,9 @@ public String getItunesComment() {

@Override
public void setItunesComment(String itunesComment) {
if (itunesComment != null && itunesComment.length() > 0) {
if (itunesComment == null || itunesComment.isEmpty()) {
clearFrameSet(ID_COMMENT);
} else {
invalidateDataLength();
ID3v2CommentFrameData frameData = new ID3v2CommentFrameData(useFrameUnsynchronisation(), "eng", new EncodedText(ITUNES_COMMENT_DESCRIPTION), new EncodedText(itunesComment));
addFrame(createFrame(ID_COMMENT, frameData.toBytes()), true);
Expand Down Expand Up @@ -742,7 +766,9 @@ public String getLyrics() {

@Override
public void setLyrics(String lyrics) {
if (lyrics != null && lyrics.length() > 0) {
if (lyrics == null || lyrics.isEmpty()) {
clearFrameSet(ID_TEXT_LYRICS);
} else {
invalidateDataLength();
ID3v2CommentFrameData frameData = new ID3v2CommentFrameData(useFrameUnsynchronisation(), "eng", null, new EncodedText(lyrics));
addFrame(createFrame(ID_TEXT_LYRICS, frameData.toBytes()), true);
Expand All @@ -758,7 +784,9 @@ public String getComposer() {

@Override
public void setComposer(String composer) {
if (composer != null && composer.length() > 0) {
if (composer == null || composer.isEmpty()) {
clearFrameSet(ID_COMPOSER);
} else {
invalidateDataLength();
ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(composer));
addFrame(createFrame(ID_COMPOSER, frameData.toBytes()), true);
Expand All @@ -774,7 +802,9 @@ public String getPublisher() {

@Override
public void setPublisher(String publisher) {
if (publisher != null && publisher.length() > 0) {
if (publisher == null || publisher.isEmpty()) {
clearFrameSet(ID_PUBLISHER);
} else {
invalidateDataLength();
ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(publisher));
addFrame(createFrame(ID_PUBLISHER, frameData.toBytes()), true);
Expand All @@ -790,7 +820,9 @@ public String getOriginalArtist() {

@Override
public void setOriginalArtist(String originalArtist) {
if (originalArtist != null && originalArtist.length() > 0) {
if (originalArtist == null || originalArtist.isEmpty()) {
clearFrameSet(ID_ORIGINAL_ARTIST);
} else {
invalidateDataLength();
ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(originalArtist));
addFrame(createFrame(ID_ORIGINAL_ARTIST, frameData.toBytes()), true);
Expand All @@ -806,7 +838,9 @@ public String getCopyright() {

@Override
public void setCopyright(String copyright) {
if (copyright != null && copyright.length() > 0) {
if (copyright == null || copyright.isEmpty()) {
clearFrameSet(ID_COPYRIGHT);
} else {
invalidateDataLength();
ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(copyright));
addFrame(createFrame(ID_COPYRIGHT, frameData.toBytes()), true);
Expand All @@ -822,7 +856,9 @@ public String getArtistUrl() {

@Override
public void setArtistUrl(String url) {
if (url != null && url.length() > 0) {
if (url == null || url.isEmpty()) {
clearFrameSet(ID_ARTIST_URL);
} else {
invalidateDataLength();
ID3v2WWWFrameData frameData = new ID3v2WWWFrameData(useFrameUnsynchronisation(), url);
addFrame(createFrame(ID_ARTIST_URL, frameData.toBytes()), true);
Expand All @@ -838,7 +874,9 @@ public String getCommercialUrl() {

@Override
public void setCommercialUrl(String url) {
if (url != null && url.length() > 0) {
if (url == null || url.isEmpty()) {
clearFrameSet(ID_COMMERCIAL_URL);
} else {
invalidateDataLength();
ID3v2WWWFrameData frameData = new ID3v2WWWFrameData(useFrameUnsynchronisation(), url);
addFrame(createFrame(ID_COMMERCIAL_URL, frameData.toBytes()), true);
Expand All @@ -854,7 +892,9 @@ public String getCopyrightUrl() {

@Override
public void setCopyrightUrl(String url) {
if (url != null && url.length() > 0) {
if (url == null || url.isEmpty()) {
clearFrameSet(ID_COPYRIGHT_URL);
} else {
invalidateDataLength();
ID3v2WWWFrameData frameData = new ID3v2WWWFrameData(useFrameUnsynchronisation(), url);
addFrame(createFrame(ID_COPYRIGHT_URL, frameData.toBytes()), true);
Expand All @@ -870,7 +910,9 @@ public String getAudiofileUrl() {

@Override
public void setAudiofileUrl(String url) {
if (url != null && url.length() > 0) {
if (url == null || url.isEmpty()) {
clearFrameSet(ID_AUDIOFILE_URL);
} else {
invalidateDataLength();
ID3v2WWWFrameData frameData = new ID3v2WWWFrameData(useFrameUnsynchronisation(), url);
addFrame(createFrame(ID_AUDIOFILE_URL, frameData.toBytes()), true);
Expand All @@ -886,7 +928,9 @@ public String getAudioSourceUrl() {

@Override
public void setAudioSourceUrl(String url) {
if (url != null && url.length() > 0) {
if (url == null || url.isEmpty()) {
clearFrameSet(ID_AUDIOSOURCE_URL);
} else {
invalidateDataLength();
ID3v2WWWFrameData frameData = new ID3v2WWWFrameData(useFrameUnsynchronisation(), url);
addFrame(createFrame(ID_AUDIOSOURCE_URL, frameData.toBytes()), true);
Expand All @@ -902,7 +946,9 @@ public String getRadiostationUrl() {

@Override
public void setRadiostationUrl(String url) {
if (url != null && url.length() > 0) {
if (url == null || url.isEmpty()) {
clearFrameSet(ID_RADIOSTATION_URL);
} else {
invalidateDataLength();
ID3v2WWWFrameData frameData = new ID3v2WWWFrameData(useFrameUnsynchronisation(), url);
addFrame(createFrame(ID_RADIOSTATION_URL, frameData.toBytes()), true);
Expand All @@ -918,7 +964,9 @@ public String getPaymentUrl() {

@Override
public void setPaymentUrl(String url) {
if (url != null && url.length() > 0) {
if (url == null || url.isEmpty()) {
clearFrameSet(ID_PAYMENT_URL);
} else {
invalidateDataLength();
ID3v2WWWFrameData frameData = new ID3v2WWWFrameData(useFrameUnsynchronisation(), url);
addFrame(createFrame(ID_PAYMENT_URL, frameData.toBytes()), true);
Expand All @@ -934,7 +982,9 @@ public String getPublisherUrl() {

@Override
public void setPublisherUrl(String url) {
if (url != null && url.length() > 0) {
if (url == null || url.isEmpty()) {
clearFrameSet(ID_PUBLISHER_URL);
} else {
invalidateDataLength();
ID3v2WWWFrameData frameData = new ID3v2WWWFrameData(useFrameUnsynchronisation(), url);
addFrame(createFrame(ID_PUBLISHER_URL, frameData.toBytes()), true);
Expand All @@ -950,7 +1000,9 @@ public String getUrl() {

@Override
public void setUrl(String url) {
if (url != null && url.length() > 0) {
if (url == null || url.isEmpty()) {
clearFrameSet(ID_URL);
} else {
invalidateDataLength();
ID3v2UrlFrameData frameData = new ID3v2UrlFrameData(useFrameUnsynchronisation(), null, url);
addFrame(createFrame(ID_URL, frameData.toBytes()), true);
Expand All @@ -968,7 +1020,9 @@ public ArrayList<ID3v2ChapterFrameData> getChapters() {

@Override
public void setChapters(ArrayList<ID3v2ChapterFrameData> chapters) {
if (chapters != null) {
if (chapters == null) {
clearFrameSet(ID_CHAPTER);
} else {
invalidateDataLength();
boolean first = true;
for (ID3v2ChapterFrameData chapter : chapters) {
Expand All @@ -993,7 +1047,9 @@ public ArrayList<ID3v2ChapterTOCFrameData> getChapterTOC() {

@Override
public void setChapterTOC(ArrayList<ID3v2ChapterTOCFrameData> toc) {
if (toc != null) {
if (toc == null) {
clearFrameSet(ID_CHAPTER_TOC);
} else {
invalidateDataLength();
boolean first = true;
for (ID3v2ChapterTOCFrameData ct : toc) {
Expand All @@ -1016,7 +1072,9 @@ public String getEncoder() {

@Override
public void setEncoder(String encoder) {
if (encoder != null && encoder.length() > 0) {
if (encoder == null || encoder.isEmpty()) {
clearFrameSet(ID_ENCODER);
} else {
invalidateDataLength();
ID3v2TextFrameData frameData = new ID3v2TextFrameData(useFrameUnsynchronisation(), new EncodedText(encoder));
addFrame(createFrame(ID_ENCODER, frameData.toBytes()), true);
Expand All @@ -1037,7 +1095,9 @@ public void setAlbumImage(byte[] albumImage, String mimeType) {

@Override
public void setAlbumImage(byte[] albumImage, String mimeType, byte imageType, String imageDescription) {
if (albumImage != null && albumImage.length > 0 && mimeType != null && mimeType.length() > 0) {
if (albumImage == null || albumImage.length == 0 || mimeType == null || mimeType.isEmpty()) {
clearFrameSet(ID_IMAGE);
} else {
invalidateDataLength();
ID3v2PictureFrameData frameData = new ID3v2PictureFrameData(
useFrameUnsynchronisation(), mimeType, imageType,
Expand Down
Loading