kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-14 22:30:30 +05:30
Code Issues Projects Releases Wiki Activity

fix some issues

Browse Source
This commit is contained in:
Bnyro 2022-11-21 14:35:09 +01:00
parent 592f1b5648
commit bbd021fc6d
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/github/libretube/api/PlaylistsHelper.kt
View File

@ -38,7 +38,7 @@ object PlaylistsHelper {
Playlists( Playlists(
id = it.playlist.id.toString(), id = it.playlist.id.toString(),
name = it.playlist.name, name = it.playlist.name,
thumbnail = it.playlist.thumbnailUrl, thumbnail = ProxyHelper.rewriteUrl(it.playlist.thumbnailUrl),
videos = it.videos.size.toLong() videos = it.videos.size.toLong()
) )
) )

2
app/src/main/java/com/github/libretube/extensions/ToStreamItem.kt
View File

@ -1,6 +1,5 @@
package com.github.libretube.extensions package com.github.libretube.extensions
import android.util.Log
import com.github.libretube.api.obj.StreamItem import com.github.libretube.api.obj.StreamItem
import com.github.libretube.api.obj.Streams import com.github.libretube.api.obj.Streams
import com.github.libretube.db.obj.LocalPlaylistItem import com.github.libretube.db.obj.LocalPlaylistItem
@ -24,7 +23,6 @@ fun Streams.toStreamItem(videoId: String): StreamItem {
} }
fun LocalPlaylistItem.toStreamItem(): StreamItem { fun LocalPlaylistItem.toStreamItem(): StreamItem {
Log.e("thumb", ProxyHelper.rewriteUrl(thumbnailUrl).toString())
return StreamItem( return StreamItem(
url = videoId, url = videoId,
title = title, title = title,

12
app/src/main/java/com/github/libretube/util/ProxyHelper.kt
View File

@ -6,6 +6,9 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import java.net.URI import java.net.URI
import java.net.URLDecoder
import java.nio.charset.StandardCharsets
import java.util.*
object ProxyHelper { object ProxyHelper {
private fun getImageProxyUrl(): String? { private fun getImageProxyUrl(): String? {
@ -35,13 +38,14 @@ object ProxyHelper {
runCatching { runCatching {
val originalUri = URI(url) val originalUri = URI(url)
return URI( val newUri = URI(
originalUri.scheme.lowercase(), originalUri.scheme.lowercase(Locale.US),
proxyUrl, URI(proxyUrl).authority,
originalUri.path, originalUri.path,
originalUri.query, originalUri.query,
originalUri.fragment originalUri.fragment
).toString() )
return URLDecoder.decode(newUri.toString(), StandardCharsets.UTF_8.toString())
} }
return url return url
} }