diff --git a/main.js b/main.js index daa1923..abe30e4 100644 --- a/main.js +++ b/main.js @@ -31,10 +31,10 @@ const gotLock = app.requestSingleInstanceLock(); // Native dependencies check (yt-dlp.exe, ffmpeg.exe, ffprobe.exe, Deno) function checkNativeDependencies() { const deps = [ - { name: "yt-dlp.exe", path: path.join(process.resourcesPath, "yt-dlp.exe") }, - { name: "ffmpeg.exe", path: path.join(process.resourcesPath, "ffmpeg.exe") }, - { name: "ffprobe.exe", path: path.join(process.resourcesPath, "ffprobe.exe") }, - { name: "deno.exe", path: path.join(process.resourcesPath, "deno.exe") }, + { name: "yt-dlp.exe", path: path.join(process.resourcesPath, "binaries","yt-dlp.exe") }, + { name: "ffmpeg.exe", path: path.join(process.resourcesPath, "binaries", "ffmpeg.exe") }, + { name: "ffprobe.exe", path: path.join(process.resourcesPath, "binaries", "ffprobe.exe") }, + { name: "deno.exe", path: path.join(process.resourcesPath, "binaries", "deno.exe") }, ]; const missing = deps.filter(dep => !fs.existsSync(dep.path)); let errorMsg = ""; @@ -193,7 +193,8 @@ app.whenReady().then(async () => { logSessionStart(); logger.info("App Ready, Server Express starting..."); - const serverPath = path.join(__dirname, "server", "server.js"); + const serverPath = path.join(__dirname, "server", "server.js") + const expressServer = require(serverPath); try { diff --git a/package.json b/package.json index d19f5ab..5c430a8 100644 --- a/package.json +++ b/package.json @@ -39,9 +39,7 @@ "files": [ "**/*", "node_modules/**/*", - "!logs/*.json", - "server/**/*", - "server/node_modules/**/*" + "!logs/*.json" ], "directories": { "buildResources": "build" @@ -66,23 +64,19 @@ }, { "from": "ressources/yt-dlp.exe", - "to": "yt-dlp.exe" + "to": "binaries/yt-dlp.exe" }, { "from": "ressources/ffmpeg.exe", - "to": "ffmpeg.exe" + "to": "binaries/ffmpeg.exe" }, { "from": "ressources/ffprobe.exe", - "to": "ffprobe.exe" + "to": "binaries/ffprobe.exe" }, { "from": "ressources/deno.exe", - "to": "deno.exe" - }, - { - "from": "server", - "to": "server" + "to": "binaries/deno.exe" }, { "from": "config/config.json", diff --git a/server/helpers/path.js b/server/helpers/path.js index d045c44..bf35f94 100644 --- a/server/helpers/path.js +++ b/server/helpers/path.js @@ -3,6 +3,8 @@ const fs = require("fs"); const { app } = require("electron"); const config = require("../../config"); +const { logger } = require("../logger.js"); + let userYtDlp; let ffmpegPath; let denoPath; @@ -11,16 +13,21 @@ const sourceYtDlp = path.join(process.resourcesPath, "yt-dlp.exe"); if (config.localMode) { userYtDlp = path.join(__dirname, "../../ressources/yt-dlp.exe"); - ffmpegPath = path.join(__dirname, "../../ressources"); // <- contient ffmpeg.exe et ffprobe.exe + ffmpegPath = path.join(__dirname, "../../ressources/"); // <- contient ffmpeg.exe et ffprobe.exe denoPath = path.join(__dirname, "../../ressources/deno.exe"); } else { - userYtDlp = path.join(app.getPath("userData"), "yt-dlp.exe"); - ffmpegPath = path.join(process.resourcesPath, "ffmpeg.exe"); - denoPath = path.join(process.resourcesPath, "deno.exe"); + userYtDlp = path.join(app.getPath("userData"),"binaries","yt-dlp.exe"); + ffmpegPath = path.join(process.resourcesPath, "binaries","ffmpeg.exe"); + denoPath = path.join(process.resourcesPath, "binaries","deno.exe"); if (!fs.existsSync(userYtDlp)) { fs.copyFileSync(sourceYtDlp, userYtDlp); } + } +if (!userYtDlp){ logger.error("Missing YT-DLP")} +if (!ffmpegPath){ logger.error("Missing FFMPEG")} +if (!denoPath){ logger.error("Missing DENO")} + module.exports = { userYtDlp, ffmpegPath, denoPath };