sarsoo/fmframework
1
0
Fork 0
Code Issues 6 Pull Requests Packages Projects Releases Wiki Activity

added album to scrobble generation in get track scrobbles

Browse Source
This commit is contained in:
aj 2019-05-09 18:49:00 +01:00
parent e2cd31f242
commit 3f30e5e67e
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/sarsoo/fmframework/fm/FmUserNetwork.java
View File

@ -10,6 +10,7 @@ import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import sarsoo.fmframework.log.Logger; import sarsoo.fmframework.log.Logger;
import sarsoo.fmframework.log.entry.ErrorEntry;
import sarsoo.fmframework.log.entry.InfoEntry; import sarsoo.fmframework.log.entry.InfoEntry;
import sarsoo.fmframework.log.entry.LogEntry; import sarsoo.fmframework.log.entry.LogEntry;
import sarsoo.fmframework.music.Album; import sarsoo.fmframework.music.Album;
@ -391,13 +392,13 @@ public class FmUserNetwork extends FmNetwork {
parameters.put("artist", track.getArtist().getName()); parameters.put("artist", track.getArtist().getName());
parameters.put("limit", Integer.toString(limit)); parameters.put("limit", Integer.toString(limit));
parameters.put("page", Integer.toString(page)); parameters.put("page", Integer.toString(page));
ArrayList<Scrobble> scrobbles = new ArrayList<Scrobble>(); ArrayList<Scrobble> scrobbles = new ArrayList<Scrobble>();
JSONObject obj = makeGetRequest("user.gettrackscrobbles", parameters); JSONObject obj = makeGetRequest("user.gettrackscrobbles", parameters);
JSONArray returnedScrobbles = obj.getJSONObject("trackscrobbles").getJSONArray("track"); JSONArray returnedScrobbles = obj.getJSONObject("trackscrobbles").getJSONArray("track");
System.out.println(returnedScrobbles.length() + " length"); System.out.println(returnedScrobbles.length() + " length");
if (returnedScrobbles.length() > 0) { if (returnedScrobbles.length() > 0) {
@ -406,7 +407,17 @@ public class FmUserNetwork extends FmNetwork {
JSONObject scrob = returnedScrobbles.getJSONObject(i); JSONObject scrob = returnedScrobbles.getJSONObject(i);
Scrobble scrobble = new Scrobble(scrob.getJSONObject("date").getLong("uts"), track); Album album = null;
try {
album = new AlbumBuilder(scrob.getJSONObject("album").getString("#text"), track.getArtist())
.build();
} catch (JSONException e) {
Logger.getLog()
.logError(new ErrorEntry("getTrackScrobbles").addArg("no album found").addArg(track.getName()).addArg(track.getArtist().getName()));
}
Scrobble scrobble = new Scrobble(scrob.getJSONObject("date").getLong("uts"), track, album);
scrobbles.add(scrobble); scrobbles.add(scrobble);
} }