diff --git a/README-FR.md b/README-FR.md index bc5dcef..30b81b4 100644 --- a/README-FR.md +++ b/README-FR.md @@ -1,14 +1,12 @@ # Freedom Loader -> A besoin de FFMPEG pour fonctionner, si vous avez besoin d'aide pour l'installer. Suivez [Ce lien](https://lecrabeinfo.net/tutoriels/installer-ffmpeg-sur-windows/). - -![Static Badge](https://img.shields.io/badge/Release-1.2-blue?style=flat&logo=Test) +![Static Badge](https://img.shields.io/badge/Release-1.2.2-blue?style=flat&logo=Test) -![Static Badge](https://img.shields.io/badge/Build-1.2.1--beta-yellow?style=flat&logo=Test) +![Static Badge](https://img.shields.io/badge/Build-1.2.3--beta-yellow?style=flat&logo=Test) > Ce projet a pour but de permettre le téléchargement de contenu Vidéo/Audio de manière gratuite, open source et libre. Il permettra à terme de choisir diff --git a/README.md b/README.md index 6e37df0..3e44f7f 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,11 @@ -> Require FFMPEG, Follow the tutorial [here](https://lecrabeinfo.net/tutoriels/installer-ffmpeg-sur-windows/) if you need some help. - -![Static Badge](https://img.shields.io/badge/Release-1.2-blue?style=flat&logo=Test) +![Static Badge](https://img.shields.io/badge/Release-1.2.2-blue?style=flat&logo=Test) -![Static Badge](https://img.shields.io/badge/Build-1.2.1--beta-yellow?style=flat&logo=Test) +![Static Badge](https://img.shields.io/badge/Build-1.2.3--beta-yellow?style=flat&logo=Test) > This project aims to enable free, open-source, and unrestricted downloading of Video/Audio content. Eventually, it will allow users to choose diff --git a/main.js b/main.js index 11f4803..b84315f 100644 --- a/main.js +++ b/main.js @@ -25,7 +25,7 @@ const { logger, logSessionStart, logSessionEnd, logDir } = require("./server/log let mainWindow; // Utilise le vrai dossier de logs défini dans logger.js const logsFolderPath = logDir; - +app.setAppUserModelId("com.masteracnolo.freedomloader"); /* Pour la notif */ /* Fonction principale qui crée la fenêtre principale de l'application. Elle évite la création multiple et configure les dimensions et options de la fenêtre. @@ -40,7 +40,7 @@ async function createWindow() { } mainWindow = new BrowserWindow({ - title: "Freedom Loader", + title: "Freedom Loader 1.2.2", // A Changer à chaque Version width: 750, height: 800, minWidth: 750, diff --git a/package-lock.json b/package-lock.json index f984b90..8ae53f4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "freedom-loader", - "version": "1.2.1", + "version": "1.2.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "freedom-loader", - "version": "1.2.1", + "version": "1.2.2", "dependencies": { "chalk": "^4.1.2", "debug": "^4.4.1", @@ -721,9 +721,9 @@ } }, "node_modules/@electron/packager/node_modules/fs-extra": { - "version": "11.3.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.1.tgz", - "integrity": "sha512-eXvGGwZ5CL17ZSwHWd3bbgk7UUpF6IFHtP57NYYakPvHOs8GDgDe5KJI36jIJzDkJ6eJjuzRA8eBQb6SkKue0g==", + "version": "11.3.2", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.2.tgz", + "integrity": "sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A==", "dev": true, "license": "MIT", "dependencies": { @@ -794,9 +794,9 @@ } }, "node_modules/@electron/universal/node_modules/fs-extra": { - "version": "11.3.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.1.tgz", - "integrity": "sha512-eXvGGwZ5CL17ZSwHWd3bbgk7UUpF6IFHtP57NYYakPvHOs8GDgDe5KJI36jIJzDkJ6eJjuzRA8eBQb6SkKue0g==", + "version": "11.3.2", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.2.tgz", + "integrity": "sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A==", "dev": true, "license": "MIT", "dependencies": { @@ -845,9 +845,9 @@ } }, "node_modules/@electron/windows-sign/node_modules/fs-extra": { - "version": "11.3.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.1.tgz", - "integrity": "sha512-eXvGGwZ5CL17ZSwHWd3bbgk7UUpF6IFHtP57NYYakPvHOs8GDgDe5KJI36jIJzDkJ6eJjuzRA8eBQb6SkKue0g==", + "version": "11.3.2", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.2.tgz", + "integrity": "sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A==", "dev": true, "license": "MIT", "dependencies": { @@ -1479,9 +1479,9 @@ } }, "node_modules/@types/node": { - "version": "22.18.3", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.18.3.tgz", - "integrity": "sha512-gTVM8js2twdtqM+AE2PdGEe9zGQY4UvmFjan9rZcVb6FGdStfjWoWejdmy4CfWVO9rh5MiYQGZloKAGkJt8lMw==", + "version": "22.18.6", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.18.6.tgz", + "integrity": "sha512-r8uszLPpeIWbNKtvWRt/DbVi5zbqZyj1PTmhRMqBMvDnaz1QpmSKujUtJLrqGZeoM8v72MfYggDceY4K1itzWQ==", "dev": true, "license": "MIT", "dependencies": { @@ -1872,9 +1872,9 @@ } }, "node_modules/app-builder-lib/node_modules/@electron/universal/node_modules/fs-extra": { - "version": "11.3.1", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.1.tgz", - "integrity": "sha512-eXvGGwZ5CL17ZSwHWd3bbgk7UUpF6IFHtP57NYYakPvHOs8GDgDe5KJI36jIJzDkJ6eJjuzRA8eBQb6SkKue0g==", + "version": "11.3.2", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.2.tgz", + "integrity": "sha512-Xr9F6z6up6Ws+NjzMCZc6WXg2YFRlrLP9NQDO3VQrWrfiojdhS56TzueT88ze0uBdCTwEIhQ3ptnmKeWGFAe0A==", "dev": true, "license": "MIT", "dependencies": { @@ -2861,9 +2861,9 @@ } }, "node_modules/debug": { - "version": "4.4.1", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz", - "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -2987,9 +2987,9 @@ } }, "node_modules/detect-libc": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.4.tgz", - "integrity": "sha512-3UDv+G9CsCKO1WKMGw9fwq/SWJYbI0c5Y7LU1AXYoDdbhE2AHQ6N6Nb34sG8Fj7T5APy8qXDCKuuIHd1BR0tVA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.0.tgz", + "integrity": "sha512-vEtk+OcP7VBRtQZ1EJ3bdgzSfBjgnEalLTp5zjJrS+2Z1w2KZly4SBdac/WDU3hhsNAZ9E8SC96ME4Ey8MZ7cg==", "dev": true, "license": "Apache-2.0", "engines": { @@ -3146,9 +3146,9 @@ } }, "node_modules/electron": { - "version": "37.5.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-37.5.0.tgz", - "integrity": "sha512-wOLJoa+XLS+KioTygttvadJ9252utQ3APJuVc72BK6QWH9dof8T/Y+On8cba7V/wtlPaPgyxmI8A0VhPngqqlw==", + "version": "37.5.1", + "resolved": "https://registry.npmjs.org/electron/-/electron-37.5.1.tgz", + "integrity": "sha512-RqN3dl6I5yhmynkUc3pUzM6qFCvANau3VGRX9xQEh7FYdwmkqVxKXYM5enrE9LW7j7PzHomQQn6+J2xaF7BHsQ==", "dev": true, "hasInstallScript": true, "license": "MIT", @@ -3759,9 +3759,9 @@ "license": "MIT" }, "node_modules/error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz", + "integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==", "dev": true, "license": "MIT", "dependencies": { @@ -7468,18 +7468,18 @@ } }, "node_modules/simple-swizzle": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz", - "integrity": "sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg==", + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.4.tgz", + "integrity": "sha512-nAu1WFPQSMNr2Zn9PGSZK9AGn4t/y97lEm+MXTtUDwfP0ksAIX4nO+6ruD9Jwut4C49SB1Ws+fbXsm/yScWOHw==", "license": "MIT", "dependencies": { "is-arrayish": "^0.3.1" } }, "node_modules/simple-swizzle/node_modules/is-arrayish": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz", - "integrity": "sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==", + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.4.tgz", + "integrity": "sha512-m6UrgzFVUYawGBh1dUsWR5M2Clqic9RVXC/9f8ceNlv2IcO9j9J/z8UoCLPqtsPBFNzEpfR3xftohbfqDx8EQA==", "license": "MIT" }, "node_modules/simple-update-notifier": { diff --git a/package.json b/package.json index d6da046..f69efe0 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "freedom-loader", "productName": "Freedom Loader", - "version": "1.2.1", + "version": "1.2.2", "author": "MasterAcnolo", "description": "Freedom Loader", "main": "main.js", @@ -43,11 +43,19 @@ "directories": { "buildResources": "build" }, - "asar": false, + "asar": true, "extraResources": [ { "from": "build/confirm-icon.png", "to": "confirm-icon.png" + }, + { + "from": "ressources/yt-dlp 2025.08.27.exe", + "to": "yt-dlp 2025.08.27.exe" + }, + { + "from": "ressources/ffmpeg.exe", + "to": "ffmpeg.exe" } ], "win": { diff --git a/public/index.html b/public/index.html index d317159..ab90727 100644 --- a/public/index.html +++ b/public/index.html @@ -9,7 +9,7 @@ font-src https://fonts.gstatic.com; img-src 'self' data: https://i.ytimg.com; "> - Freedom Loader + diff --git a/server/routes/download.js b/server/routes/download.js index 16d3006..21e818b 100644 --- a/server/routes/download.js +++ b/server/routes/download.js @@ -22,8 +22,8 @@ const { Notification } = require("electron"); const logger = require("../logger").logger; // Path vers le fichier exécutable yt-dlp (outil tiers pour le téléchargement) -// const ytDlpPath = path.join(__dirname, '../../yt-dlp.exe'); -const ytDlpPath = path.join(__dirname, '../../ressources/yt-dlp 2025.08.27.exe'); +// const ytDlpPath = path.join(process.resourcesPath, '../../yt-dlp.exe'); +const ytDlpPath = path.join(process.resourcesPath, 'yt-dlp 2025.08.27.exe'); router.post("/", (req, res) => { try { @@ -85,7 +85,7 @@ router.post("/", (req, res) => { "--concurrent-fragments", "8",// accélère le téléchargement "--retries", "10", // réessaie jusqu'à 10 fois en cas d'erreur "--fragment-retries", "10" , // réessaie aussi 10 fois chaque fragment - "--ffmpeg-location", path.join(__dirname, "../../ressources/ffmpeg.exe") + "--ffmpeg-location", path.join(process.resourcesPath, "ffmpeg.exe") ]; // Si l'option audioOnly est activée, on ajoute les flags pour extraction audio en mp3