fixed thumbnails in online cache catalog and shuffle
This commit is contained in:
@@ -83,7 +83,6 @@ public class PlaylistHelper {
|
||||
}
|
||||
|
||||
public static JSONObject getPlaylist() throws JSONException {
|
||||
|
||||
return new JSONObject()
|
||||
.put("id", -1)
|
||||
.put("owner_id", getUserId())
|
||||
|
||||
@@ -11,6 +11,7 @@ import ru.vtosters.lite.music.cache.FileCacheImplementation;
|
||||
|
||||
import java.io.File;
|
||||
import java.net.MalformedURLException;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class TracklistHelper {
|
||||
@@ -50,6 +51,22 @@ public class TracklistHelper {
|
||||
return arr;
|
||||
}
|
||||
|
||||
public static List<MusicTrack> getTracksWithThumbnails() {
|
||||
ArrayList<MusicTrack> tracks = new ArrayList<>();
|
||||
JSONArray cache = TracklistHelper.tracksToJsons(TracklistHelper.getTracks());
|
||||
|
||||
try {
|
||||
for (int i = 0; i < cache.length(); i++) {
|
||||
tracks.add(new MusicTrack(cache.getJSONObject(i)));
|
||||
}
|
||||
} catch (JSONException e) {
|
||||
tracks = (ArrayList<MusicTrack>) TracklistHelper.getTracks();
|
||||
e.printStackTrace();
|
||||
}
|
||||
|
||||
return tracks;
|
||||
}
|
||||
|
||||
private static void addCachedThumbnails(JSONObject target, File thumbnailsDir)
|
||||
throws JSONException, MalformedURLException {
|
||||
var sizes = new JSONArray();
|
||||
|
||||
+2
-1
@@ -9,6 +9,7 @@ import com.vk.dto.music.MusicTrack;
|
||||
import com.vk.dto.music.Playlist;
|
||||
import io.reactivex.Observable;
|
||||
import io.reactivex.ObservableOnSubscribe;
|
||||
import org.json.JSONArray;
|
||||
import org.json.JSONException;
|
||||
import org.json.JSONObject;
|
||||
import ru.vtosters.lite.downloaders.AudioDownloader;
|
||||
@@ -83,7 +84,7 @@ public class PlaylistInjector {
|
||||
}
|
||||
|
||||
if (isVirtualPlaylist) {
|
||||
response.c = (ArrayList<MusicTrack>) TracklistHelper.getTracks();
|
||||
response.c = (ArrayList<MusicTrack>) TracklistHelper.getTracksWithThumbnails();
|
||||
response.b = PlaylistHelper.createCachedPlaylistMetadata();
|
||||
} else {
|
||||
response.c = (ArrayList<MusicTrack>) TracklistHelper.getTracks(requestArgs.get("owner_id"));
|
||||
|
||||
+1
-1
@@ -18,7 +18,7 @@ public class ShuffleInjector {
|
||||
}
|
||||
|
||||
private static List<MusicTrack> getShuffledList() {
|
||||
List<MusicTrack> shuffled = TracklistHelper.getTracks();
|
||||
List<MusicTrack> shuffled = TracklistHelper.getTracksWithThumbnails();
|
||||
Collections.shuffle(shuffled);
|
||||
return shuffled;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user