diff --git a/tubearchivist/home/src/download.py b/tubearchivist/home/src/download.py
index 7f13eecc..5ba6cbab 100644
--- a/tubearchivist/home/src/download.py
+++ b/tubearchivist/home/src/download.py
@@ -225,6 +225,18 @@ class PendingList:
if not response.ok:
print(response.text)
+ def delete_pending(self, status):
+ """delete download queue based on status value"""
+ data = {"query": {"term": {"status": {"value": status}}}}
+ payload = json.dumps(data)
+ url = self.ES_URL + "/ta_download/_delete_by_query"
+ headers = {"Content-type": "application/json"}
+ response = requests.post(
+ url, data=payload, headers=headers, auth=self.ES_AUTH
+ )
+ if not response.ok:
+ print(response.text)
+
def ignore_from_pending(self, ignore_list):
"""build the bulk query string"""
diff --git a/tubearchivist/home/templates/home/downloads.html b/tubearchivist/home/templates/home/downloads.html
index 71147f10..2a99c1ed 100644
--- a/tubearchivist/home/templates/home/downloads.html
+++ b/tubearchivist/home/templates/home/downloads.html
@@ -21,7 +21,6 @@
-{% if show_ignored_only %}
- Ignored from download
-{% else %}
- Download queue
-{% endif %}
+
+ {% if show_ignored_only %}
+
Ignored from download
+
+ {% else %}
+ Download queue
+
+ {% endif %}
+
Total videos: {{ max_hits }}
{% if all_video_hits %}
diff --git a/tubearchivist/home/views.py b/tubearchivist/home/views.py
index a4071873..d15013dd 100644
--- a/tubearchivist/home/views.py
+++ b/tubearchivist/home/views.py
@@ -1005,6 +1005,7 @@ class PostData:
"show_ignored_only": self.show_ignored_only,
"forgetIgnore": self.forget_ignore,
"addSingle": self.add_single,
+ "deleteQueue": self.delete_queue,
"manual-import": self.manual_import,
"re-embed": self.re_embed,
"db-backup": self.db_backup,
@@ -1172,6 +1173,16 @@ class PostData:
extrac_dl.delay(youtube_ids)
return {"success": True}
+ def delete_queue(self):
+ """delete download queue"""
+ status = self.exec_val
+ print("deleting from download queue: " + status)
+ if status == "pending":
+ PendingList().delete_pending("pending")
+ elif status == "ignore":
+ PendingList().delete_pending("ignore")
+ return {"success": True}
+
@staticmethod
def manual_import():
"""run manual import from settings page"""
diff --git a/tubearchivist/static/css/style.css b/tubearchivist/static/css/style.css
index 465447d0..e9bf7a85 100644
--- a/tubearchivist/static/css/style.css
+++ b/tubearchivist/static/css/style.css
@@ -824,6 +824,11 @@ button:hover {
filter: var(--img-filter-error);
}
+.title-split {
+ display: flex;
+ justify-content: space-between;
+}
+
/* status message */
.download-progress {
background-color: var(--highlight-bg);
diff --git a/tubearchivist/static/script.js b/tubearchivist/static/script.js
index e5fdf9fd..00bc5cd1 100644
--- a/tubearchivist/static/script.js
+++ b/tubearchivist/static/script.js
@@ -138,6 +138,17 @@ function addSingle(button) {
}, 500);
}
+function deleteQueue(button) {
+ var to_delete = button.getAttribute('data-id');
+ var payload = JSON.stringify({'deleteQueue': to_delete});
+ console.log(payload);
+ sendPost(payload);
+ setTimeout(function(){
+ location.reload();
+ return false;
+ }, 1000);
+}
+
function stopQueue() {
var payload = JSON.stringify({'queue': 'stop'});
sendPost(payload);