From 86f58081ff93b292056ed106ed11811bbc8abc9f Mon Sep 17 00:00:00 2001 From: aandrew-me Date: Tue, 1 Nov 2022 22:31:54 +0600 Subject: [PATCH] Fix playlist download errors --- package.json | 2 +- src/playlist.js | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index c124540..23cecaf 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "yt-dlp-wrap-extended": "^2.3.15" }, "name": "ytdownloader", - "version": "3.7.0", + "version": "3.7.1", "main": "main.js", "scripts": { "start": "electron .", diff --git a/src/playlist.js b/src/playlist.js index 65b1ca0..207fb6f 100644 --- a/src/playlist.js +++ b/src/playlist.js @@ -1,6 +1,7 @@ const { clipboard, shell, ipcRenderer } = require("electron"); const { default: YTDlpWrap } = require("yt-dlp-wrap-extended"); const path = require("path"); +const os = require("os") const { platform } = require("os"); let url; const ytDlp = localStorage.getItem("ytdlp"); @@ -9,6 +10,12 @@ const downloadDir = localStorage.getItem("downloadPath"); const i18n = new (require("../translations/i18n"))(); let cookieArg = ""; let browser = ""; +let ffmpeg; +if (os.platform() === "win32") { + ffmpeg = `"${__dirname}\\..\\ffmpeg.exe"`; +} else { + ffmpeg = `"${__dirname}/../ffmpeg"`; +} function getId(id) { return document.getElementById(id); @@ -105,6 +112,8 @@ function download(type) { playlistDirName, "%(playlist_index)s.%(title)s.%(ext)s" )}"`, + "--ffmpeg-location", + ffmpeg, cookieArg, browser,