y0zhyck/vtosters
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement libvkx playlist injecting

Browse Source
This commit is contained in:
iTaysonLab
2022-09-16 21:49:24 +02:00
parent 025f582f6a
commit 57e8c32629
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/aidl/bruhcollective/itaysonlab/libvkx/ILibVkxService.aidl
+1 -1
View File
@@ -25,5 +25,5 @@ interface ILibVkxService {
// Get cached library in Catalog2-like JSON
String getCacheCatalog() = 11;
List<String> getTracksInPlaylist(in int playlist_id, in int owner_id) = 12;
List<String> getTracksInPlaylist(in String playlist_id, in String owner_id) = 12;
}
app/src/main/java/ru/vtosters/lite/music/cache/injectors/PlaylistInjector.java
Vendored
+11 -3
View File
@@ -44,8 +44,14 @@ public class PlaylistInjector {
if (!eligibleForOfflineCaching())
return null;
var requestArgs = audioGetPlaylist.b();
var id = requestArgs.get("id");
if (TextUtils.isEmpty(id) || !id.equals("-1") && !id.equals("-2"))
var ownerId = requestArgs.get("owner_id");
var accessKey = requestArgs.get("access_key");
boolean isVirtualPlaylist = accessKey != null && (accessKey.equals("vkx") || accessKey.equals("cache"));
boolean isAlbumVirtualPlaylist = accessKey != null && (accessKey.equals("cacheAlbum"));
if (TextUtils.isEmpty(id) || (!isVirtualPlaylist && !isAlbumVirtualPlaylist))
return null;
return Observable.a((ObservableOnSubscribe<AudioGetPlaylist.c>) observableEmitter -> {
@@ -54,7 +60,7 @@ public class PlaylistInjector {
response.b = PlaylistHelper.createCachedPlaylistMetadata();
LibVKXClient.getInstance().runOnService((service) -> {
try {
List<String> cache = service.getCache();
List<String> cache = service.getTracksInPlaylist(id, ownerId);
ArrayList<MusicTrack> tracks = new ArrayList<>();
for (String json : cache) {
tracks.add(new MusicTrack(new JSONObject(json)));
@@ -68,13 +74,15 @@ public class PlaylistInjector {
});
return;
}
if (id.equals("-1")) {
if (isVirtualPlaylist) {
response.c = (ArrayList<MusicTrack>) TracklistHelper.getTracks();
response.b = PlaylistHelper.createCachedPlaylistMetadata();
} else {
response.c = (ArrayList<MusicTrack>) TracklistHelper.getTracks(requestArgs.get("owner_id"));
response.b = PlaylistHelper.createCachedPlaylistMetadata(requestArgs.get("owner_id"));
}
observableEmitter.b(response);
});
} catch (Exception e) {