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

fix: exported playlists in urlsorids format use invalid url format

Browse Source
This commit is contained in:
Bnyro 2024-12-07 11:32:20 +01:00
parent 17031248ce
commit ce0228514c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/github/libretube/helpers/ImportHelper.kt
View File

@ -27,7 +27,6 @@ import com.github.libretube.obj.PipedImportPlaylist
import com.github.libretube.obj.PipedPlaylistFile import com.github.libretube.obj.PipedPlaylistFile
import com.github.libretube.obj.YouTubeWatchHistoryFileItem import com.github.libretube.obj.YouTubeWatchHistoryFileItem
import com.github.libretube.ui.dialogs.ShareDialog.Companion.YOUTUBE_FRONTEND_URL import com.github.libretube.ui.dialogs.ShareDialog.Companion.YOUTUBE_FRONTEND_URL
import com.github.libretube.ui.dialogs.ShareDialog.Companion.YOUTUBE_SHORT_URL
import com.github.libretube.util.TextUtils import com.github.libretube.util.TextUtils
import kotlinx.serialization.ExperimentalSerializationApi import kotlinx.serialization.ExperimentalSerializationApi
import kotlinx.serialization.encodeToString import kotlinx.serialization.encodeToString
@ -38,6 +37,7 @@ import java.util.stream.Collectors
object ImportHelper { object ImportHelper {
private const val IMPORT_THUMBNAIL_QUALITY = "mqdefault" private const val IMPORT_THUMBNAIL_QUALITY = "mqdefault"
private const val VIDEO_ID_LENGTH = 11 private const val VIDEO_ID_LENGTH = 11
private const val YOUTUBE_IMG_URL = "https://img.youtube.com"
/** /**
* Import subscriptions by a file uri * Import subscriptions by a file uri
@ -324,7 +324,7 @@ object ImportHelper {
ImportFormat.URLSORIDS -> { ImportFormat.URLSORIDS -> {
val urlListExport = playlists val urlListExport = playlists
.flatMap { it.relatedStreams } .flatMap { it.relatedStreams }
.joinToString("\n") { YOUTUBE_SHORT_URL + "/watch?v=" + it.url!!.toID() } .joinToString("\n") { YOUTUBE_FRONTEND_URL + "/watch?v=" + it.url!!.toID() }
activity.contentResolver.openOutputStream(uri)?.use { activity.contentResolver.openOutputStream(uri)?.use {
it.write(urlListExport.toByteArray()) it.write(urlListExport.toByteArray())
@ -356,7 +356,7 @@ object ImportHelper {
uploaderUrl = it.subtitles.firstOrNull()?.url?.let { url -> uploaderUrl = it.subtitles.firstOrNull()?.url?.let { url ->
url.substring(url.length - 24) url.substring(url.length - 24)
}, },
thumbnailUrl = "https://img.youtube.com/vi/${videoId}/${IMPORT_THUMBNAIL_QUALITY}.jpg" thumbnailUrl = "${YOUTUBE_IMG_URL}/vi/${videoId}/${IMPORT_THUMBNAIL_QUALITY}.jpg"
) )
} }
} }