From d03a58a2961a58dfc1a259e0ef67f9024a3bd3c9 Mon Sep 17 00:00:00 2001
From: Bnyro <bnyro@tutanota.com>
Date: Sun, 29 Oct 2023 15:40:22 +0100
Subject: [PATCH] fix: crash when blocked due to too many requests in playing
 queue

---
 .../libretube/extensions/RunCatchingIO.kt     | 13 ++++
 .../com/github/libretube/util/PlayingQueue.kt | 67 ++++++++-----------
 2 files changed, 42 insertions(+), 38 deletions(-)
 create mode 100644 app/src/main/java/com/github/libretube/extensions/RunCatchingIO.kt

diff --git a/app/src/main/java/com/github/libretube/extensions/RunCatchingIO.kt b/app/src/main/java/com/github/libretube/extensions/RunCatchingIO.kt
new file mode 100644
index 000000000..529bb7286
--- /dev/null
+++ b/app/src/main/java/com/github/libretube/extensions/RunCatchingIO.kt
@@ -0,0 +1,13 @@
+package com.github.libretube.extensions
+
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+
+fun runCatchingIO(block: suspend () -> Unit) {
+    CoroutineScope(Dispatchers.IO).launch {
+        runCatching {
+            block.invoke()
+        }
+    }
+}
diff --git a/app/src/main/java/com/github/libretube/util/PlayingQueue.kt b/app/src/main/java/com/github/libretube/util/PlayingQueue.kt
index 3b39ccaa9..608f0fc20 100644
--- a/app/src/main/java/com/github/libretube/util/PlayingQueue.kt
+++ b/app/src/main/java/com/github/libretube/util/PlayingQueue.kt
@@ -6,6 +6,7 @@ import com.github.libretube.api.PlaylistsHelper
 import com.github.libretube.api.RetrofitInstance
 import com.github.libretube.api.obj.StreamItem
 import com.github.libretube.extensions.move
+import com.github.libretube.extensions.runCatchingIO
 import com.github.libretube.extensions.toID
 import com.github.libretube.helpers.PlayerHelper
 import kotlinx.coroutines.CoroutineScope
@@ -15,7 +16,6 @@ import kotlinx.coroutines.launch
 object PlayingQueue {
     private val queue = mutableListOf<StreamItem>()
     private var currentStream: StreamItem? = null
-    private val scope = CoroutineScope(Dispatchers.IO)
 
     /**
      * Listener that gets called when the user selects an item from the queue
@@ -145,57 +145,43 @@ object PlayingQueue {
         }
     }
 
-    private fun fetchMoreFromPlaylist(playlistId: String, nextPage: String?, isMainList: Boolean) {
+    private fun fetchMoreFromPlaylist(playlistId: String, nextPage: String?, isMainList: Boolean) = runCatchingIO {
         var playlistNextPage = nextPage
-        scope.launch(Dispatchers.IO) {
-            while (playlistNextPage != null) {
-                RetrofitInstance.authApi.getPlaylistNextPage(playlistId, playlistNextPage!!).run {
-                    addToQueueAsync(relatedStreams, isMainList = isMainList)
-                    playlistNextPage = this.nextpage
-                }
+        while (playlistNextPage != null) {
+            RetrofitInstance.authApi.getPlaylistNextPage(playlistId, playlistNextPage).run {
+                addToQueueAsync(relatedStreams, isMainList = isMainList)
+                playlistNextPage = this.nextpage
             }
         }
     }
 
-    fun insertPlaylist(playlistId: String, newCurrentStream: StreamItem?) {
-        scope.launch(Dispatchers.IO) {
-            runCatching {
-                val playlist = PlaylistsHelper.getPlaylist(playlistId)
-                val isMainList = newCurrentStream != null
-                addToQueueAsync(playlist.relatedStreams, newCurrentStream, isMainList)
-                if (playlist.nextpage == null) return@launch
-                fetchMoreFromPlaylist(playlistId, playlist.nextpage, isMainList)
-            }
-        }
+    fun insertPlaylist(playlistId: String, newCurrentStream: StreamItem?) = runCatchingIO {
+        val playlist = PlaylistsHelper.getPlaylist(playlistId)
+        val isMainList = newCurrentStream != null
+        addToQueueAsync(playlist.relatedStreams, newCurrentStream, isMainList)
+        if (playlist.nextpage == null) return@runCatchingIO
+        fetchMoreFromPlaylist(playlistId, playlist.nextpage, isMainList)
     }
 
-    private fun fetchMoreFromChannel(channelId: String, nextPage: String?) {
+    private fun fetchMoreFromChannel(channelId: String, nextPage: String?) = runCatchingIO {
         var channelNextPage = nextPage
-        scope.launch(Dispatchers.IO) {
-            runCatching {
-                while (channelNextPage != null) {
-                    RetrofitInstance.api.getChannelNextPage(channelId, nextPage!!).run {
-                        addToQueueAsync(relatedStreams)
-                        channelNextPage = this.nextpage
-                    }
-                }
+        while (channelNextPage != null) {
+            RetrofitInstance.api.getChannelNextPage(channelId, nextPage!!).run {
+                addToQueueAsync(relatedStreams)
+                channelNextPage = this.nextpage
             }
         }
     }
 
-    private fun insertChannel(channelId: String, newCurrentStream: StreamItem) {
-        scope.launch(Dispatchers.IO) {
-            runCatching {
-                val channel = RetrofitInstance.api.getChannel(channelId)
-                addToQueueAsync(channel.relatedStreams, newCurrentStream)
-                if (channel.nextpage == null) return@launch
-                fetchMoreFromChannel(channelId, channel.nextpage)
-            }
-        }
+    private fun insertChannel(channelId: String, newCurrentStream: StreamItem) = runCatchingIO {
+        val channel = RetrofitInstance.api.getChannel(channelId)
+        addToQueueAsync(channel.relatedStreams, newCurrentStream)
+        if (channel.nextpage == null) return@runCatchingIO
+        fetchMoreFromChannel(channelId, channel.nextpage)
     }
 
     fun insertByVideoId(videoId: String) {
-        scope.launch {
+        CoroutineScope(Dispatchers.IO).launch {
             runCatching {
                 val streams = RetrofitInstance.api.getStreams(videoId.toID())
                 add(streams.toStreamItem(videoId))
@@ -203,7 +189,12 @@ object PlayingQueue {
         }
     }
 
-    fun updateQueue(streamItem: StreamItem, playlistId: String?, channelId: String?, relatedStreams: List<StreamItem> = emptyList()) {
+    fun updateQueue(
+        streamItem: StreamItem,
+        playlistId: String?,
+        channelId: String?,
+        relatedStreams: List<StreamItem> = emptyList()
+    ) {
         if (playlistId != null) {
             insertPlaylist(playlistId, streamItem)
         } else if (channelId != null) {