neosubhamoy/neodlp
1
1
Fork 0
mirror of https://github.com/neosubhamoy/neodlp.git synced 2026-03-22 08:05:48 +05:30
Code Actions Releases Activity

Compare commits

base: neosubhamoy:2e6dc6ab25b453caeee2c6c2c50185378cfea15f
Branches Tags
neosubhamoy:main
neosubhamoy:v0.4.3 neosubhamoy:v0.4.2 neosubhamoy:v0.4.1 neosubhamoy:v0.4.0 neosubhamoy:v0.3.4 neosubhamoy:v0.3.3 neosubhamoy:v0.3.2 neosubhamoy:v0.3.1 neosubhamoy:v0.3.0 neosubhamoy:v0.2.2 neosubhamoy:v0.2.1 neosubhamoy:v0.2.0 neosubhamoy:v0.1.1 neosubhamoy:v0.1.0
..
compare: neosubhamoy:52dad3acb1ba8aa7038c7a51ac5d69901fce1f3e
Branches Tags
neosubhamoy:main
neosubhamoy:v0.4.3 neosubhamoy:v0.4.2 neosubhamoy:v0.4.1 neosubhamoy:v0.4.0 neosubhamoy:v0.3.4 neosubhamoy:v0.3.3 neosubhamoy:v0.3.2 neosubhamoy:v0.3.1 neosubhamoy:v0.3.0 neosubhamoy:v0.2.2 neosubhamoy:v0.2.1 neosubhamoy:v0.2.0 neosubhamoy:v0.1.1 neosubhamoy:v0.1.0

2 Commits
2e6dc6ab25 ... 52dad3acb1

6 changed files with 70 additions and 45 deletions
Expand all files Collapse all files

22
src-tauri/capabilities/shell.json
View File

@@ -40,6 +40,11 @@
"args": true,
"sidecar": true
},
{
"name": "yt-dlp",
"cmd": "yt-dlp",
"args": true
},
{
"name": "ffmpeg",
"cmd": "ffmpeg",
@@ -66,9 +71,9 @@
"args": true
},
{
"name": "sh",
"cmd": "sh",
"args": true
"name": "sh",
"cmd": "sh",
"args": true
}
]
},
@@ -105,6 +110,11 @@
"args": true,
"sidecar": true
},
{
"name": "yt-dlp",
"cmd": "yt-dlp",
"args": true
},
{
"name": "ffmpeg",
"cmd": "ffmpeg",
@@ -131,9 +141,9 @@
"args": true
},
{
"name": "sh",
"cmd": "sh",
"args": true
"name": "sh",
"cmd": "sh",
"args": true
}
]
}

1
src-tauri/tauri.linux-flatpak.conf.json
View File

@@ -37,7 +37,6 @@
"icons/icon.ico"
],
"externalBin": [
"binaries/yt-dlp",
"binaries/deno"
],
"resources": {

5
src/App.tsx
View File

@@ -257,7 +257,10 @@ export default function App({ children }: { children: React.ReactNode }) {
const fetchYtDlpVersion = async () => {
setIsFetchingYtDlpVersion(true);
try {
const command = Command.sidecar('binaries/yt-dlp', ['--version']);
const isFlatpak = await invoke<boolean>('is_flatpak');
const command = isFlatpak
? Command.create('yt-dlp', [' --version'])
: Command.sidecar('binaries/yt-dlp', ['--version']);
const output = await command.execute();
if (output.code === 0) {
const version = output.stdout.trim();

10
src/helpers/use-downloader.ts
View File

@@ -196,7 +196,10 @@ export default function useDownloader() {
}
}
const command = Command.sidecar('binaries/yt-dlp', args);
const isFlatpak = await invoke<boolean>('is_flatpak');
const command = isFlatpak
? Command.create('yt-dlp', args)
: Command.sidecar('binaries/yt-dlp', args);
let jsonOutput = '';
@@ -557,7 +560,10 @@ export default function useDownloader() {
}
console.log('Starting download with args:', args);
const command = Command.sidecar('binaries/yt-dlp', args);
const isFlatpak = await invoke<boolean>('is_flatpak');
const command = isFlatpak
? Command.create('yt-dlp', args)
: Command.sidecar('binaries/yt-dlp', args);
command.on('close', async (data) => {
if (data.code !== 0) {

69
src/helpers/use-linux-registerer.ts
View File

@@ -2,7 +2,7 @@ import { join, resourceDir, homeDir } from "@tauri-apps/api/path";
import * as fs from "@tauri-apps/plugin-fs";
import { useKvPairs } from "@/helpers/use-kvpairs";
import { useSettingsPageStatesStore } from "@/services/store";
// import { Command } from "@tauri-apps/plugin-shell";
import { Command } from "@tauri-apps/plugin-shell";
import { invoke } from "@tauri-apps/api/core";
interface FileMap {
@@ -42,42 +42,43 @@ export function useLinuxRegisterer() {
{ source: 'yt-dlp-plugins/bgutil-ytdlp-pot-provider/yt_dlp_plugins/extractor/getpot_bgutil_http.py', destination: 'yt-dlp-plugins/bgutil-ytdlp-pot-provider/yt_dlp_plugins/extractor/getpot_bgutil_http.py', dir: 'yt-dlp-plugins/bgutil-ytdlp-pot-provider/yt_dlp_plugins/extractor/' },
];
// const filesToCopyFlatpak: FileMap[] = [
// { source: 'chrome.json', destination: '.config/google-chrome/NativeMessagingHosts/com.neosubhamoy.neodlp.json', dir: '.config/google-chrome/NativeMessagingHosts/', content: JSON.stringify(flatpakChromeManifestContent) },
// { source: 'chrome.json', destination: '.config/chromium/NativeMessagingHosts/com.neosubhamoy.neodlp.json', dir: '.config/chromium/NativeMessagingHosts/', content: JSON.stringify(flatpakChromeManifestContent) },
// { 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/' },
// ];
const filesToCopyFlatpak: FileMap[] = [
// { source: 'chrome.json', destination: '.config/google-chrome/NativeMessagingHosts/com.neosubhamoy.neodlp.json', dir: '.config/google-chrome/NativeMessagingHosts/', content: JSON.stringify(flatpakChromeManifestContent) },
// { source: 'chrome.json', destination: '.config/chromium/NativeMessagingHosts/com.neosubhamoy.neodlp.json', dir: '.config/chromium/NativeMessagingHosts/', content: JSON.stringify(flatpakChromeManifestContent) },
// { 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-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/' },
];
if (isFlatpak) {
// Skip registration and just return success in flatpak
console.log('Running in Flatpak, Skipping registration...');
for (const file of filesToCopyFlatpak) {
const sourcePath = await join(resourceDirPath, file.source);
const destinationDir = await join(homeDirPath, file.dir);
const destinationPath = await join(homeDirPath, file.destination);
const escapedContent = file.content?.replace(/'/g, `'\\''`) || '';
const copyCommand = Command.create('sh', ['-c', `mkdir -p "${destinationDir}" && cp "${sourcePath}" "${destinationPath}"`]);
const writeCommand = Command.create('sh', ['-c', `printf '%s' '${escapedContent}' > "${destinationPath}"`]);
// for (const file of filesToCopyFlatpak) {
// const sourcePath = await join(resourceDirPath, file.source);
// const destinationPath = await join(homeDirPath, file.destination);
// const escapedContent = file.content?.replace(/'/g, `'\\''`) || '';
// const copyCommand = Command.create('sh', ['-c', `cp "${sourcePath}" "${destinationPath}"`]);
// const writeCommand = Command.create('sh', ['-c', `printf '%s' '${escapedContent}' > "${destinationPath}"`]);
// if (file.content) {
// const writeOutput = await writeCommand.execute();
// if (writeOutput.code === 0) {
// console.log(`File ${file.destination} created successfully at ${destinationPath}`);
// } else {
// console.error(`Failed to create file ${file.destination} at ${destinationPath}:`, writeOutput.stderr);
// return { success: false, message: 'Failed to register' };
// }
// } else {
// const copyOutput = await copyCommand.execute();
// if (copyOutput.code === 0) {
// console.log(`File ${file.source} copied successfully to ${destinationPath}`);
// } else {
// console.error(`Failed to copy file ${file.source} to ${destinationPath}:`, copyOutput.stderr);
// return { success: false, message: 'Failed to register' };
// }
// }
// }
if (file.content) {
const writeOutput = await writeCommand.execute();
if (writeOutput.code === 0) {
console.log(`File ${file.destination} created successfully at ${destinationPath}`);
} else {
console.error(`Failed to create file ${file.destination} at ${destinationPath}:`, writeOutput.stderr);
return { success: false, message: 'Failed to register' };
}
} else {
const copyOutput = await copyCommand.execute();
if (copyOutput.code === 0) {
console.log(`File ${file.source} copied successfully to ${destinationPath}`);
} else {
console.error(`Failed to copy file ${file.source} to ${destinationPath}:`, copyOutput.stderr);
return { success: false, message: 'Failed to register' };
}
}
}
} else {
for (const file of filesToCopy) {
const sourcePath = await join(resourceDirPath, file.source);

8
src/helpers/use-ytdlp-updater.ts
View File

@@ -21,7 +21,13 @@ export function useYtDlpUpdater() {
setIsUpdatingYtDlp(true);
LOG.info('NEODLP', 'Updating yt-dlp to latest version');
try {
const command = currentPlatform === 'linux' && !isFlatpak ? Command.create('pkexec', ['yt-dlp', '--update-to', ytDlpUpdateChannel]) : Command.sidecar('binaries/yt-dlp', ['--update-to', ytDlpUpdateChannel]);
const command = currentPlatform === 'linux' && isFlatpak
? ytDlpUpdateChannel === 'nightly'
? Command.create('sh', ['-c', 'pip3 install -U --pre "yt-dlp[default,curl-cffi]"'])
: Command.create('sh', ['-c', 'pip3 install -U "yt-dlp[default,curl-cffi]"'])
: currentPlatform === 'linux'
? Command.create('pkexec', ['yt-dlp', '--update-to', ytDlpUpdateChannel])
: Command.sidecar('binaries/yt-dlp', ['--update-to', ytDlpUpdateChannel]);
const output = await command.execute();
if (output.code === 0) {
console.log("yt-dlp updated successfully:", output.stdout);