Fix incorrect thumbnail url and song metadata inference

app/src/main/kotlin/it/vfsfitvnm/vimusic/services/PlayerService.kt

@@ -367,7 +367,7 @@ class PlayerService : MediaSessionService(), MediaSession.MediaItemFiller,
             coroutineScope.launch(Dispatchers.IO) {
                 lastBitmap = Coil.imageLoader(applicationContext).execute(
                     ImageRequest.Builder(applicationContext)
-                        .data("${mediaMetadata.artworkUri}-w${notificationThumbnailSize}-h${notificationThumbnailSize}")
+                        .data(mediaMetadata.artworkUri.thumbnail(notificationThumbnailSize))
                         .build()
                 ).drawable?.let {
                     lastArtworkUri = mediaMetadata.artworkUri

app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/PlayerView.kt

@@ -13,7 +13,6 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.draw.drawBehind
-import androidx.compose.ui.draw.drawWithCache
 import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.graphicsLayer
@@ -102,7 +101,7 @@ fun PlayerView(
                         }
                 ) {
                     AsyncImage(
-                        model = "${player.mediaMetadata.artworkUri}-w$smallThumbnailSize-h$smallThumbnailSize",
+                        model = player.mediaMetadata.artworkUri.thumbnail(smallThumbnailSize),
                         contentDescription = null,
                         contentScale = ContentScale.Crop,
                         modifier = Modifier
@@ -220,11 +219,11 @@ fun PlayerView(
                         .align(Alignment.CenterHorizontally)
                 ) {
                     val artworkUri = remember(it) {
-                        player.mediaController.getMediaItemAt(it).mediaMetadata.artworkUri
+                        player.mediaController.getMediaItemAt(it).mediaMetadata.artworkUri.thumbnail(thumbnailSizePx)
                     }
 
                     AsyncImage(
-                        model = "$artworkUri-w$thumbnailSizePx-h$thumbnailSizePx",
+                        model = artworkUri,
                         contentDescription = null,
                         contentScale = ContentScale.Crop,
                         modifier = Modifier

app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/PlaylistPreviewItem.kt

@@ -26,6 +26,7 @@ import it.vfsfitvnm.vimusic.ui.styling.LocalColorPalette
 import it.vfsfitvnm.vimusic.ui.styling.LocalTypography
 import it.vfsfitvnm.vimusic.utils.color
 import it.vfsfitvnm.vimusic.utils.semiBold
+import it.vfsfitvnm.vimusic.utils.thumbnail
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.distinctUntilChanged
 
@@ -54,7 +55,7 @@ fun PlaylistPreviewItem(
     ) {
         if (thumbnails.toSet().size == 1) {
             AsyncImage(
-                model = "${thumbnails.first()}-w${thumbnailSizePx * 2}-h${thumbnailSizePx * 2}",
+                model = thumbnails.first().thumbnail(thumbnailSizePx * 2),
                 contentDescription = null,
                 contentScale = ContentScale.Crop,
                 modifier = Modifier
@@ -68,7 +69,7 @@ fun PlaylistPreviewItem(
                 Alignment.BottomEnd
             ).forEachIndexed { index, alignment ->
                 AsyncImage(
-                    model = "${thumbnails.getOrNull(index)}-w$thumbnailSizePx-h$thumbnailSizePx",
+                    model = thumbnails.getOrNull(index).thumbnail(thumbnailSizePx),
                     contentDescription = null,
                     contentScale = ContentScale.Crop,
                     modifier = Modifier

app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/views/SongItem.kt

@@ -32,6 +32,7 @@ import it.vfsfitvnm.vimusic.ui.styling.LocalColorPalette
 import it.vfsfitvnm.vimusic.ui.styling.LocalTypography
 import it.vfsfitvnm.vimusic.utils.secondary
 import it.vfsfitvnm.vimusic.utils.semiBold
+import it.vfsfitvnm.vimusic.utils.thumbnail
 
 
 @ExperimentalAnimationApi
@@ -49,7 +50,7 @@ fun SongItem(
     SongItem(
         thumbnailModel = ImageRequest.Builder(LocalContext.current)
             .diskCacheKey(mediaItem.mediaId)
-            .data("${mediaItem.mediaMetadata.artworkUri}-w$thumbnailSize-h$thumbnailSize")
+            .data(mediaItem.mediaMetadata.artworkUri.thumbnail(thumbnailSize))
             .build(),
         title = mediaItem.mediaMetadata.title!!.toString(),
         authors = mediaItem.mediaMetadata.artist.toString(),
@@ -75,7 +76,7 @@ fun SongItem(
     onThumbnailContent: (@Composable BoxScope.() -> Unit)? = null,
 ) {
     SongItem(
-        thumbnailModel = "${song.song.thumbnailUrl}-w$thumbnailSize-h$thumbnailSize",
+        thumbnailModel = song.song.thumbnailUrl?.thumbnail(thumbnailSize),
         title = song.song.title,
         authors = song.authors?.joinToString("") { it.text } ?: "",
         durationText = song.song.durationText,

app/src/main/kotlin/it/vfsfitvnm/vimusic/utils/utils.kt

@@ -2,6 +2,7 @@ package it.vfsfitvnm.vimusic.utils
 
 import android.content.Context
 import android.content.Intent
+import android.net.Uri
 import androidx.core.net.toUri
 import androidx.core.os.bundleOf
 import androidx.media3.common.MediaItem
@@ -171,4 +172,16 @@ fun YouTube.PlaylistOrAlbum.Item.toMediaItem(
         )
         .setMediaId(info.endpoint?.videoId ?: return null)
         .build()
+}
+
+fun String?.thumbnail(size: Int): String? {
+    return when {
+        this?.startsWith("https://lh3.googleusercontent.com") == true -> "$this-w$size-h$size"
+        this?.startsWith("https://yt3.ggpht.com") == true -> "$this-s$size"
+        else -> this
+    }
+}
+
+fun Uri?.thumbnail(size: Int): Uri? {
+    return toString().thumbnail(size)?.toUri()
 }