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

Fix duplicated error messages

Browse Source
This commit is contained in:
Bnyro 2023-03-26 11:27:52 +02:00
parent 42000a74dd
commit 38507c8ea9
3 changed files with 28 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,7 @@
package com.github.libretube.api
import android.content.Context
import android.util.Log
import androidx.core.text.isDigitsOnly
import com.github.libretube.R
import com.github.libretube.api.obj.Playlist
import com.github.libretube.api.obj.PlaylistId
import com.github.libretube.api.obj.Playlists
@ -12,18 +10,14 @@ import com.github.libretube.constants.YOUTUBE_FRONTEND_URL
import com.github.libretube.db.DatabaseHolder
import com.github.libretube.db.obj.LocalPlaylist
import com.github.libretube.enums.PlaylistType
import com.github.libretube.extensions.TAG
import com.github.libretube.extensions.toID
import com.github.libretube.extensions.toastFromMainDispatcher
import com.github.libretube.helpers.PreferenceHelper
import com.github.libretube.helpers.ProxyHelper
import com.github.libretube.obj.ImportPlaylist
import java.io.IOException
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.async
import kotlinx.coroutines.awaitAll
import kotlinx.coroutines.withContext
import retrofit2.HttpException
object PlaylistsHelper {
private val pipedPlaylistRegex =
@ -67,23 +61,12 @@ object PlaylistsHelper {
}
}
suspend fun createPlaylist(playlistName: String, appContext: Context?): String? {
suspend fun createPlaylist(playlistName: String): String? {
return if (!loggedIn) {
val playlist = LocalPlaylist(name = playlistName, thumbnailUrl = "")
DatabaseHolder.Database.localPlaylistsDao().createPlaylist(playlist).toString()
} else {
try {
RetrofitInstance.authApi.createPlaylist(token, Playlists(name = playlistName))
} catch (e: IOException) {
appContext?.toastFromMainDispatcher(R.string.unknown_error)
return null
} catch (e: HttpException) {
Log.e(TAG(), e.toString())
appContext?.toastFromMainDispatcher(R.string.server_error)
return null
}.playlistId
}.also {
appContext?.toastFromMainDispatcher(R.string.playlistCreated)
RetrofitInstance.authApi.createPlaylist(token, Playlists(name = playlistName)).playlistId
}
}
@ -153,7 +136,7 @@ object PlaylistsHelper {
suspend fun importPlaylists(playlists: List<ImportPlaylist>) = withContext(Dispatchers.IO) {
playlists.map { playlist ->
val playlistId = createPlaylist(playlist.name!!, null)
val playlistId = createPlaylist(playlist.name!!)
async {
playlistId ?: return@async
// if logged in, add the playlists by their ID via an api call
@ -169,11 +152,9 @@ object PlaylistsHelper {
runCatching {
val streamItems = playlist.videos.map {
async {
try {
runCatching {
RetrofitInstance.api.getStreams(it).toStreamItem(it)
} catch (e: Exception) {
null
}
}.getOrNull()
}
}
.awaitAll()
@ -201,32 +182,23 @@ object PlaylistsHelper {
suspend fun clonePlaylist(context: Context, playlistId: String): String? {
val appContext = context.applicationContext
if (!loggedIn) {
val playlist = try {
RetrofitInstance.api.getPlaylist(playlistId)
} catch (e: Exception) {
appContext.toastFromMainDispatcher(R.string.server_error)
return null
}
val newPlaylist = createPlaylist(playlist.name ?: "Unknown name", appContext) ?: return null
val playlist = RetrofitInstance.api.getPlaylist(playlistId)
val newPlaylist = createPlaylist(playlist.name ?: "Unknown name") ?: return null
addToPlaylist(newPlaylist, *playlist.relatedStreams.toTypedArray())
var nextPage = playlist.nextpage
while (nextPage != null) {
nextPage = try {
RetrofitInstance.api.getPlaylistNextPage(playlistId, nextPage).apply {
nextPage = runCatching {
RetrofitInstance.api.getPlaylistNextPage(playlistId, nextPage!!).apply {
addToPlaylist(newPlaylist, *relatedStreams.toTypedArray())
}.nextpage
} catch (e: Exception) {
break
}
}.getOrNull()
}
return playlistId
}
return runCatching {
RetrofitInstance.authApi.clonePlaylist(token, PlaylistId(playlistId))
}.getOrNull()?.playlistId
return RetrofitInstance.authApi.clonePlaylist(token, PlaylistId(playlistId)).playlistId
}
suspend fun deletePlaylist(playlistId: String, playlistType: PlaylistType): Boolean {
@ -236,16 +208,12 @@ object PlaylistsHelper {
return true
}
val response = try {
return runCatching {
RetrofitInstance.authApi.deletePlaylist(
PreferenceHelper.getToken(),
PlaylistId(playlistId)
)
} catch (e: Exception) {
Log.e(TAG(), e.toString())
return false
}
return response.message == "ok"
).message == "ok"
}.getOrDefault(false)
}
fun getPrivatePlaylistType(): PlaylistType {

16
app/src/main/java/com/github/libretube/ui/dialogs/CreatePlaylistDialog.kt
View File

@ -29,7 +29,9 @@ class CreatePlaylistDialog(
lifecycleScope.launch {
requireDialog().hide()
val playlistId = withContext(Dispatchers.IO) {
PlaylistsHelper.clonePlaylist(requireContext(), it)
runCatching {
PlaylistsHelper.clonePlaylist(requireContext(), it)
}.getOrNull()
}
if (playlistId != null) {
onSuccess()
@ -49,6 +51,7 @@ class CreatePlaylistDialog(
}
binding.createNewPlaylist.setOnClickListener {
val appContext = context?.applicationContext
// avoid creating the same playlist multiple times by spamming the button
binding.createNewPlaylist.setOnClickListener(null)
val listName = binding.playlistName.text?.toString()
@ -56,11 +59,14 @@ class CreatePlaylistDialog(
lifecycleScope.launch {
requireDialog().hide()
val playlistId = withContext(Dispatchers.IO) {
PlaylistsHelper.createPlaylist(listName, requireContext())
}
if (playlistId != null) {
onSuccess()
runCatching {
PlaylistsHelper.createPlaylist(listName)
}.getOrNull()
}
appContext?.toastFromMainDispatcher(
if (playlistId != null) R.string.playlistCreated else R.string.unknown_error
)
playlistId?.let { onSuccess() }
dismiss()
}
} else {

4
app/src/main/java/com/github/libretube/ui/sheets/PlaylistOptionsBottomSheet.kt
View File

@ -68,7 +68,9 @@ class PlaylistOptionsBottomSheet(
getString(R.string.clonePlaylist) -> {
val context = requireContext()
val playlistId = withContext(Dispatchers.IO) {
PlaylistsHelper.clonePlaylist(context, playlistId)
runCatching {
PlaylistsHelper.clonePlaylist(context, playlistId)
}.getOrNull()
}
context.toastFromMainDispatcher(
if (playlistId != null) R.string.playlistCloned else R.string.server_error