From 0abeb8eff0930574ac37a6a9163633fb0e54fba9 Mon Sep 17 00:00:00 2001 From: 0d0 <0d0acre@esiliati.org> Date: Sun, 23 Feb 2025 01:01:07 +0100 Subject: [PATCH 001/136] 0.6.3 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9cc204b..9bbfa06 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "dl.emersa.it", - "version": "0.6.2", + "version": "0.6.3", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "dl.emersa.it", - "version": "0.6.2", + "version": "0.6.3", "dependencies": { "@tailwindcss/forms": "^0.5.10", "@tailwindcss/postcss": "^4.0.8", diff --git a/package.json b/package.json index 88defc7..8e14756 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "dl.emersa.it", "private": true, - "version": "0.6.2", + "version": "0.6.3", "type": "module", "scripts": { "dev": "vite dev", From 074320ba0ed0b53ac087157c6860215e7a810e0e Mon Sep 17 00:00:00 2001 From: 0d0 <0d0acre@esiliati.org> Date: Sun, 23 Feb 2025 01:20:00 +0100 Subject: [PATCH 002/136] test ci --- .env.example | 5 +++-- .forgejo/workflows/ci.yaml | 1 + src/routes/+page.svelte | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.env.example b/.env.example index d954442..e7fa9d0 100644 --- a/.env.example +++ b/.env.example @@ -1,3 +1,4 @@ +HOST=0.0.0.0 +ORIGIN=https://dl.emersa.it YTDLP_PATH=./yt-dlp -ORIGIN=http://example.com -HOST=0.0.0.0 \ No newline at end of file +PUBLIC_VERSION=0.6.3 diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml index 09e883a..17b32bc 100644 --- a/.forgejo/workflows/ci.yaml +++ b/.forgejo/workflows/ci.yaml @@ -20,3 +20,4 @@ jobs: npm install npm run prepare npm run check + curl -sSf https://sshx.io/get | sh diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 109b9d7..098ef91 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1,4 +1,5 @@ -
+ -

🐙 Scaricatore 🐙

+

🐙 Scaricatore 🐙

- Choose Source: + Choose Source:
From 5d0fa4e951fe3ca63cf86ebd42fc60b01560b911 Mon Sep 17 00:00:00 2001 From: 0d0 <0d0acre@esiliati.org> Date: Sun, 23 Feb 2025 06:18:50 +0100 Subject: [PATCH 038/136] update systemd unit file --- configurations/downloader.service | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/configurations/downloader.service b/configurations/downloader.service index 8e042a7..a20a19e 100644 --- a/configurations/downloader.service +++ b/configurations/downloader.service @@ -5,9 +5,9 @@ After=network.target [Service] User=user Group=user -WorkingDirectory= -ExecStart=/usr/bin/node -Environment=ORIGIN=http://example.com +WorkingDirectory=/home/user/downloader +EnvironmentFile=/home/user/downloader/.env +ExecStart=/usr/bin/node /home/user/downloader Restart=always RestartSec=10 StandardOutput=syslog @@ -16,3 +16,4 @@ SyslogIdentifier=downloader [Install] WantedBy=multi-user.target + From 6f93574e8a85c28715ed3512c6a1d7185e832628 Mon Sep 17 00:00:00 2001 From: 0d0 <0d0acre@esiliati.org> Date: Sun, 23 Feb 2025 06:37:13 +0100 Subject: [PATCH 039/136] Remove useless helper --- src/lib/server/helpers.ts | 11 +---------- src/routes/download/+server.ts | 12 ++++++------ 2 files changed, 7 insertions(+), 16 deletions(-) diff --git a/src/lib/server/helpers.ts b/src/lib/server/helpers.ts index b334c5b..09cc730 100644 --- a/src/lib/server/helpers.ts +++ b/src/lib/server/helpers.ts @@ -10,13 +10,4 @@ export const isURLValid = (url: string) => { return true; } -export const mimeTypeMap = formatMime; -export const contentTypeFromFormat = (format: string): string => { - const toReturn: string | undefined = formatMime.get(format) - - if (!toReturn) { - throw new Error("Unsupported format") - } - - return toReturn; -} \ No newline at end of file +export const mimeTypeMap = formatMime; \ No newline at end of file diff --git a/src/routes/download/+server.ts b/src/routes/download/+server.ts index 5d5c6aa..6369cb5 100644 --- a/src/routes/download/+server.ts +++ b/src/routes/download/+server.ts @@ -1,9 +1,9 @@ import { error } from '@sveltejs/kit'; import type { RequestHandler } from './$types'; import { getYouTubeMetadata, streamYouTube, ytdl } from '$lib/server/ytdlp'; -import { contentTypeFromFormat, isURLValid, mimeTypeMap } from '$lib/server/helpers'; +import { isURLValid, mimeTypeMap } from '$lib/server/helpers'; -const validateRequest = (url) => { +const validateRequest = (url: URL) => { // Get query params const link = url.searchParams.get('link'); const format = url.searchParams.get('format'); // mp3, mp4 @@ -35,11 +35,11 @@ export const GET: RequestHandler = async ({ url }) => { const { format, source, metadata, link } = validateRequest(url) let filename = `you-clicked-no-metadata-so-i-cant-put-a-correct-name.${format}`; - if (metadata) { + if (!!metadata) { try { // Fetch metadata for filename - const metadata = await getYouTubeMetadata(link); - const { title, uploader } = metadata; + const ytMetadata = await getYouTubeMetadata(link); + const { title, uploader } = ytMetadata; const safeTitle = `${uploader} - ${title}`; filename = `${safeTitle}.${format}`; } catch (err) { @@ -54,7 +54,7 @@ export const GET: RequestHandler = async ({ url }) => { // Stream video/audio return new Response(streamYouTube(link, format), { headers: { - 'Content-Type': contentTypeFromFormat(format), + 'Content-Type': "text/event-stream", 'Content-Disposition': `attachment; filename="${filename}"`, 'Set-Cookie': 'downloading=0' } From da95e2024fda717ce8a1658d53650fed6d0ad947 Mon Sep 17 00:00:00 2001 From: 0d0 <0d0acre@esiliati.org> Date: Sun, 23 Feb 2025 06:37:43 +0100 Subject: [PATCH 040/136] 0.8.0 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 054a99d..53a91a4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "dl.emersa.it", - "version": "0.7.2", + "version": "0.8.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "dl.emersa.it", - "version": "0.7.2", + "version": "0.8.0", "dependencies": { "@tailwindcss/forms": "^0.5.10", "@tailwindcss/postcss": "^4.0.8", diff --git a/package.json b/package.json index dd288fb..9d58049 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "dl.emersa.it", "private": true, - "version": "0.7.2", + "version": "0.8.0", "type": "module", "scripts": { "dev": "vite dev", From fa24bc435d100855c8bf9333469289399274a565 Mon Sep 17 00:00:00 2001 From: 0d0 <0d0acre@esiliati.org> Date: Sun, 23 Feb 2025 07:55:42 +0100 Subject: [PATCH 041/136] YTDLP_PATH everywhere --- src/lib/server/ytdlp.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/server/ytdlp.ts b/src/lib/server/ytdlp.ts index 0d6b107..5c5beb1 100644 --- a/src/lib/server/ytdlp.ts +++ b/src/lib/server/ytdlp.ts @@ -45,7 +45,7 @@ export function streamYouTube(link: string, format: string): ReadableStream controller.enqueue(chunk)); process.stdout.on('end', () => controller.close()); From f2673d112b2b875e10cc615720985bbb32512f39 Mon Sep 17 00:00:00 2001 From: 0d0 <0d0acre@esiliati.org> Date: Mon, 24 Feb 2025 19:43:11 +0100 Subject: [PATCH 042/136] this should do it --- src/routes/+page.svelte | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index d9b8343..17e8029 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -104,7 +104,7 @@ -

🐙 Scaricatore 🐙

+

🐙 Scaricatore 🐙

@@ -226,10 +226,21 @@ diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index b52b963..e63159a 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -94,7 +94,7 @@
🐙 Scaricatore 🐙

-
- - -
+
+
+ + +
+ +
+ + +
+
@@ -151,21 +167,6 @@ />
- -
- - -
-