From 2de99d7e375381ab1a2ff67e05998fd1996d8769 Mon Sep 17 00:00:00 2001
From: simon <simobilleter@gmail.com>
Date: Sat, 25 Sep 2021 18:54:37 +0700
Subject: [PATCH] better implementation for dl icon directly in message builder

---
 tubearchivist/static/progress.js | 15 +++++++++------
 tubearchivist/static/script.js   |  1 -
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/tubearchivist/static/progress.js b/tubearchivist/static/progress.js
index 10115ba..331b1f7 100644
--- a/tubearchivist/static/progress.js
+++ b/tubearchivist/static/progress.js
@@ -15,13 +15,13 @@ function checkMessage() {
     req.open('GET', '/downloads/progress', true);
     req.onload = function() {
         var dlProgress = req.response;
-        var dlStatus = dlProgress['status'];
+        // var dlStatus = dlProgress['status'];
         if (dlProgress['status']) {
             buildDownloadMessage(dlProgress);
             handleInterval();
-            if (dlStatus == 'downloading') {
-                buildDownloadIcons();
-            };
+            // if (dlStatus == 'downloading') {
+            //     buildDownloadIcons();
+            // };
         };
     };
     req.send();
@@ -74,12 +74,14 @@ function buildDownloadMessage(dlProgress) {
     message.appendChild(title);
     message.appendChild(messageText);
     box.appendChild(message);
+    if (dlStatus == 'downloading' && dlLevel != 'error') {
+        box.appendChild(buildDownloadIcons());
+    };
 };
 
 
 // add dl control icons
 function buildDownloadIcons() {
-    var box = document.getElementById('downloadControl');
     var iconBox = document.createElement('div');
     iconBox.classList = 'dl-control-icons';
     // stop icon
@@ -99,5 +101,6 @@ function buildDownloadIcons() {
     // stich together
     iconBox.appendChild(stopIcon);
     iconBox.appendChild(killIcon);
-    box.appendChild(iconBox);
+    
+    return iconBox
 }
diff --git a/tubearchivist/static/script.js b/tubearchivist/static/script.js
index 3acf91c..cdc452e 100644
--- a/tubearchivist/static/script.js
+++ b/tubearchivist/static/script.js
@@ -76,7 +76,6 @@ function downloadNow(button) {
     document.getElementById(youtube_id).remove();
     setTimeout(function(){
         handleInterval();
-        buildDownloadIcons();
     }, 500);
 }