From adabc7bbd645ecb61a951d261f2da5f24e7c8aad Mon Sep 17 00:00:00 2001 From: "cool.gitter.choco" Date: Sat, 8 Feb 2025 13:42:28 -0600 Subject: [PATCH 1/3] im tired of writing these commands manually --- builds/dev.build.sh | 1 + builds/latest.build.sh | 1 + 2 files changed, 2 insertions(+) create mode 100755 builds/dev.build.sh create mode 100755 builds/latest.build.sh diff --git a/builds/dev.build.sh b/builds/dev.build.sh new file mode 100755 index 0000000..258d26d --- /dev/null +++ b/builds/dev.build.sh @@ -0,0 +1 @@ +docker buildx build --push --platform linux/amd64,linux/arm64 --tag cooldockerizer93/spotizerr:dev . \ No newline at end of file diff --git a/builds/latest.build.sh b/builds/latest.build.sh new file mode 100755 index 0000000..cc02f92 --- /dev/null +++ b/builds/latest.build.sh @@ -0,0 +1 @@ +docker buildx build --push --platform linux/amd64,linux/arm64 --tag cooldockerizer93/spotizerr:latest . \ No newline at end of file From 18751d8e8e24247707b49c342a972ba087d2f489 Mon Sep 17 00:00:00 2001 From: "cool.gitter.choco" Date: Sat, 8 Feb 2025 13:55:17 -0600 Subject: [PATCH 2/3] yes --- builds/dev.build.sh | 2 +- builds/latest.build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builds/dev.build.sh b/builds/dev.build.sh index 258d26d..cd2b82f 100755 --- a/builds/dev.build.sh +++ b/builds/dev.build.sh @@ -1 +1 @@ -docker buildx build --push --platform linux/amd64,linux/arm64 --tag cooldockerizer93/spotizerr:dev . \ No newline at end of file +docker buildx build --no-cache --push --platform linux/amd64,linux/arm64 --tag cooldockerizer93/spotizerr:dev . \ No newline at end of file diff --git a/builds/latest.build.sh b/builds/latest.build.sh index cc02f92..535bf6c 100755 --- a/builds/latest.build.sh +++ b/builds/latest.build.sh @@ -1 +1 @@ -docker buildx build --push --platform linux/amd64,linux/arm64 --tag cooldockerizer93/spotizerr:latest . \ No newline at end of file +docker buildx build --no-cache --push --platform linux/amd64,linux/arm64 --tag cooldockerizer93/spotizerr:latest . \ No newline at end of file From 937b25de40df41b23468b661b107f2868103378f Mon Sep 17 00:00:00 2001 From: "cool.gitter.choco" Date: Sat, 8 Feb 2025 16:55:01 -0600 Subject: [PATCH 3/3] slightly changed a message in frontend --- static/js/queue.js | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/static/js/queue.js b/static/js/queue.js index 10c3d46..954f413 100644 --- a/static/js/queue.js +++ b/static/js/queue.js @@ -107,8 +107,21 @@ class DownloadQueue { const progress = data.last_line; + // NEW: If the progress data exists but has no "status" parameter, ignore it. + if (progress && typeof progress.status === 'undefined') { + if (entry.type === 'playlist') { + logElement.textContent = "Reading tracks list..."; + } + return; + } + // If there's no progress at all, treat as inactivity. if (!progress) { - this.handleInactivity(entry, queueId, logElement); + // For playlists, set the default message. + if (entry.type === 'playlist') { + logElement.textContent = "Reading tracks list..."; + } else { + this.handleInactivity(entry, queueId, logElement); + } return; } @@ -162,6 +175,8 @@ class DownloadQueue { } createQueueItem(item, type, prgFile, queueId) { + // Use "Reading track list" as the default message for playlists. + const defaultMessage = (type === 'playlist') ? 'Reading track list' : 'Initializing download...'; const div = document.createElement('article'); div.className = 'queue-item'; div.setAttribute('aria-live', 'polite'); @@ -169,7 +184,7 @@ class DownloadQueue { div.innerHTML = `
${item.name}
${type.charAt(0).toUpperCase() + type.slice(1)}
-
Initializing download...
+
${defaultMessage}
@@ -317,7 +332,7 @@ class DownloadQueue { return `Finished ${data.type}`; case 'retrying': - return `Track "${data.song}" by ${data.artist}" failed, retrying (${data.retry_count}/3) in ${data.seconds_left}s`; + return `Track "${data.song}" by ${data.artist}" failed, retrying (${data.retry_count}/5) in ${data.seconds_left}s`; case 'error': return `Error: ${data.message || 'Unknown error'}`;