Skip to content

Force reading of title, artist and isrc as UTF-8 for Matroska files #133

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

Merged
merged 2 commits into from
Jun 10, 2024
Merged

Force reading of title, artist and isrc as UTF-8 for Matroska files #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
646835f
Force reading of title, artist and isrc as UTF-8
devoxin Jun 9, 2024
73ccad8
Actually skip SimpleTag children
devoxin Jun 10, 2024
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
12 changes: 8 additions & 4 deletions .../main/java/com/sedmelluq/discord/lavaplayer/container/matroska/MatroskaStreamingFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
Expand Down Expand Up @@ -400,7 +401,7 @@ private void parseSegmentInfo(MatroskaElement infoElement) throws IOException {
} else if (child.is(MatroskaElementType.TimecodeScale)) {
timecodeScale = reader.asLong(child);
} else if (child.is(MatroskaElementType.Title) && title == null) {
title = reader.asString(child);
title = reader.asString(child, StandardCharsets.UTF_8);
}

reader.skip(child);
Expand Down Expand Up @@ -453,13 +454,16 @@ private void parseSimpleTag(MatroskaElement simpleTagElement) throws IOException
} else if (child.is(MatroskaElementType.TagString)) {
// https://www.matroska.org/technical/tagging.html
if ("title".equalsIgnoreCase(tagName) && title == null) {
title = reader.asString(child);
title = reader.asString(child, StandardCharsets.UTF_8);
} else if ("artist".equalsIgnoreCase(tagName)) {
artist = reader.asString(child);
artist = reader.asString(child, StandardCharsets.UTF_8);
} else if ("isrc".equalsIgnoreCase(tagName)) {
isrc = reader.asString(child);
// probably not necessary to force a charset here
isrc = reader.asString(child, StandardCharsets.UTF_8);
}
}
}

reader.skip(child);
}
}
12 changes: 9 additions & 3 deletions ...n/java/com/sedmelluq/discord/lavaplayer/container/matroska/format/MatroskaFileReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.io.DataInput;
import java.io.DataInputStream;
import java.io.IOException;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets;

/**
Expand Down Expand Up @@ -153,16 +154,21 @@ public double asDouble(MatroskaElement element) throws IOException {
}
}

public String asString(MatroskaElement element) throws IOException {
return asString(element, null);
}

/**
* @param element Element to read from
* @param forceCharset The charset to use, or null for default.
* @return The contents of the element as a string
* @throws IOException On read error
*/
public String asString(MatroskaElement element) throws IOException {
public String asString(MatroskaElement element, Charset forceCharset) throws IOException {
if (element.is(MatroskaElementType.DataType.STRING)) {
return new String(asBytes(element), StandardCharsets.US_ASCII);
return new String(asBytes(element), forceCharset != null ? forceCharset : StandardCharsets.US_ASCII);
} else if (element.is(MatroskaElementType.DataType.UTF8_STRING)) {
return new String(asBytes(element), StandardCharsets.UTF_8);
return new String(asBytes(element), forceCharset != null ? forceCharset : StandardCharsets.UTF_8);
} else {
throw new IllegalArgumentException("Not a string element.");
}
Expand Down