diff --git a/app/src/Download.py b/app/src/Download.py index 9dbc4fb0..ce4c843f 100644 --- a/app/src/Download.py +++ b/app/src/Download.py @@ -137,6 +137,7 @@ class Download: self.status_queue.put({'status': 'error', 'msg': str(exc)}) if self.tempPath and self.info._id and os.path.exists(self.tempPath): + logging.debug(f'Deleting Temp directory: {self.tempPath}') shutil.rmtree(self.tempPath, ignore_errors=True) async def start(self, notifier): diff --git a/app/src/Utils.py b/app/src/Utils.py index fbe4858e..fdb969e7 100644 --- a/app/src/Utils.py +++ b/app/src/Utils.py @@ -171,6 +171,11 @@ def ExtractInfo(config: dict, url: str, debug: bool = False) -> dict: **config, } + # Remove keys that are not needed for info extraction as those keys generate files when used with extract_info. + for key in ('writeinfojson', 'writethumbnail', 'writedescription', 'writeautomaticsub'): + if key in params: + del params[key] + if debug: params['verbose'] = True params['logger'] = logging.getLogger('YTPTube-ytdl') diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 4a512d30..c098054c 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -14,6 +14,7 @@ "@fortawesome/vue-fontawesome": "^3.0.5", "@vueuse/core": "^10.6.1", "core-js": "^3.8.3", + "cron-parser": "^4.9.0", "hls.js": "^1.4.12", "moment": "^2.29.4", "plyr": "^3.7.8", @@ -4646,6 +4647,17 @@ "node": ">=10" } }, + "node_modules/cron-parser": { + "version": "4.9.0", + "resolved": "https://registry.npmjs.org/cron-parser/-/cron-parser-4.9.0.tgz", + "integrity": "sha512-p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==", + "dependencies": { + "luxon": "^3.2.1" + }, + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/cross-spawn": { "version": "7.0.3", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", @@ -7809,6 +7821,14 @@ "yallist": "^3.0.2" } }, + "node_modules/luxon": { + "version": "3.4.4", + "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz", + "integrity": "sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==", + "engines": { + "node": ">=12" + } + }, "node_modules/magic-string": { "version": "0.30.5", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz", diff --git a/frontend/package.json b/frontend/package.json index abec2065..68f9700c 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -15,6 +15,7 @@ "@fortawesome/vue-fontawesome": "^3.0.5", "@vueuse/core": "^10.6.1", "core-js": "^3.8.3", + "cron-parser": "^4.9.0", "hls.js": "^1.4.12", "moment": "^2.29.4", "plyr": "^3.7.8", diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 4b9aa7b0..40e51642 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -1,7 +1,7 @@ @@ -93,4 +67,8 @@ defineProps({ table.is-fixed { table-layout: fixed; } + +div.table-container { + overflow: hidden; +} diff --git a/frontend/src/main.js b/frontend/src/main.js index bdde957e..f335d087 100644 --- a/frontend/src/main.js +++ b/frontend/src/main.js @@ -25,6 +25,7 @@ app.config.globalProperties.makeDownload = (config, item, base = 'download') => let baseDir = `${base}/`; if (item.folder) { + item.folder = item.folder.replace('#', '%23'); baseDir += item.folder + '/'; }