beenull/ViMusic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fetch audio-only video ids for albums (#88)

Browse source
This commit is contained in:
vfsfitvnm 2022-07-08 14:52:28 +02:00
parent eb4e249443
commit 948bb97791
2 changed files with 42 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/AlbumScreen.kt
View file

@ -71,7 +71,7 @@ fun AlbumScreen(
authorsText = youtubeAlbum.authors?.joinToString("") { it.name },
shareUrl = youtubeAlbum.url
).also(Database::upsert).also {
youtubeAlbum.items?.forEachIndexed { position, albumItem ->
youtubeAlbum.withAudioSources().items?.forEachIndexed { position, albumItem ->
albumItem.toMediaItem(browseId, youtubeAlbum)?.let { mediaItem ->
Database.insert(mediaItem)
Database.upsert(

44
youtube-music/src/main/kotlin/it/vfsfitvnm/youtubemusic/YouTube.kt
View file

@ -691,7 +691,7 @@ object YouTube {
}.recoverIfCancelled()
}
open class PlaylistOrAlbum(
data class PlaylistOrAlbum(
val title: String?,
val authors: List<Info<NavigationEndpoint.Endpoint.Browse>>?,
val year: String?,
@ -700,13 +700,50 @@ object YouTube {
val url: String?,
val continuation: String?,
) {
open class Item(
data class Item(
val info: Info<NavigationEndpoint.Endpoint.Watch>,
val authors: List<Info<NavigationEndpoint.Endpoint.Browse>>?,
val durationText: String?,
val album: Info<NavigationEndpoint.Endpoint.Browse>?,
val thumbnail: ThumbnailRenderer.MusicThumbnailRenderer.Thumbnail.Thumbnail?,
)
suspend fun withAudioSources(): PlaylistOrAlbum {
@Serializable
data class RelatedStream(
val url: String,
val title: String
)
@Serializable
data class Response(
val relatedStreams: List<RelatedStream>
)
return url?.replace("https://music.youtube.com/playlist?list=", "https://pipedapi.kavin.rocks/playlists/")?.let { url ->
val sources = client.get(url).body<Response>().relatedStreams
copy(
items = items?.mapIndexed { index, item ->
if (item.info.endpoint?.type != "MUSIC_VIDEO_TYPE_ATV") {
sources.getOrNull(index)?.takeIf { source ->
source.title == item.info.name
}?.let { source ->
item.copy(
info = item.info.copy(
endpoint = item.info.endpoint?.copy(
videoId = source.url.removePrefix("/watch?v=")
)
)
)
} ?: item
} else {
item
}
}
)
} ?: this
}
}
suspend fun playlistOrAlbum(browseId: String): Result<PlaylistOrAlbum>? {
@ -795,7 +832,8 @@ object YouTube {
?.firstOrNull()
)
}
?.filter { it.info.endpoint != null },
// ?.filter { it.info.endpoint != null }
,
url = body
.microformat
?.microformatDataRenderer