Fix playlist issues with AUR package

pull/112/head
Andrew 3 years ago
parent 347c8ff229
commit e9c3f457fc

@ -33,6 +33,7 @@
<content_rating type="oars-1.1"/> <content_rating type="oars-1.1"/>
<releases> <releases>
<release version="3.10.6" date="2023-1-24"/>
<release version="3.10.5" date="2023-1-22"/> <release version="3.10.5" date="2023-1-22"/>
<release version="3.10.4" date="2023-1-19"/> <release version="3.10.4" date="2023-1-19"/>
<release version="3.10.3" date="2023-1-16"/> <release version="3.10.3" date="2023-1-16"/>

@ -9,6 +9,7 @@ const {
clipboard, clipboard,
} = require("electron"); } = require("electron");
const { autoUpdater } = require("electron-updater"); const { autoUpdater } = require("electron-updater");
process.env.ELECTRON_DISABLE_SECURITY_WARNINGS = true
const fs = require("fs"); const fs = require("fs");
const path = require("path"); const path = require("path");

@ -4,7 +4,7 @@
"yt-dlp-wrap-plus": "^2.3.16" "yt-dlp-wrap-plus": "^2.3.16"
}, },
"name": "ytdownloader", "name": "ytdownloader",
"version": "3.10.5", "version": "3.10.6",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {
"start": "electron .", "start": "electron .",

@ -2,6 +2,7 @@ const { clipboard, shell, ipcRenderer } = require("electron");
const { default: YTDlpWrap } = require("yt-dlp-wrap-plus"); const { default: YTDlpWrap } = require("yt-dlp-wrap-plus");
const path = require("path"); const path = require("path");
const os = require("os"); const os = require("os");
const { execSync } = require("child_process");
let url; let url;
const ytDlp = localStorage.getItem("ytdlp"); const ytDlp = localStorage.getItem("ytdlp");
const ytdlp = new YTDlpWrap(ytDlp); const ytdlp = new YTDlpWrap(ytDlp);
@ -10,11 +11,19 @@ const i18n = new (require("../translations/i18n"))();
let cookieArg = ""; let cookieArg = "";
let browser = ""; let browser = "";
let ffmpeg; let ffmpeg;
if (os.platform() === "win32") { try {
ffmpeg = execSync("which ffmpeg", {encoding:"utf8"})
ffmpeg = `"${ffmpeg.trimEnd()}"`
} catch (error) {
if (os.platform() === "win32") {
ffmpeg = `"${__dirname}\\..\\ffmpeg.exe"`; ffmpeg = `"${__dirname}\\..\\ffmpeg.exe"`;
} else { } else {
ffmpeg = `"${__dirname}/../ffmpeg"`; ffmpeg = `"${__dirname}/../ffmpeg"`;
}
} }
console.log("ffmpeg:", ffmpeg)
let foldernameFormat = "%(playlist_title)s"; let foldernameFormat = "%(playlist_title)s";
let filenameFormat = "%(playlist_index)s.%(title)s.%(ext)s"; let filenameFormat = "%(playlist_index)s.%(title)s.%(ext)s";
let playlistIndex = 1; let playlistIndex = 1;

Loading…
Cancel
Save