Unofficial YouTube Music / Spotify Premium client for Android, built in Liquid Glass. Audio effects, Spotify Connect, listening history, 8 languages. Rust core on librespot.
Kotlin alternativeandroidandroid-applicationclientglassmorphisminnertubelibrespotliquid-glassspotifyspotify-connectspotifyapiyoutube-musicyoutube-playerytdlnis
Local files come out of Spotify playlists from Square too
Leloniob8f4ab8f96b7
diff --git a/app/src/main/java/dev/lelonio/square/nativecore/NativeBridge.kt b/app/src/main/java/dev/lelonio/square/nativecore/NativeBridge.ktindex b892a87..e905d4b 100644--- a/app/src/main/java/dev/lelonio/square/nativecore/NativeBridge.kt+++ b/app/src/main/java/dev/lelonio/square/nativecore/NativeBridge.kt@@ -216,6 +216,9 @@ object NativeBridge {*/fun addToPlaylist(playlistUri: String, itemUri: String) = nativeAddToPlaylist(playlistUri, itemUri)+ /** Takes an item out of a playlist the same way; for local files. Blocking. */+ fun removeFromPlaylist(playlistUri: String, itemUri: String) = nativeRemoveFromPlaylist(playlistUri, itemUri)+/*** How long a track the listener changes away from dissolves into the one* they asked for, in milliseconds. Zero cuts, as it always did.@@ -513,6 +516,7 @@ object NativeBridge {private external fun nativeSetSleepTimer(value: Long)private external fun nativeSetLocalFiles(json: String)private external fun nativeAddToPlaylist(playlistUri: String, itemUri: String)+ private external fun nativeRemoveFromPlaylist(playlistUri: String, itemUri: String)private external fun nativeSetSkipFade(ms: Int)private external fun nativeSetLanguage(language: String, rebuild: Int)diff --git a/app/src/main/java/dev/lelonio/square/ui/MainViewModel.kt b/app/src/main/java/dev/lelonio/square/ui/MainViewModel.ktindex 2ca6517..733ec31 100644--- a/app/src/main/java/dev/lelonio/square/ui/MainViewModel.kt+++ b/app/src/main/java/dev/lelonio/square/ui/MainViewModel.kt@@ -4152,10 +4152,17 @@ class MainViewModel(app: Application) : AndroidViewModel(app) {viewModelScope.launch {runCatching {- container.api.removeFromPlaylist(- uri.substringAfterLast(':'),- RemoveTracksRequestDto(listOf(TrackUriDto(track.uri))),- )+ if (LocalLibrary.isSpotifyLocal(track.uri)) {+ // The Web API cannot take out what it could not put in.+ withContext(Dispatchers.IO) {+ dev.lelonio.square.nativecore.NativeBridge.removeFromPlaylist(uri, track.uri)+ }+ } else {+ container.api.removeFromPlaylist(+ uri.substringAfterLast(':'),+ RemoveTracksRequestDto(listOf(TrackUriDto(track.uri))),+ )+ }}.onFailure {android.util.Log.e(TAG, "remove from playlist failed: ${chain(it)}", it)_takenOut.value = _takenOut.value - "$uri|${track.uri}"diff --git a/native/src/catalog.rs b/native/src/catalog.rsindex 5a33aa5..865fc21 100644--- a/native/src/catalog.rs+++ b/native/src/catalog.rs@@ -862,3 +862,60 @@ pub fn add_to_playlist(playlist_uri: &str, item_uri: &str) -> EngineResult<()> {Ok(())})}++/// Takes an item out of one of the user's playlists, through the playlist+/// service: the way out for a local file, which the Web API cannot remove+/// any more than it can add one. Every occurrence goes, as with the Web API's+/// removal; the item is named rather than placed, so a long playlist does not+/// have to be read to find where it is.+pub fn remove_from_playlist(playlist_uri: &str, item_uri: &str) -> EngineResult<()> {+ use librespot_protocol::playlist4_external::{op::Kind, Delta, Item, ListChanges, Op, Rem};++ let parsed = SpotifyUri::from_uri(playlist_uri).map_err(|e| format!("bad uri: {e}"))?;+ let SpotifyUri::Playlist { id, .. } = parsed else {+ return Err(format!("{playlist_uri} is not a playlist"));+ };+ let base62 = id.to_base62().map_err(|e| format!("bad playlist id: {e}"))?;++ let session = with_session(|s| s.clone())?;+ block_on(async move {+ let bytes = session+ .spclient()+ .get_playlist(&id)+ .await+ .map_err(|e| format!("playlist read failed: {e}"))?;+ let list = SelectedListContent::parse_from_bytes(&bytes)+ .map_err(|e| format!("playlist was not a SelectedListContent: {e}"))?;++ let mut item = Item::new();+ item.set_uri(item_uri.to_string());++ let mut rem = Rem::new();+ rem.items.push(item);+ rem.set_items_as_key(true);++ let mut op = Op::new();+ op.set_kind(Kind::REM);+ op.rem = Some(rem).into();++ let mut delta = Delta::new();+ delta.ops.push(op);++ let mut changes = ListChanges::new();+ changes.set_base_revision(list.revision().to_vec());+ changes.deltas.push(delta);+ changes.set_want_resulting_revisions(true);++ session+ .spclient()+ .request_with_protobuf(+ &Method::POST,+ &format!("/playlist/v2/playlist/{base62}/changes"),+ None,+ &changes,+ )+ .await+ .map_err(|e| format!("playlist change refused: {e}"))?;+ Ok(())+ })+}diff --git a/native/src/ffi.rs b/native/src/ffi.rsindex d85e466..ea23745 100644--- a/native/src/ffi.rs+++ b/native/src/ffi.rs@@ -426,6 +426,23 @@ pub extern "system" fn Java_dev_lelonio_square_nativecore_NativeBridge_nativeAddguard(&mut env, "AddToPlaylist", || catalog::add_to_playlist(&playlist, &item));}+#[no_mangle]+pub extern "system" fn Java_dev_lelonio_square_nativecore_NativeBridge_nativeRemoveFromPlaylist(+ mut env: JNIEnv,+ _class: JClass,+ playlist: JString,+ item: JString,+) {+ let (playlist, item) = match (read_string(&mut env, &playlist), read_string(&mut env, &item)) {+ (Ok(playlist), Ok(item)) => (playlist, item),+ (Err(message), _) | (_, Err(message)) => {+ let _ = env.throw_new(EXCEPTION, message);+ return;+ }+ };+ guard(&mut env, "RemoveFromPlaylist", || catalog::remove_from_playlist(&playlist, &item));+}+#[no_mangle]pub extern "system" fn Java_dev_lelonio_square_nativecore_NativeBridge_nativePlaylistCover(mut env: JNIEnv,