From 736b588b8ad73803d59f3deaf3b2206df8615502 Mon Sep 17 00:00:00 2001 From: ArabCoders Date: Thu, 11 Jul 2024 13:38:53 +0300 Subject: [PATCH 1/2] Added option to archive failing download from WebUI --- app/main.py | 21 +++++++++++- frontend/src/App.vue | 28 ++++++++++++---- frontend/src/components/Page-Completed.vue | 37 +++++++++++++--------- frontend/src/main.js | 5 +-- 4 files changed, 67 insertions(+), 24 deletions(-) diff --git a/app/main.py b/app/main.py index 77f88e2c..76264b2e 100644 --- a/app/main.py +++ b/app/main.py @@ -9,7 +9,7 @@ import selectors import time from Config import Config from DownloadQueue import DownloadQueue -from Utils import ObjectSerializer, Notifier, load_file +from Utils import ObjectSerializer, Notifier, isDownloaded, load_file from aiohttp import web, client from aiohttp.web import Request, Response from Webhooks import Webhooks @@ -550,6 +550,25 @@ class Main: }) await self.sio.emit('cli_close', {'exitcode': -1}) + @self.sio.event() + async def archive_item(sid, data): + if not isinstance(data, dict) or 'url' not in data or not self.config.keep_archive: + return + + file: str = self.config.ytdl_options.get('download_archive', None) + + if not file: + return + + exists, idDict = isDownloaded(file, data['url']) + if exists or 'archive_id' not in idDict or idDict['archive_id'] is None: + return + + with open(file, 'a') as f: + f.write(f"{idDict['archive_id']}\n") + + LOG.info(f'Archiving item: {data["url"]=}') + @self.sio.event() async def connect(sid, environ): await self.connect(sid, environ) diff --git a/frontend/src/App.vue b/frontend/src/App.vue index beecf9d0..57898bb3 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -9,7 +9,7 @@ + @playItem="playItem" @archiveItem="archiveItem" />
@@ -64,6 +64,18 @@ const runCommand = (args) => { socket.value.emit('cli_post', args); } +const sendData = (type, data, stringify = false) => { + if (!socket.value) { + return; + } + + if (true === Boolean(stringify)) { + data = JSON.stringify(data); + } + + socket.value.emit(type, data); +} + onMounted(() => { socket.value = io(process.env.VUE_APP_BASE_URL, { path: document.location.pathname + 'socket.io', @@ -141,12 +153,17 @@ onMounted(() => { }); socket.value.on('cli_close', () => cli_isLoading.value = false); - socket.value.on('cli_output', stream => { - cli_output.value.push(stream) - console.log(stream); - }); + socket.value.on('cli_output', s => cli_output.value.push(s)); }); +const archiveItem = (type, item) => { + if (!confirm(`Archive '${item.title ?? item.id ?? item.url ?? '??'}'?`)){ + return + } + sendData('archive_item', item); + deleteItem(type, item); +} + const deleteItem = (type, item) => { const items = [] @@ -234,5 +251,4 @@ bus.on((event, data) => { setTimeout(() => bus.emit('task_edit', data), 500); } }); - diff --git a/frontend/src/components/Page-Completed.vue b/frontend/src/components/Page-Completed.vue index 1afda024..d8bafba0 100644 --- a/frontend/src/components/Page-Completed.vue +++ b/frontend/src/components/Page-Completed.vue @@ -77,15 +77,22 @@
-
-
-
+
+
+
{{ item.title }} {{ item.title }}
+
+ + + +
@@ -154,17 +161,6 @@
-
- - - - - - Download - - -
@@ -175,6 +171,17 @@
+
+ + + + + + Archive + + +
@@ -218,7 +225,7 @@ import moment from "moment"; import { useStorage } from '@vueuse/core' import LazyLoader from './Lazy-Loader' -const emits = defineEmits(['deleteItem', 'addItem', 'playItem']); +const emits = defineEmits(['deleteItem', 'addItem', 'playItem', 'archiveItem']); const props = defineProps({ completed: { diff --git a/frontend/src/main.js b/frontend/src/main.js index 50f3f290..c7e52c57 100644 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -11,7 +11,8 @@ import { faBroom, faServer, faPowerOff, - faPaperPlane + faPaperPlane, + faBoxArchive } from '@fortawesome/free-solid-svg-icons' import { faSquare, faSquareCheck } from '@fortawesome/free-regular-svg-icons' @@ -24,7 +25,7 @@ import 'floating-vue/dist/style.css' library.add(faCog, faTrash, faLink, faPlus, faTrashCan, faCircleXmark, faCircleCheck, faRotateRight, faDownload, faUpRightFromSquare, faSquare, faSquareCheck, faSpinner, faArrowUp, faArrowDown, faTasks, faCalendar, faArrowUpAZ, faArrowDownAZ, faEject, faGlobe, faMoon, faSun, faTerminal, faBroom, faServer, faPowerOff, faBroom, faServer, - faPowerOff, faPaperPlane) + faPowerOff, faPaperPlane, faBoxArchive) const app = createApp(App); app.config.globalProperties.capitalize = s => s && s[0].toUpperCase() + s.slice(1); From 4174997600bc2282fa483e9479ae08e9b8e9ff27 Mon Sep 17 00:00:00 2001 From: ArabCoders Date: Thu, 11 Jul 2024 13:48:31 +0300 Subject: [PATCH 2/2] Fixed deleting item after archiving it. --- frontend/src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 57898bb3..8f06aede 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -161,7 +161,7 @@ const archiveItem = (type, item) => { return } sendData('archive_item', item); - deleteItem(type, item); + deleteItem(type, item._id); } const deleteItem = (type, item) => {