Skip to content

fix(track): remove special-case handling of local duration_ms #413

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
dargmuesli merged 1 commit into from
Jan 12, 2025
Merged

fix(track): remove special-case handling of local duration_ms #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 1 addition & 17 deletions src/main/java/se/michaelthelin/spotify/model_objects/specification/Track.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ public Track createModelObject(JsonObject jsonObject) {
: null)
.setDurationMs(
hasAndNotNull(jsonObject, "duration_ms")
? getDurationMsFixed(jsonObject) // TODO: use `jsonObject.get("duration_ms").getAsInt()` when Spotify has fixed their API / API description, see method documentation below
? jsonObject.get("duration_ms").getAsInt()
: null)
.setExplicit(
hasAndNotNull(jsonObject, "explicit")
Expand Down Expand Up @@ -627,22 +627,6 @@ public Track createModelObject(JsonObject jsonObject) {
: null)
.build();
}

/**
* @see <a href="https://community.spotify.com/t5/Spotify-for-Developers/duration-ms-includes-nonsense-JSON/m-p/5753768">Bug report on Spotify forums</a>
* @deprecated This is a temporary workaround to handle an edge-case involving local files,
* which for some reason have their duration_ms field contain an additional field called totalMilliseconds.
* Once Spotify fixes their API, this workaround should be removed.
*/
@Deprecated
private static int getDurationMsFixed(JsonObject jsonObject) {
JsonElement durationMs = jsonObject.get("duration_ms");
if (durationMs.isJsonPrimitive()) {
return durationMs.getAsInt();
} else {
return durationMs.getAsJsonObject().get("totalMilliseconds").getAsInt();
}
}
}

@Override
Expand Down
4 changes: 1 addition & 3 deletions src/test/fixtures/requests/data/tracks/GetTrackRequestLocal.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,7 @@
"UY"
],
"disc_number": 1,
"duration_ms": {
"totalMilliseconds": 222200
},
"duration_ms": 222200,
"explicit": false,
"external_ids": {
"isrc": "GBFFP0300052"
Expand Down
Loading