From 8f5607c1714362c0ea0542d25235d85f3fe0234e Mon Sep 17 00:00:00 2001 From: Subhamoy Biswas Date: Mon, 23 Mar 2026 15:39:05 +0530 Subject: [PATCH] refactor: switched to self-contained yt-dlp on flatpak --- src-tauri/tauri.linux-flatpak.conf.json | 1 + src/App.tsx | 2 +- src/helpers/use-downloader.ts | 4 ++-- src/helpers/use-linux-registerer.ts | 1 + src/helpers/use-ytdlp-updater.ts | 7 ++++--- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src-tauri/tauri.linux-flatpak.conf.json b/src-tauri/tauri.linux-flatpak.conf.json index 08c64f5..49f3b2e 100644 --- a/src-tauri/tauri.linux-flatpak.conf.json +++ b/src-tauri/tauri.linux-flatpak.conf.json @@ -37,6 +37,7 @@ "icons/icon.ico" ], "externalBin": [ + "binaries/yt-dlp", "binaries/deno", "binaries/neodlp-pot" ], diff --git a/src/App.tsx b/src/App.tsx index 190ae9e..817c22a 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -260,7 +260,7 @@ export default function App({ children }: { children: React.ReactNode }) { const isFlatpak = await invoke('is_flatpak'); const xdgDataDir = await dataDir(); const command = isFlatpak - ? Command.create('sh', ['-c', `${xdgDataDir}/pip/bin/yt-dlp --version`]) + ? Command.create('sh', ['-c', `${xdgDataDir}/yt-dlp/yt-dlp --version`]) : Command.sidecar('binaries/yt-dlp', ['--version']); const output = await command.execute(); if (output.code === 0) { diff --git a/src/helpers/use-downloader.ts b/src/helpers/use-downloader.ts index 7d10de0..b7304b0 100644 --- a/src/helpers/use-downloader.ts +++ b/src/helpers/use-downloader.ts @@ -202,7 +202,7 @@ export default function useDownloader() { const isFlatpak = await invoke('is_flatpak'); const xdgDataDir = await dataDir(); const command = isFlatpak - ? Command.create('sh', ['-c', `${xdgDataDir}/pip/bin/yt-dlp ${args.map(arg => `'${arg.replace(/'/g, "'\\''")}'`).join(' ')}`]) + ? Command.create('sh', ['-c', `${xdgDataDir}/yt-dlp/yt-dlp ${args.map(arg => `'${arg.replace(/'/g, "'\\''")}'`).join(' ')}`]) : Command.sidecar('binaries/yt-dlp', args); let jsonOutput = ''; @@ -573,7 +573,7 @@ export default function useDownloader() { const isFlatpak = await invoke('is_flatpak'); const xdgDataDir = await dataDir(); const command = isFlatpak - ? Command.create('sh', ['-c', `${xdgDataDir}/pip/bin/yt-dlp ${args.map(arg => `'${arg.replace(/'/g, "'\\''")}'`).join(' ')}`]) + ? Command.create('sh', ['-c', `${xdgDataDir}/yt-dlp/yt-dlp ${args.map(arg => `'${arg.replace(/'/g, "'\\''")}'`).join(' ')}`]) : Command.sidecar('binaries/yt-dlp', args); command.on('close', async (data) => { diff --git a/src/helpers/use-linux-registerer.ts b/src/helpers/use-linux-registerer.ts index 822142c..0544b8c 100644 --- a/src/helpers/use-linux-registerer.ts +++ b/src/helpers/use-linux-registerer.ts @@ -48,6 +48,7 @@ export function useLinuxRegisterer() { // { source: 'firefox.json', destination: '.mozilla/native-messaging-hosts/com.neosubhamoy.neodlp.json', dir: '.mozilla/native-messaging-hosts/', content: JSON.stringify(flatpakFirefoxManifestContent) }, // { source: 'neodlp-msghost', destination: '.local/bin/neodlp-msghost', dir: '.local/bin/' }, + { source: 'yt-dlp', destination: '.var/app/com.neosubhamoy.neodlp/data/yt-dlp/yt-dlp', dir: '.var/app/com.neosubhamoy.neodlp/data/yt-dlp/' }, { source: 'yt-dlp-plugins/bgutil-ytdlp-pot-provider/yt_dlp_plugins/extractor/getpot_bgutil.py', destination: '.var/app/com.neosubhamoy.neodlp/config/yt-dlp-plugins/bgutil-ytdlp-pot-provider/yt_dlp_plugins/extractor/getpot_bgutil.py', dir: '.var/app/com.neosubhamoy.neodlp/config/yt-dlp-plugins/bgutil-ytdlp-pot-provider/yt_dlp_plugins/extractor/' }, { source: 'yt-dlp-plugins/bgutil-ytdlp-pot-provider/yt_dlp_plugins/extractor/getpot_bgutil_cli.py', destination: '.var/app/com.neosubhamoy.neodlp/config/yt-dlp-plugins/bgutil-ytdlp-pot-provider/yt_dlp_plugins/extractor/getpot_bgutil_cli.py', dir: '.var/app/com.neosubhamoy.neodlp/config/yt-dlp-plugins/bgutil-ytdlp-pot-provider/yt_dlp_plugins/extractor/' }, { source: 'yt-dlp-plugins/bgutil-ytdlp-pot-provider/yt_dlp_plugins/extractor/getpot_bgutil_http.py', destination: '.var/app/com.neosubhamoy.neodlp/config/yt-dlp-plugins/bgutil-ytdlp-pot-provider/yt_dlp_plugins/extractor/getpot_bgutil_http.py', dir: '.var/app/com.neosubhamoy.neodlp/config/yt-dlp-plugins/bgutil-ytdlp-pot-provider/yt_dlp_plugins/extractor/' }, diff --git a/src/helpers/use-ytdlp-updater.ts b/src/helpers/use-ytdlp-updater.ts index 69137b1..dc24361 100644 --- a/src/helpers/use-ytdlp-updater.ts +++ b/src/helpers/use-ytdlp-updater.ts @@ -23,9 +23,10 @@ export function useYtDlpUpdater() { LOG.info('NEODLP', 'Updating yt-dlp to latest version'); try { const command = currentPlatform === 'linux' && isFlatpak - ? ytDlpUpdateChannel === 'nightly' - ? Command.create('sh', ['-c', `PYTHONUSERBASE=${xdgDataDir}/pip python3 -m pip install --user --upgrade --pre "yt-dlp[default,curl-cffi]"`]) - : Command.create('sh', ['-c', `PYTHONUSERBASE=${xdgDataDir}/pip python3 -m pip install --user --upgrade "yt-dlp[default,curl-cffi]"`]) + // ? ytDlpUpdateChannel === 'nightly' + // ? Command.create('sh', ['-c', `PYTHONUSERBASE=${xdgDataDir}/pip python3 -m pip install --user --upgrade --pre "yt-dlp[default,curl-cffi]"`]) + // : Command.create('sh', ['-c', `PYTHONUSERBASE=${xdgDataDir}/pip python3 -m pip install --user --upgrade "yt-dlp[default,curl-cffi]"`]) + ? Command.create('sh', ['-c', `${xdgDataDir}/yt-dlp/yt-dlp --update-to ${ytDlpUpdateChannel}`]) : currentPlatform === 'linux' ? Command.create('pkexec', ['yt-dlp', '--update-to', ytDlpUpdateChannel]) : Command.sidecar('binaries/yt-dlp', ['--update-to', ytDlpUpdateChannel]);