Skip to content
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.

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

Import playlist #1606

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions app/src/main/java/com/zionhuang/music/ui/component/Dialog.kt
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ fun TextFieldDialog(
initialTextFieldValue: TextFieldValue = TextFieldValue(),
placeholder: @Composable (() -> Unit)? = null,
singleLine: Boolean = true,
autoFocus: Boolean = true,
maxLines: Int = if (singleLine) 1 else 10,
isInputValid: (String) -> Boolean = { it.isNotEmpty() },
onDone: (String) -> Unit,
Expand All @@ -158,8 +159,10 @@ fun TextFieldDialog(
}

LaunchedEffect(Unit) {
delay(300)
focusRequester.requestFocus()
if (autoFocus){
delay(300)
focusRequester.requestFocus()
}
}

DefaultDialog(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
package com.zionhuang.music.ui.menu

import androidx.compose.material3.Icon
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.input.TextFieldValue
import com.zionhuang.music.LocalDatabase
import com.zionhuang.music.R
import com.zionhuang.music.db.entities.PlaylistEntity
import com.zionhuang.music.ui.component.TextFieldDialog
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.flow.firstOrNull
import kotlinx.coroutines.launch

@Composable
fun ImportPlaylistDialog(
isVisible: Boolean,
onGetSong: suspend () -> List<String>, // list of song ids. Songs should be inserted to database in this function.
playlistTitle: String,
onDismiss: () -> Unit,
) {
val database = LocalDatabase.current
val coroutineScope = rememberCoroutineScope()

val textFieldValue by remember { mutableStateOf(TextFieldValue(text = playlistTitle)) }
var songIds by remember {
mutableStateOf<List<String>?>(null) // list is not saveable
}

if (isVisible) {
TextFieldDialog(
icon = { Icon(painter = painterResource(R.drawable.add), contentDescription = null) },
title = { Text(text = stringResource(R.string.import_playlist)) },
initialTextFieldValue = textFieldValue,
autoFocus = false,
onDismiss = onDismiss,
onDone = { finalName ->
val newPlaylist = PlaylistEntity(
name = finalName
)
database.query { insert(newPlaylist) }

coroutineScope.launch(Dispatchers.IO) {
val playlist = database.playlist(newPlaylist.id).firstOrNull()

if (playlist != null){
songIds = onGetSong()
database.addSongToPlaylist(playlist, songIds!!)
}

onDismiss()
}
}
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,8 @@ fun YouTubePlaylistMenu(
val database = LocalDatabase.current
val playerConnection = LocalPlayerConnection.current ?: return

var showChoosePlaylistDialog by rememberSaveable {
mutableStateOf(false)
}
var showChoosePlaylistDialog by rememberSaveable { mutableStateOf(false) }
var showImportPlaylistDialog by rememberSaveable { mutableStateOf(false) }

AddToPlaylistDialog(
isVisible = showChoosePlaylistDialog,
Expand All @@ -61,6 +60,24 @@ fun YouTubePlaylistMenu(
onDismiss = { showChoosePlaylistDialog = false }
)

ImportPlaylistDialog(
isVisible = showImportPlaylistDialog,
onGetSong = {
val allSongs = songs
.ifEmpty {
YouTube.playlist(playlist.id).completed().getOrNull()?.songs.orEmpty()
}.map {
it.toMediaMetadata()
}
database.transaction {
allSongs.forEach(::insert)
}
allSongs.map { it.id }
},
playlistTitle = playlist.title,
onDismiss = { showImportPlaylistDialog = false }
)

GridMenu(
contentPadding = PaddingValues(
start = 8.dp,
Expand Down Expand Up @@ -124,6 +141,12 @@ fun YouTubePlaylistMenu(
}
onDismiss()
}
GridMenuItem(
icon = R.drawable.playlist_import,
title = R.string.import_playlist
) {
showImportPlaylistDialog = true
}
GridMenuItem(
icon = R.drawable.playlist_add,
title = R.string.add_to_playlist
Expand Down
9 changes: 9 additions & 0 deletions app/src/main/res/drawable/playlist_import.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960">
<path
android:fillColor="@android:color/white"
android:pathData="M120,640v-80h280v80H120ZM120,480v-80h440v80H120ZM120,320v-80h440v80H120ZM680,800l-200-200,56-58,104,104v-246h80v246l104-104,56,58-200,200Z" />
</vector>
24 changes: 21 additions & 3 deletions innertube/src/main/java/com/zionhuang/innertube/YouTube.kt
Original file line number Diff line number Diff line change
Expand Up @@ -399,17 +399,35 @@ object YouTube {
}

suspend fun likedPlaylists(): Result<List<PlaylistItem>> = runCatching {
val response = innerTube.browse(
var response = innerTube.browse(
client = WEB_REMIX,
browseId = "FEmusic_liked_playlists",
setLogin = true
).body<BrowseResponse>()
response.contents?.singleColumnBrowseResultsRenderer?.tabs?.firstOrNull()?.tabRenderer?.content?.sectionListRenderer?.contents?.firstOrNull()?.gridRenderer?.items!!
val gridRenderer = response.contents?.singleColumnBrowseResultsRenderer?.tabs?.firstOrNull()?.tabRenderer?.content?.sectionListRenderer?.contents?.firstOrNull()?.gridRenderer
val playlists = gridRenderer?.items!!
.drop(1) // the first item is "create new playlist"
.mapNotNull(GridRenderer.Item::musicTwoRowItemRenderer)
.mapNotNull {
ArtistItemsPage.fromMusicTwoRowItemRenderer(it) as? PlaylistItem
}
}.toMutableList()
var continuation = gridRenderer?.continuations?.getContinuation()
while (continuation != null) {
response = innerTube.browse(
client = WEB_REMIX,
continuation = continuation,
setLogin = true
).body<BrowseResponse>()
val gridContinuation = response.continuationContents?.gridContinuation
playlists += gridContinuation?.items!!
.drop(1) // the first item is "create new playlist"
.mapNotNull(GridRenderer.Item::musicTwoRowItemRenderer)
.mapNotNull {
ArtistItemsPage.fromMusicTwoRowItemRenderer(it) as? PlaylistItem
}
continuation = gridContinuation?.continuations?.getContinuation()
}
playlists
}

suspend fun player(videoId: String, playlistId: String? = null): Result<PlayerResponse> = runCatching {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import kotlinx.serialization.Serializable
data class GridRenderer(
val header: Header?,
val items: List<Item>,
val continuations: List<Continuation>?
) {
@Serializable
data class Header(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.zionhuang.innertube.models.response

import com.zionhuang.innertube.models.Button
import com.zionhuang.innertube.models.Continuation
import com.zionhuang.innertube.models.GridRenderer.Item
import com.zionhuang.innertube.models.Menu
import com.zionhuang.innertube.models.MusicShelfRenderer
import com.zionhuang.innertube.models.ResponseContext
Expand Down Expand Up @@ -49,6 +50,7 @@ data class BrowseResponse(
data class ContinuationContents(
val sectionListContinuation: SectionListContinuation?,
val musicPlaylistShelfContinuation: MusicPlaylistShelfContinuation?,
val gridContinuation: GidContinuation
) {
@Serializable
data class SectionListContinuation(
Expand All @@ -61,6 +63,12 @@ data class BrowseResponse(
val contents: List<MusicShelfRenderer.Content>,
val continuations: List<Continuation>?,
)

@Serializable
data class GidContinuation(
val items: List<Item>,
val continuations: List<Continuation>?,
)
}

@Serializable
Expand Down