aiden
/
ytDownloader
mirror of https://github.com/aandrew-me/ytDownloader
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disable shell for exec

Browse Source
system_proxy_support
aandrew-me 4 weeks ago committed by Andrew
parent 8c241780eb
commit dac75049d1
2 changed files with 100 additions and 87 deletions
Show Stats Download Patch File Download Diff File

97
src/playlist.js
Unescape Escape View File

@ -106,7 +106,7 @@ const playlistDownloader = {
loadInitialConfig() {
// yt-dlp path
this.state.ytDlpPath = localStorage.getItem("ytdlp");
this.state.ytDlpWrap = new YTDlpWrap(`"${this.state.ytDlpPath}"`);
this.state.ytDlpWrap = new YTDlpWrap(this.state.ytDlpPath);
const defaultDownloadsDir = path.join(os.homedir(), "Downloads");
let preferredDir =
@ -117,7 +117,7 @@ const playlistDownloader = {
} catch (err) {
console.error(
"Unable to write to preferred download directory. Reverting to default.",
err
err,
);
this.state.downloadDir = defaultDownloadsDir;
localStorage.setItem("downloadPath", defaultDownloadsDir);
@ -129,12 +129,12 @@ const playlistDownloader = {
if (localStorage.getItem("preferredVideoQuality")) {
this.ui.videoQualitySelect.value = localStorage.getItem(
"preferredVideoQuality"
"preferredVideoQuality",
);
}
if (localStorage.getItem("preferredAudioQuality")) {
this.ui.audioQualitySelect.value = localStorage.getItem(
"preferredAudioQuality"
"preferredAudioQuality",
);
}
},
@ -155,54 +155,54 @@ const playlistDownloader = {
});
this.ui.downloadVideoBtn.addEventListener("click", () =>
this.startDownload("video")
this.startDownload("video"),
);
this.ui.downloadAudioBtn.addEventListener("click", () =>
this.startDownload("audio")
this.startDownload("audio"),
);
this.ui.downloadThumbnailsBtn.addEventListener("click", () =>
this.startDownload("thumbnails")
this.startDownload("thumbnails"),
);
this.ui.saveLinksBtn.addEventListener("click", () =>
this.startDownload("links")
this.startDownload("links"),
);
this.ui.videoToggle.addEventListener("click", () =>
this.toggleDownloadType("video")
this.toggleDownloadType("video"),
);
this.ui.audioToggle.addEventListener("click", () =>
this.toggleDownloadType("audio")
this.toggleDownloadType("audio"),
);
this.ui.advancedToggle.addEventListener("click", () =>
this.toggleAdvancedMenu()
this.toggleAdvancedMenu(),
);
this.ui.videoQualitySelect.addEventListener("change", () =>
this.updateVideoTypeVisibility()
this.updateVideoTypeVisibility(),
);
this.ui.selectLocationBtn.addEventListener("click", () =>
ipcRenderer.send("select-location-main", "")
ipcRenderer.send("select-location-main", ""),
);
this.ui.openDownloadsBtn.addEventListener("click", () =>
this.openDownloadsFolder()
this.openDownloadsFolder(),
);
this.ui.closeHiddenBtn.addEventListener("click", () =>
this.hideOptions(true)
this.hideOptions(true),
);
this.ui.preferenceWinBtn.addEventListener("click", () =>
this.navigate("page", "/preferences.html")
this.navigate("page", "/preferences.html"),
);
this.ui.aboutWinBtn.addEventListener("click", () =>
this.navigate("page", "/about.html")
this.navigate("page", "/about.html"),
);
this.ui.historyWinBtn.addEventListener("click", () =>
this.navigate("page", "/history.html")
this.navigate("page", "/history.html"),
);
this.ui.homeWinBtn.addEventListener("click", () =>
this.navigate("win", "/index.html")
this.navigate("win", "/index.html"),
);
this.ui.compressorWinBtn.addEventListener("click", () =>
this.navigate("win", "/compressor.html")
this.navigate("win", "/compressor.html"),
);
ipcRenderer.on("downloadPath", (_event, downloadPath) => {
@ -244,17 +244,15 @@ const playlistDownloader = {
break;
}
const allArgs = [
...baseArgs,
...specificArgs,
`"${this.state.url}"`,
].filter(Boolean);
const allArgs = [...baseArgs, ...specificArgs, this.state.url].filter(
Boolean,
);
console.log(`Command: ${this.state.ytDlpPath}`, allArgs.join(" "));
this.state.currentDownloadProcess = this.state.ytDlpWrap.exec(
allArgs,
{shell: true, detached: false},
controller.signal
{shell: false},
controller.signal,
);
document.addEventListener("beforeunload", () => {
@ -271,33 +269,40 @@ const playlistDownloader = {
buildBaseArgs() {
const {start, end} = this.config.playlistRange;
const outputPath = `"${path.join(
const outputPath = path.join(
this.state.downloadDir,
this.config.foldernameFormat,
this.config.filenameFormat
)}"`;
this.config.filenameFormat,
);
return [
"--yes-playlist",
"-o",
outputPath,
"-I",
`"${start}:${end}"`,
`${start}:${end}`,
"--ffmpeg-location",
`"${this.state.ffmpegPath}"`,
this.state.ffmpegPath,
...(this.state.jsRuntimePath
? ["--no-js-runtimes", "--js-runtime", this.state.jsRuntimePath]
: []),
this.config.cookie.arg,
this.config.cookie.browser,
this.config.configFile.arg,
this.config.configFile.path,
...(this.config.proxy
? ["--no-check-certificate", "--proxy", this.config.proxy]
: []),
"--compat-options",
"no-youtube-unavailable-videos",
].filter(Boolean);
];
},
getVideoArgs() {
@ -315,7 +320,7 @@ const playlistDownloader = {
if (videoType === "mp4") {
formatArgs = [
"-f",
`"bestvideo[height<=${quality}]+bestaudio[ext=m4a]/best[height<=${quality}]/best"`,
"bestvideo[height<=${quality}]+bestaudio[ext=m4a]/best[height<=${quality}]/best",
"--merge-output-format",
"mp4",
"--recode-video",
@ -324,7 +329,7 @@ const playlistDownloader = {
} else if (videoType === "webm") {
formatArgs = [
"-f",
`"bestvideo[height<=${quality}]+bestaudio[ext=webm]/best[height<=${quality}]/best"`,
"bestvideo[height<=${quality}]+bestaudio[ext=webm]/best[height<=${quality}]/best",
"--merge-output-format",
"webm",
"--recode-video",
@ -333,7 +338,7 @@ const playlistDownloader = {
} else {
formatArgs = [
"-f",
`"bv*[height=${quality}]+ba/best[height=${quality}]/best[height<=${quality}]"`,
`bv*[height=${quality}]+ba/best[height=${quality}]/best[height<=${quality}]`,
];
}
}
@ -396,11 +401,11 @@ const playlistDownloader = {
},
getLinkArgs() {
const linksFilePath = `"${path.join(
const linksFilePath = path.join(
this.state.downloadDir,
this.config.foldernameFormat,
"links.txt"
)}"`;
"links.txt",
);
return [
"--skip-download",
"--print-to-file",
@ -438,7 +443,7 @@ const playlistDownloader = {
}
this.ui.playlistNameDisplay.textContent = `${window.i18n.__(
"downloadingPlaylist"
"downloadingPlaylist",
)} ${this.state.playlistName}`;
}
@ -461,7 +466,7 @@ const playlistDownloader = {
if (progress.percent === 100) {
progressElement.textContent = `${window.i18n.__(
"processing"
"processing",
)}...`;
} else {
progressElement.textContent = `${window.i18n.__("progress")} ${
@ -513,8 +518,8 @@ const playlistDownloader = {
<div class="playlistItem">
<p class="itemTitle">${itemTitle}</p>
<p class="itemProgress" id="p${count}">${window.i18n.__(
"downloading"
)}</p>
"downloading",
)}</p>
</div>`;
this.ui.downloadList.innerHTML += itemHTML;
window.scrollTo(0, document.body.scrollHeight);
@ -561,7 +566,7 @@ const playlistDownloader = {
if (!justHide) {
this.ui.playlistNameDisplay.textContent = `${window.i18n.__(
"processing"
"processing",
)}...`;
this.ui.pasteLinkBtn.style.display = "none";
this.ui.openDownloadsBtn.style.display = "inline-block";
@ -604,7 +609,7 @@ const playlistDownloader = {
const openPath =
this.state.playlistName &&
fs.existsSync(
path.join(this.state.downloadDir, this.state.playlistName)
path.join(this.state.downloadDir, this.state.playlistName),
)
? path.join(this.state.downloadDir, this.state.playlistName)
: this.state.downloadDir;
@ -727,7 +732,7 @@ const playlistDownloader = {
}
return parsed.toString();
}
},
};
playlistDownloader.init();

90
src/renderer.js
Unescape Escape View File

@ -152,7 +152,7 @@ class YtDownloaderApp {
try {
this.state.ytDlpPath = await this._findOrDownloadYtDlp();
this.state.ytDlp = new YTDlpWrap(`"${this.state.ytDlpPath}"`);
this.state.ytDlp = new YTDlpWrap(this.state.ytDlpPath);
this.state.ffmpegPath = await this._findFfmpeg();
this._ensureFfmpegLibsLoadable(this.state.ffmpegPath);
this.state.jsRuntimePath = await this._getJsRuntimePath();
@ -596,7 +596,7 @@ class YtDownloaderApp {
if (process.env.YTDOWNLOADER_NODE_PATH) {
if (existsSync(process.env.YTDOWNLOADER_NODE_PATH)) {
return `$node:"${process.env.YTDOWNLOADER_NODE_PATH}"`;
return `$node:${process.env.YTDOWNLOADER_NODE_PATH}`;
}
return "";
@ -604,7 +604,7 @@ class YtDownloaderApp {
if (process.env.YTDOWNLOADER_DENO_PATH) {
if (existsSync(process.env.YTDOWNLOADER_DENO_PATH)) {
return `$deno:"${process.env.YTDOWNLOADER_DENO_PATH}"`;
return `$deno:${process.env.YTDOWNLOADER_DENO_PATH}`;
}
return "";
@ -618,7 +618,7 @@ class YtDownloaderApp {
for (const p of possiblePaths) {
if (existsSync(p)) {
return `deno:"${p}"`;
return `deno:${p}`;
}
}
@ -634,7 +634,7 @@ class YtDownloaderApp {
}
if (existsSync(jsRuntimePath)) {
return `${exeName}:"${jsRuntimePath}"`;
return `${exeName}:${jsRuntimePath}`;
} else {
return "";
}
@ -889,6 +889,7 @@ class YtDownloaderApp {
this._populateFormatSelectors(metadata.formats || []);
this._displayInfoPanel();
} catch (error) {
console.log(error);
if (
error.message.includes("js-runtimes") &&
error.message.includes("no such option")
@ -949,19 +950,28 @@ class YtDownloaderApp {
"-j",
"--no-playlist",
"--no-warnings",
proxy ? "--proxy" : "",
proxy,
browserForCookies ? "--cookies-from-browser" : "",
browserForCookies,
this.state.jsRuntimePath
? `--no-js-runtimes --js-runtime ${this.state.jsRuntimePath}`
: "",
configPath ? "--config-location" : "",
configPath ? `"${configPath}"` : "",
`"${url}"`,
].filter(Boolean);
const process = this.state.ytDlp.exec(args, {shell: true});
...(proxy ? ["--proxy", proxy] : []),
...(browserForCookies
? ["--cookies-from-browser", browserForCookies]
: []),
...(this.state.jsRuntimePath
? [
"--no-js-runtimes",
"--js-runtime",
this.state.jsRuntimePath,
]
: []),
...(configPath ? ["--config-location", configPath] : []),
"--",
url,
];
const process = this.state.ytDlp.exec(args, {shell: false});
window.addEventListener("beforeunload", () => {
if (process && !process.killed) {
@ -1023,8 +1033,7 @@ class YtDownloaderApp {
this.state.downloadControllers.set(randomId, controller);
const downloadProcess = this.state.ytDlp.exec(downloadArgs, {
shell: true,
detached: false,
shell: false,
signal: controller.signal,
});
@ -1218,28 +1227,27 @@ class YtDownloaderApp {
}
}
const outputArgs = [
"-P",
`"${this.state.downloadDir}"`,
"-o",
`"${template}"`,
];
const outputArgs = ["-P", this.state.downloadDir, "-o", template];
const baseArgs = [
"--no-playlist",
"--no-mtime",
browserForCookies ? "--cookies-from-browser" : "",
browserForCookies,
proxy ? "--proxy" : "",
proxy,
configPath ? "--config-location" : "",
configPath ? `"${configPath}"` : "",
...(browserForCookies
? ["--cookies-from-browser", browserForCookies]
: []),
...(proxy ? ["--proxy", proxy] : []),
...(configPath ? ["--config-location", configPath] : []),
"--ffmpeg-location",
`"${this.state.ffmpegPath}"`,
this.state.jsRuntimePath
? `--no-js-runtimes --js-runtime ${this.state.jsRuntimePath}`
: "",
].filter(Boolean);
this.state.ffmpegPath,
...(this.state.jsRuntimePath
? ["--no-js-runtimes", "--js-runtime", this.state.jsRuntimePath]
: []),
];
if (type === "audio") {
if (ext === "m4a" || ext === "mp3" || ext === "mp4") {
@ -1289,8 +1297,8 @@ class YtDownloaderApp {
downloadArgs.push(
"--replace-in-metadata",
"title",
`"^.*$"`,
`"${sanitizedTitle}"`,
"^.*$",
sanitizedTitle,
);
// Create a unique temporary file path to capture the exact filename from yt-dlp
@ -1301,10 +1309,10 @@ class YtDownloaderApp {
downloadArgs.push(
"--print-to-file",
"after_move:filepath",
`"${tempFilePath}"`,
tempFilePath,
);
downloadArgs.push(`"${url}"`);
downloadArgs.push(url);
return {downloadArgs, tempFilePath};
}

Write Preview
Loading…
Cancel
Save