From 0ec12966a521a40801a795c70e241be514b4dd22 Mon Sep 17 00:00:00 2001
From: tranxuanthang <thang.dovah@gmail.com>
Date: Fri, 24 May 2024 22:15:23 +0700
Subject: [PATCH] Replace recursion with while loop for queue

---
 src/components/library/LibraryHeader.vue | 38 +++++++++++++++++-------
 src/composables/downloader.js            | 13 ++++----
 2 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/src/components/library/LibraryHeader.vue b/src/components/library/LibraryHeader.vue
index ceb2335..1589557 100644
--- a/src/components/library/LibraryHeader.vue
+++ b/src/components/library/LibraryHeader.vue
@@ -42,7 +42,14 @@
           <Cog />
         </button>
 
-        <button v-if="isDownloading && downloadedCount !== totalCount" class="button button-working px-4 py-1.5 text-xs rounded-full" @click.prevent="$emit('showDownloadViewer')">
+        <button v-if="isBuildingQueue" class="button button-disabled px-4 py-1.5 min-h-[2rem] min-w-[12rem] text-xs rounded-full" @click.prevent="$emit('showDownloadViewer')" disabled>
+          <div class="animate-spin text-sm"><Loading /></div>
+          <div class="flex gap-1">
+            <div>Preparing</div>
+          </div>
+        </button>
+
+        <button v-else-if="isDownloading && downloadedCount !== totalCount" class="button button-working min-h-[2rem] min-w-[12rem] px-4 py-1.5 text-xs rounded-full" @click.prevent="$emit('showDownloadViewer')">
           <div class="animate-spin text-sm"><Loading /></div>
           <div class="flex gap-1">
             <div>Downloading</div>
@@ -50,14 +57,14 @@
           </div>
         </button>
 
-        <button v-else-if="isDownloading" class="button button-done px-4 py-1.5 text-xs rounded-full" @click.prevent="$emit('showDownloadViewer')">
+        <button v-else-if="isDownloading" class="button button-done min-h-[2rem] min-w-[12rem] px-4 py-1.5 text-xs rounded-full" @click.prevent="$emit('showDownloadViewer')">
           <div class="text-sm"><Check /></div>
           <span>
             Downloaded {{ downloadedCount }}/{{ totalCount }}
           </span>
         </button>
 
-        <button v-else class="button button-primary px-4 py-1.5 text-xs rounded-full" @click.prevent="downloadAllLyrics">
+        <button v-else class="button button-primary px-4 py-1.5 min-h-[2rem] min-w-[12rem] text-xs rounded-full" @click.prevent="downloadAllLyrics">
           <div class="text-sm"><DownloadMultiple /></div>
           <span>
             Download all lyrics
@@ -79,15 +86,26 @@ defineEmits(['changeActiveTab', 'showConfig', 'showAbout', 'showDownloadViewer']
 
 const { isDownloading, totalCount, downloadedCount, addToQueue } = useDownloader()
 
+const isBuildingQueue = ref(false)
+
 const downloadAllLyrics = async () => {
-  const config = await invoke('get_config')
-  let downloadTrackIds
-  if (config.skip_not_needed_tracks) {
-    downloadTrackIds = await invoke('get_no_lyrics_track_ids')
-  } else {
-    downloadTrackIds = await invoke('get_track_ids')
+  isBuildingQueue.value = true
+
+  try {
+    const config = await invoke('get_config')
+    let downloadTrackIds
+    if (config.skip_not_needed_tracks) {
+      downloadTrackIds = await invoke('get_no_lyrics_track_ids')
+    } else {
+      downloadTrackIds = await invoke('get_track_ids')
+    }
+    addToQueue(downloadTrackIds)
+  } catch (error) {
+    // TODO handle error by showing an error popup, etc...
+    console.error(error)
+  } finally {
+    isBuildingQueue.value = false
   }
-  addToQueue(downloadTrackIds)
 }
 </script>
 
diff --git a/src/composables/downloader.js b/src/composables/downloader.js
index ffbea3b..bf03233 100644
--- a/src/composables/downloader.js
+++ b/src/composables/downloader.js
@@ -34,18 +34,16 @@ const downloadLyrics = async (track) => {
 
   downloadedItems.value.push(currentItem.value)
   currentItem.value = null
-  downloadNext()
 }
 
 const downloadNext = async () => {
-  if (downloadQueue.value.length > 0) {
+  while (downloadQueue.value.length > 0) {
     const trackId = downloadQueue.value.shift()
     const track = await invoke('get_track', { trackId: trackId })
     currentItem.value = track
-    downloadLyrics(track)
-  } else {
-    queueResolved.value = true
+    await downloadLyrics(track)
   }
+  queueResolved.value = true
 }
 
 const downloadProgress = computed(() => {
@@ -62,8 +60,11 @@ const addToQueue = (trackIds) => {
   downloadQueue.value.push(...trackIds)
   totalCount.value += trackIds.length
 
+  // Defer the call to downloadNext using setTimeout
   if (!currentItem.value) {
-    downloadNext()
+    setTimeout(() => {
+      downloadNext()
+    }, 0)
   }
 }