only usePermit for download jobs

Author: StefanLobbenmeier

src/main/kotlin/de/lobbenmeier/stefan/downloadlist/business/DownloadItem.kt

@@ -36,6 +36,7 @@ class DownloadItem(
             var videoMetadata: VideoMetadata? = null
             try {
                 ytDlp.runAsync(
+                    false,
                     // Print the whole object again so we get the filename
                     "--print",
                     "$VIDEO_METADATA_JSON_PREFIX%()j",
@@ -90,7 +91,7 @@ class DownloadItem(
 
     fun gatherMetadata() {
         CoroutineScope(Dispatchers.IO).launch {
-            ytDlp.runAsync("-J", "--flat-playlist", url) { metadataJson ->
+            ytDlp.runAsync(true, "-J", "--flat-playlist", url) { metadataJson ->
                 val videoMetadata = YtDlpJson.decodeFromString<VideoMetadata>(metadataJson)
                 metadata.value = videoMetadata
 

src/main/kotlin/de/lobbenmeier/stefan/downloadlist/business/YtDlp.kt

@@ -6,25 +6,19 @@ import de.lobbenmeier.stefan.settings.business.Settings
 import de.lobbenmeier.stefan.updater.business.getPlatform
 import de.lobbenmeier.stefan.updater.model.Binaries
 import kotlin.io.path.pathString
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
 import kotlinx.coroutines.sync.Semaphore
 import kotlinx.coroutines.sync.withPermit
 
 class YtDlp(private val binaries: Binaries, private val settings: Settings) {
 
-    private val semaphore = Semaphore(settings.rateLimit?.toInt() ?: 100)
+    private val semaphore = Semaphore(settings.maxConcurrentJobs?.toInt() ?: 100)
 
     fun createDownloadItem(url: String): DownloadItem {
         return DownloadItem(this, url).also { it.gatherMetadata() }
     }
 
-    fun run(vararg options: String) {
-        CoroutineScope(Dispatchers.IO).launch { runAsync(*options) }
-    }
-
     suspend fun runAsync(
+        isDownloadJob: Boolean,
         vararg options: String,
         consumer: suspend (String) -> Unit = { line -> println("process $line") }
     ) {
@@ -46,7 +40,7 @@ class YtDlp(private val binaries: Binaries, private val settings: Settings) {
         val command = arrayOf(ytDlpBinary, *fullOptions).joinToString(separator = " ") { "\"$it\"" }
 
         val res =
-            semaphore.withPermit {
+            withPermit(isDownloadJob) {
                 println("Start process: $command")
 
                 process(
@@ -67,4 +61,15 @@ class YtDlp(private val binaries: Binaries, private val settings: Settings) {
             throw Exception("yt-dlp indicated error in its response")
         }
     }
+
+    private suspend fun <T> withPermit(
+        usePermit: Boolean,
+        action: suspend () -> T,
+    ): T {
+        return if (usePermit) {
+            semaphore.withPermit { action() }
+        } else {
+            action()
+        }
+    }
 }

src/main/kotlin/de/lobbenmeier/stefan/ui/App.kt

@@ -38,7 +38,7 @@ fun App() {
 @Composable
 private fun MainView(settings: Settings, updateSettings: (Settings) -> Unit, binaries: Binaries) {
     val ytDlp = remember(settings) { YtDlp(binaries, settings) }
-    val downloadQueue = remember { DownloadQueue(ytDlp) }
+    val downloadQueue = remember(ytDlp) { DownloadQueue(ytDlp) }
 
     var settingsOpen by remember { mutableStateOf(false) }