mirror of
https://github.com/MasterAcnolo/Freedom-Loader.git
synced 2026-09-28 12:31:14 +02:00
Compare commits
26 Commits
testing
...
7ab23d495c
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7ab23d495c | ||
|
|
331890f743 | ||
|
|
e398f6866a | ||
|
|
5f28aa502a | ||
|
|
4a10ef2614 | ||
|
|
1296199f65 | ||
|
|
764b566699 | ||
|
|
0c568c1e8d | ||
|
|
dae4dd852f | ||
|
|
e5c5542750 | ||
|
|
9b2c6c9552 | ||
|
|
871ebe2498 | ||
|
|
730069a3c6 | ||
|
|
7a0cbd7456 | ||
|
|
5d676b45e7 | ||
|
|
a7f3d84a7d | ||
|
|
fbce5e5b7b | ||
|
|
cc7cc38392 | ||
|
|
6a9e5a063b | ||
|
|
cf8c95711c | ||
|
|
3683e4245f | ||
|
|
01affd8ddf | ||
|
|
faba3f516b | ||
|
|
c1d9448a2b | ||
|
|
1bff8376b4 | ||
|
|
3f44c01bd7 |
63
README.md
63
README.md
@@ -61,9 +61,9 @@ The primary goal is to make media downloading accessible to users who want offli
|
|||||||
### User Interface
|
### User Interface
|
||||||
|
|
||||||
- **Custom window controls** - Frameless window with custom top bar (optional)
|
- **Custom window controls** - Frameless window with custom top bar (optional)
|
||||||
- **Custom themes** — ZIP-based theme system with live preview
|
- **Custom themes** - ZIP-based theme system with live preview
|
||||||
- **Theme Workshop** — web-based theme creator and browser
|
- **Theme Workshop** - web-based theme creator and browser
|
||||||
- **Toast notifications** — in-app feedback system
|
- **Toast notifications** - in-app feedback system
|
||||||
- **Real-time progress tracking** - Live download progress bar with network speed indicator
|
- **Real-time progress tracking** - Live download progress bar with network speed indicator
|
||||||
- **Server-Sent Events (SSE)** - Non-blocking progress updates via event streaming
|
- **Server-Sent Events (SSE)** - Non-blocking progress updates via event streaming
|
||||||
- **Settings panel** - In-app configuration interface with live updates
|
- **Settings panel** - In-app configuration interface with live updates
|
||||||
@@ -80,9 +80,10 @@ The primary goal is to make media downloading accessible to users who want offli
|
|||||||
- **Rate limiting** - Express-based request throttling to prevent server overload
|
- **Rate limiting** - Express-based request throttling to prevent server overload
|
||||||
- **Graceful shutdown** - Proper cleanup of servers, logs, and RPC connections
|
- **Graceful shutdown** - Proper cleanup of servers, logs, and RPC connections
|
||||||
- **System notifications** - Windows notifications on download completion (clickable to open folder)
|
- **System notifications** - Windows notifications on download completion (clickable to open folder)
|
||||||
- **Splash screen** — animated loading screen on startup
|
- **Splash screen** - animated loading screen on startup
|
||||||
- **Stop download** — ability to cancel in-progress downloads
|
- **Stop download** - ability to cancel in-progress downloads
|
||||||
- **Playlist folders** — dedicated folder creation per playlist
|
- **Playlist folders** - dedicated folder creation per playlist
|
||||||
|
- **Keep Playlist Order** - Add an Index before the title, could be useful for an album for example.
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
@@ -105,7 +106,7 @@ The primary goal is to make media downloading accessible to users who want offli
|
|||||||
|
|
||||||
### Linux
|
### Linux
|
||||||
|
|
||||||
#### Fedora (via Copr — recommended)
|
#### Fedora (via Copr - recommended)
|
||||||
|
|
||||||
Installing via Copr lets `dnf` handle future updates automatically:
|
Installing via Copr lets `dnf` handle future updates automatically:
|
||||||
|
|
||||||
@@ -178,7 +179,8 @@ The application supports various configuration options:
|
|||||||
- Custom download directory selection
|
- Custom download directory selection
|
||||||
- Discord Rich Presence activation
|
- Discord Rich Presence activation
|
||||||
- Theme customization
|
- Theme customization
|
||||||
- Log level configuration
|
- Log level
|
||||||
|
- And somes to see in the list [Configuration Options](#configuration-options) available
|
||||||
|
|
||||||
### Troubleshooting
|
### Troubleshooting
|
||||||
|
|
||||||
@@ -219,13 +221,14 @@ Freedom Loader can be configured either through the settings panel in the UI or
|
|||||||
|
|
||||||
#### Linux
|
#### Linux
|
||||||
```
|
```
|
||||||
~/.config/Freedom Loader/config.json
|
~/.config/Freedom\ Loader/config.json
|
||||||
```
|
```
|
||||||
|
|
||||||
### Available Options
|
### Available Options
|
||||||
```json
|
```json
|
||||||
{
|
{
|
||||||
"autoUpdate": true,
|
"autoUpdate": true,
|
||||||
|
"systemTray": true,
|
||||||
"discordRPC": true,
|
"discordRPC": true,
|
||||||
"customTopBar": true,
|
"customTopBar": true,
|
||||||
"autoCheckInfo": true,
|
"autoCheckInfo": true,
|
||||||
@@ -233,6 +236,7 @@ Freedom Loader can be configured either through the settings panel in the UI or
|
|||||||
"addMetadata": true,
|
"addMetadata": true,
|
||||||
"verboseLogs": false,
|
"verboseLogs": false,
|
||||||
"autoDownloadPlaylist": true,
|
"autoDownloadPlaylist": true,
|
||||||
|
"keepPlaylistOrder": false,
|
||||||
"createPlaylistFolders": true,
|
"createPlaylistFolders": true,
|
||||||
"customCodec": "h264",
|
"customCodec": "h264",
|
||||||
"logSystem": true,
|
"logSystem": true,
|
||||||
@@ -249,6 +253,7 @@ Freedom Loader can be configured either through the settings panel in the UI or
|
|||||||
| Option | Type | Default | Description |
|
| Option | Type | Default | Description |
|
||||||
|------------------------------|---------|----------|------------------------------------------------------------|
|
|------------------------------|---------|----------|------------------------------------------------------------|
|
||||||
| `autoUpdate` | boolean | `true` | Enable automatic application updates |
|
| `autoUpdate` | boolean | `true` | Enable automatic application updates |
|
||||||
|
| `systemTray` | boolean | `true` | Allow app to minimize on close |
|
||||||
| `discordRPC` | boolean | `true` | Enable Discord Rich Presence integration |
|
| `discordRPC` | boolean | `true` | Enable Discord Rich Presence integration |
|
||||||
| `customTopBar` | boolean | `true` | Use custom application top bar |
|
| `customTopBar` | boolean | `true` | Use custom application top bar |
|
||||||
| `autoCheckInfo` | boolean | `true` | Automatically fetch video information on URL paste |
|
| `autoCheckInfo` | boolean | `true` | Automatically fetch video information on URL paste |
|
||||||
@@ -256,6 +261,7 @@ Freedom Loader can be configured either through the settings panel in the UI or
|
|||||||
| `addMetadata` | boolean | `true` | Add metadata tags to downloaded files |
|
| `addMetadata` | boolean | `true` | Add metadata tags to downloaded files |
|
||||||
| `verboseLogs` | boolean | `false` | Enable detailed logging for debugging |
|
| `verboseLogs` | boolean | `false` | Enable detailed logging for debugging |
|
||||||
| `autoDownloadPlaylist` | boolean | `true` | Automatically download entire playlists |
|
| `autoDownloadPlaylist` | boolean | `true` | Automatically download entire playlists |
|
||||||
|
| `keepPlaylistOrder` | boolean | `false` | Add index before title, usefull for album |
|
||||||
| `createPlaylistFolders` | boolean | `true` | Automatically create a folder for a playlist |
|
| `createPlaylistFolders` | boolean | `true` | Automatically create a folder for a playlist |
|
||||||
| `customCodec` | string | `"h264"` | Video codec for encoding (supported: h264, h265, vp9, av1) |
|
| `customCodec` | string | `"h264"` | Video codec for encoding (supported: h264, h265, vp9, av1) |
|
||||||
| `logSystem` | boolean | `true` | Enable application logging |
|
| `logSystem` | boolean | `true` | Enable application logging |
|
||||||
@@ -276,7 +282,7 @@ Freedom Loader can be configured either through the settings panel in the UI or
|
|||||||
- `theora` - Theora (legacy open codec)
|
- `theora` - Theora (legacy open codec)
|
||||||
|
|
||||||
> [!NOTE]
|
> [!NOTE]
|
||||||
> Configuration changes may require an application restart to take effect.
|
> Some configuration changes may require an application restart to take effect.
|
||||||
|
|
||||||
## Project Structure
|
## Project Structure
|
||||||
|
|
||||||
@@ -290,15 +296,21 @@ Freedom-Loader/
|
|||||||
│ ├── pathValidator.js
|
│ ├── pathValidator.js
|
||||||
│ ├── splashManager.js
|
│ ├── splashManager.js
|
||||||
│ ├── themeManager.js
|
│ ├── themeManager.js
|
||||||
|
│ ├── tray.js
|
||||||
│ ├── windowManager.js
|
│ ├── windowManager.js
|
||||||
│ └── ytDlpUpdater.js
|
│ └── ytDlpUpdater.js
|
||||||
├── build/ # Build resources and assets
|
├── build/ # Build resources and assets
|
||||||
|
│ ├── app-icon.ico
|
||||||
|
│ ├── app-icon.png
|
||||||
|
│ ├── banner.png
|
||||||
|
│ └── ...
|
||||||
├── config/ # Configuration files
|
├── config/ # Configuration files
|
||||||
│ ├── config.default.json
|
│ ├── config.default.json
|
||||||
│ └── config.dev.json
|
│ └── config.dev.json # Configuration Used when i dev mode
|
||||||
|
├── dist/ # Compiled executables (.exe, .AppImage, .deb, .rpm, .snap)
|
||||||
├── public/ # Frontend assets and UI
|
├── public/ # Frontend assets and UI
|
||||||
│ ├── index.html
|
│ ├── index.html
|
||||||
│ ├── splash.html
|
│ ├── splash.html # Splash Screen (Start of the application)
|
||||||
│ ├── assets/
|
│ ├── assets/
|
||||||
│ │ ├── icon/ # Application icons
|
│ │ ├── icon/ # Application icons
|
||||||
│ │ └── logo/ # Logo assets
|
│ │ └── logo/ # Logo assets
|
||||||
@@ -317,19 +329,8 @@ Freedom-Loader/
|
|||||||
│ ├── styles.css
|
│ ├── styles.css
|
||||||
│ ├── variables.css
|
│ ├── variables.css
|
||||||
│ ├── components/ # Component-specific styles
|
│ ├── components/ # Component-specific styles
|
||||||
│ │ ├── checkbox.css
|
|
||||||
│ │ ├── editpathbutton.css
|
|
||||||
│ │ ├── loader.css
|
|
||||||
│ │ ├── progressBar.css
|
|
||||||
│ │ └── toast.css
|
|
||||||
│ └── layout/ # Layout styles
|
│ └── layout/ # Layout styles
|
||||||
│ ├── container.css
|
├── resources/ # Internal resources (binaries : yt-dlp, ffmpeg...)
|
||||||
│ ├── form.css
|
|
||||||
│ ├── header.css
|
|
||||||
│ ├── settingsPanel.css
|
|
||||||
│ ├── topbar.css
|
|
||||||
│ └── videoinfo.css
|
|
||||||
├── resources/ # Internal resources (binaries)
|
|
||||||
├── server/ # Express backend server
|
├── server/ # Express backend server
|
||||||
│ ├── logger.js
|
│ ├── logger.js
|
||||||
│ ├── server.js
|
│ ├── server.js
|
||||||
@@ -353,16 +354,16 @@ Freedom-Loader/
|
|||||||
├── theme/ # Theme system
|
├── theme/ # Theme system
|
||||||
│ ├── template.theme.json # Theme template
|
│ ├── template.theme.json # Theme template
|
||||||
│ ├── Dark/ # Default dark theme
|
│ ├── Dark/ # Default dark theme
|
||||||
│ │ └── dark.theme.json
|
|
||||||
│ └── Light/ # Default light theme
|
│ └── Light/ # Default light theme
|
||||||
│ └── light.theme.json
|
├── BINARIES.md # External dependencies & binaries documentation
|
||||||
├── main.js # Electron main process entry point
|
|
||||||
├── preload.js # Electron preload script (IPC bridge)
|
|
||||||
├── config.js # Global configuration loader
|
|
||||||
├── package.json # Project metadata and dependencies
|
|
||||||
├── CODE_OF_CONDUCT.md # Community guidelines
|
├── CODE_OF_CONDUCT.md # Community guidelines
|
||||||
|
├── config.js # Global configuration loader
|
||||||
├── CONTRIBUTING.md # Contribution guidelines
|
├── CONTRIBUTING.md # Contribution guidelines
|
||||||
|
├── jest.config.js # Unit testing configuration
|
||||||
├── LICENSE # GPLv3 license
|
├── LICENSE # GPLv3 license
|
||||||
|
├── main.js # Electron main process entry point
|
||||||
|
├── package.json # Project metadata and dependencies
|
||||||
|
├── preload.js # Electron preload script (IPC bridge)
|
||||||
└── README.md # This file
|
└── README.md # This file
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -389,7 +390,7 @@ Freedom Loader includes a web-based theme creator available at [Freedom Loader W
|
|||||||
### Installing a custom theme
|
### Installing a custom theme
|
||||||
1. Download a `.zip` theme file
|
1. Download a `.zip` theme file
|
||||||
2. Drop it in the `theme/` folder of your Freedom Loader installation
|
2. Drop it in the `theme/` folder of your Freedom Loader installation
|
||||||
3. Restart the app — your theme appears in the settings panel
|
3. Restart the app - your theme appears in the settings panel
|
||||||
|
|
||||||
## Technology Stack
|
## Technology Stack
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
const config = require('../config');
|
const config = require('../config');
|
||||||
const RPC = require("discord-rpc");
|
const RPC = require("discord-rpc");
|
||||||
const { logger } = require("../server/logger");
|
const { logger } = require("../server/logger");
|
||||||
|
const fs = require("fs");
|
||||||
|
const path = require("path");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Discord Application Client ID used to authenticate the RPC connection.
|
* Discord Application Client ID used to authenticate the RPC connection.
|
||||||
@@ -20,6 +22,51 @@ const rpc = new RPC.Client({ transport: "ipc" });
|
|||||||
*/
|
*/
|
||||||
let intervalId;
|
let intervalId;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Automagically fixes Discord RPC on Linux for Sandboxed versions (Flatpak & Snap).
|
||||||
|
* It creates a symlink from the sandbox IPC socket to the standard system location.
|
||||||
|
*
|
||||||
|
* @returns {void}
|
||||||
|
*/
|
||||||
|
function fixLinuxDiscordRPC() {
|
||||||
|
// Only execute on Linux
|
||||||
|
if (process.platform !== "linux") return;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the user's runtime directory (e.g., /run/user/1000).
|
||||||
|
* @type {string}
|
||||||
|
*/
|
||||||
|
const xdgDir = process.env.XDG_RUNTIME_DIR || `/run/user/${process.getuid()}`;
|
||||||
|
const standardSocket = path.join(xdgDir, "discord-ipc-0");
|
||||||
|
|
||||||
|
// If the standard socket already exists (Native Discord), do nothing.
|
||||||
|
if (fs.existsSync(standardSocket)) return;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Paths for known sandboxed Discord IPC sockets.
|
||||||
|
*/
|
||||||
|
const flatpakSocket = path.join(xdgDir, "app/com.discordapp.Discord/discord-ipc-0");
|
||||||
|
const snapSocket = path.join(xdgDir, "snap.discord/discord-ipc-0");
|
||||||
|
|
||||||
|
let targetSocket = null;
|
||||||
|
|
||||||
|
if (fs.existsSync(flatpakSocket)) {
|
||||||
|
targetSocket = flatpakSocket;
|
||||||
|
} else if (fs.existsSync(snapSocket)) {
|
||||||
|
targetSocket = snapSocket;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If a sandboxed socket is found, create the symlink stealthily.
|
||||||
|
if (targetSocket) {
|
||||||
|
try {
|
||||||
|
fs.symlinkSync(targetSocket, standardSocket);
|
||||||
|
logger.info(`Discord RPC bridge created automatically targeting: ${targetSocket}`);
|
||||||
|
} catch (err) {
|
||||||
|
logger.warn(`Failed to create Discord RPC bridge: ${err.message}`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Initializes Discord Rich Presence (RPC) connection.
|
* Initializes Discord Rich Presence (RPC) connection.
|
||||||
*
|
*
|
||||||
@@ -32,6 +79,11 @@ let intervalId;
|
|||||||
*/
|
*/
|
||||||
function startRPC() {
|
function startRPC() {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Patch that create Simlinks for Linux environment;
|
||||||
|
*/
|
||||||
|
fixLinuxDiscordRPC();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Rich Presence payload describing current application state
|
* Rich Presence payload describing current application state
|
||||||
* shown in Discord user profile.
|
* shown in Discord user profile.
|
||||||
@@ -60,28 +112,30 @@ function startRPC() {
|
|||||||
*
|
*
|
||||||
* Responsibilities:
|
* Responsibilities:
|
||||||
* - Clear any running intervals
|
* - Clear any running intervals
|
||||||
* - Remove current activity from Discord
|
* - Remove current activity from Discord if connected
|
||||||
* - Destroy RPC transport connection
|
* - Destroy RPC transport connection
|
||||||
* - Handle cleanup errors safely
|
* - Handle cleanup errors safely
|
||||||
*/
|
*/
|
||||||
async function stopRPC(){
|
async function stopRPC() {
|
||||||
|
if (rpc) {
|
||||||
try {
|
try {
|
||||||
if (intervalId) clearInterval(intervalId);
|
if (intervalId) clearInterval(intervalId);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Ensures RPC connection exists before attempting cleanup.
|
* Ensures RPC connection AND the underlying socket exist
|
||||||
|
* before attempting to clear activity to prevent crash.
|
||||||
*/
|
*/
|
||||||
if (rpc && rpc.transport) {
|
if (rpc.transport && rpc.transport.socket) {
|
||||||
await rpc.clearActivity()
|
await rpc.clearActivity();
|
||||||
await rpc.destroy();
|
|
||||||
} else{
|
|
||||||
logger.error("Not Able to close RPC")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
await rpc.destroy();
|
||||||
|
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
logger.error("Error while closing the RPC:", err);
|
logger.error("Error while closing the RPC:", err);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
module.exports = { startRPC, stopRPC};
|
module.exports = { startRPC, stopRPC};
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ const { userThemesPath } = require("../server/helpers/path.helpers");
|
|||||||
*/
|
*/
|
||||||
const FEATURE_WHITELIST = new Set([
|
const FEATURE_WHITELIST = new Set([
|
||||||
"autoUpdate",
|
"autoUpdate",
|
||||||
|
"systemTray",
|
||||||
"discordRPC",
|
"discordRPC",
|
||||||
"customTopBar",
|
"customTopBar",
|
||||||
"autoCheckInfo",
|
"autoCheckInfo",
|
||||||
@@ -34,6 +35,7 @@ const FEATURE_WHITELIST = new Set([
|
|||||||
"addMetadata",
|
"addMetadata",
|
||||||
"verboseLogs",
|
"verboseLogs",
|
||||||
"autoDownloadPlaylist",
|
"autoDownloadPlaylist",
|
||||||
|
"keepPlaylistOrder",
|
||||||
"customCodec",
|
"customCodec",
|
||||||
"theme",
|
"theme",
|
||||||
"createPlaylistFolders",
|
"createPlaylistFolders",
|
||||||
|
|||||||
108
app/tray.js
Normal file
108
app/tray.js
Normal file
@@ -0,0 +1,108 @@
|
|||||||
|
const {app, Menu, Tray, nativeImage} = require("electron");
|
||||||
|
const path = require("path");
|
||||||
|
const {logger} = require("../server/logger"); // Ajuste le chemin si besoin
|
||||||
|
const fs = require("fs");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Global reference to the Tray instance to prevent garbage collection.
|
||||||
|
* @type {Tray | null}
|
||||||
|
*/
|
||||||
|
let tray = null;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Creates and configures the cross-platform System Tray.
|
||||||
|
*
|
||||||
|
* Responsibilities:
|
||||||
|
* - Loads the appropriate icon format based on the operating system.
|
||||||
|
* - Builds the right-click context menu.
|
||||||
|
* - Handles left-click behavior to toggle main window visibility.
|
||||||
|
*
|
||||||
|
* @param {import('electron').BrowserWindow} mainWindow - The main application window.
|
||||||
|
* @param {boolean} devMode - Indicates whether the application is running in development mode.
|
||||||
|
* @returns {Tray} The created Tray instance.
|
||||||
|
*/
|
||||||
|
function createSystemTray(mainWindow, devMode) {
|
||||||
|
// Prevent creating multiple tray instances
|
||||||
|
if (tray) return tray;
|
||||||
|
|
||||||
|
const isWin = process.platform === "win32";
|
||||||
|
const iconName = isWin ? "app-icon.ico" : "app-icon-64x64.png";
|
||||||
|
|
||||||
|
// Attempt to load the icon from the local build directory first
|
||||||
|
let iconPath = path.join(__dirname, "..", "build", iconName);
|
||||||
|
|
||||||
|
// Fallback to the extracted resources path if running in production
|
||||||
|
if (!devMode && !fs.existsSync(iconPath)) {
|
||||||
|
iconPath = path.join(process.resourcesPath, iconName);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!fs.existsSync(iconPath)) {
|
||||||
|
logger.error(`System Tray icon not found at resolved path: ${iconPath}`);
|
||||||
|
} else {
|
||||||
|
logger.info("System Tray icon resolved successfully.");
|
||||||
|
}
|
||||||
|
|
||||||
|
const icon = nativeImage.createFromPath(iconPath);
|
||||||
|
|
||||||
|
if (icon.isEmpty()) {
|
||||||
|
logger.error("System Tray icon file was found but could not be decoded by Electron (image is empty).");
|
||||||
|
}
|
||||||
|
|
||||||
|
tray = new Tray(icon);
|
||||||
|
tray.setToolTip("Freedom Loader");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* System Tray Context Menu (Right-click action).
|
||||||
|
*/
|
||||||
|
const contextMenu = Menu.buildFromTemplate([
|
||||||
|
{
|
||||||
|
label: "Show Freedom Loader",
|
||||||
|
click: () => {
|
||||||
|
mainWindow.show();
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{ type: "separator" },
|
||||||
|
{
|
||||||
|
label: "Quit",
|
||||||
|
click: () => {
|
||||||
|
/**
|
||||||
|
* Flags the application for a deliberate exit,
|
||||||
|
* bypassing the default "minimize to tray" behavior.
|
||||||
|
*/
|
||||||
|
app.isQuitting = true;
|
||||||
|
app.quit();
|
||||||
|
},
|
||||||
|
},
|
||||||
|
]);
|
||||||
|
|
||||||
|
tray.setContextMenu(contextMenu);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Left-click behavior: Toggles main window visibility.
|
||||||
|
* but it remains standard practice for Windows and Linux environments.
|
||||||
|
*/
|
||||||
|
tray.on("click", () => {
|
||||||
|
if (mainWindow.isVisible()) {
|
||||||
|
mainWindow.hide();
|
||||||
|
} else {
|
||||||
|
mainWindow.show();
|
||||||
|
mainWindow.focus();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
return tray;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Safely destroys the tray icon to prevent OS-level crashes (especially on Linux/Wayland).
|
||||||
|
* Should be called right before the application quits.
|
||||||
|
*/
|
||||||
|
function destroyTray() {
|
||||||
|
if (tray && !tray.isDestroyed()) {
|
||||||
|
tray.destroy();
|
||||||
|
tray = null;
|
||||||
|
logger.info("System Tray destroyed cleanly.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
module.exports = {createSystemTray, destroyTray};
|
||||||
@@ -81,6 +81,19 @@ async function createMainWindow() {
|
|||||||
throw err;
|
throw err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Intercepts the window close event.
|
||||||
|
* If the app is not explicitly quitting (via Tray menu),
|
||||||
|
* cancels the destruction and hides the window instead.
|
||||||
|
*/
|
||||||
|
mainWindow.on('close', (event) => {
|
||||||
|
if (!app.isQuitting) {
|
||||||
|
event.preventDefault();
|
||||||
|
mainWindow.hide();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Cleans up window reference when the main window is closed.
|
* Cleans up window reference when the main window is closed.
|
||||||
* Prevents memory leaks and allows recreation if needed.
|
* Prevents memory leaks and allows recreation if needed.
|
||||||
|
|||||||
BIN
build/app-icon-64x64.png
Normal file
BIN
build/app-icon-64x64.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.0 KiB |
24
config.js
24
config.js
@@ -68,13 +68,30 @@ function loadFeatures() {
|
|||||||
return JSON.parse(raw);
|
return JSON.parse(raw);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reloads feature flags from disk.
|
||||||
|
* Use this instead of the cached configFeatures snapshot
|
||||||
|
* when you need the latest user settings at call time.
|
||||||
|
*
|
||||||
|
* @returns {Object} Fresh feature flags from config file
|
||||||
|
*/
|
||||||
|
function reloadFeatures() {
|
||||||
|
try {
|
||||||
|
const raw = fs.readFileSync(featuresPath, "utf-8");
|
||||||
|
return JSON.parse(raw);
|
||||||
|
} catch (err) {
|
||||||
|
// Fallback to cached snapshot if file read fails
|
||||||
|
return configFeatures;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* In-memory snapshot of application feature flags.
|
* In-memory snapshot of application feature flags.
|
||||||
*
|
*
|
||||||
* Note: Changes to the config file are not automatically reflected.
|
* Note: Changes to the config file are not automatically reflected.
|
||||||
* A restart or reload is required.
|
* A restart or reload is required.
|
||||||
*/
|
*/
|
||||||
const configFeatures = loadFeatures();
|
let configFeatures = loadFeatures();
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
/**
|
/**
|
||||||
@@ -102,6 +119,11 @@ module.exports = {
|
|||||||
*/
|
*/
|
||||||
configFeatures,
|
configFeatures,
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function to reload the config
|
||||||
|
*/
|
||||||
|
reloadFeatures,
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Path to the active configuration file
|
* Path to the active configuration file
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
{
|
{
|
||||||
"autoUpdate": true,
|
"autoUpdate": true,
|
||||||
|
"systemTray": true,
|
||||||
"discordRPC": true,
|
"discordRPC": true,
|
||||||
"customTopBar": true,
|
"customTopBar": true,
|
||||||
"autoCheckInfo": true,
|
"autoCheckInfo": true,
|
||||||
@@ -7,6 +8,7 @@
|
|||||||
"addMetadata": true,
|
"addMetadata": true,
|
||||||
"verboseLogs": false,
|
"verboseLogs": false,
|
||||||
"autoDownloadPlaylist": true,
|
"autoDownloadPlaylist": true,
|
||||||
|
"keepPlaylistOrder": false,
|
||||||
"createPlaylistFolders": true,
|
"createPlaylistFolders": true,
|
||||||
"customCodec": "h264",
|
"customCodec": "h264",
|
||||||
"logSystem": true,
|
"logSystem": true,
|
||||||
|
|||||||
17
main.js
17
main.js
@@ -80,7 +80,9 @@ const { createMainWindow, getMainWindow } = require("./app/windowManager");
|
|||||||
const { registerIpcHandlers } = require("./app/ipcHandlers");
|
const { registerIpcHandlers } = require("./app/ipcHandlers");
|
||||||
const { createSplashWindow, closeSplashWindow, setSplashProgress } = require("./app/splashManager");
|
const { createSplashWindow, closeSplashWindow, setSplashProgress } = require("./app/splashManager");
|
||||||
const { userThemesPath, initUserThemes, isWindows, validateBinaries, defaultDownloadFolder } = require("./server/helpers/path.helpers");
|
const { userThemesPath, initUserThemes, isWindows, validateBinaries, defaultDownloadFolder } = require("./server/helpers/path.helpers");
|
||||||
|
const {createSystemTray, destroyTray} = require("./app/tray");
|
||||||
|
|
||||||
|
app.isQuitting = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* If another instance want to run
|
* If another instance want to run
|
||||||
@@ -127,6 +129,11 @@ app.whenReady().then(async () => {
|
|||||||
|
|
||||||
closeSplashWindow();
|
closeSplashWindow();
|
||||||
getMainWindow().show();
|
getMainWindow().show();
|
||||||
|
|
||||||
|
if (configFeatures.systemTray) {
|
||||||
|
createSystemTray(getMainWindow(), config.devMode);
|
||||||
|
}
|
||||||
|
|
||||||
if (configFeatures.discordRPC) startRPC();
|
if (configFeatures.discordRPC) startRPC();
|
||||||
|
|
||||||
if (configFeatures.autoUpdate) initAutoUpdater(getMainWindow());
|
if (configFeatures.autoUpdate) initAutoUpdater(getMainWindow());
|
||||||
@@ -138,11 +145,17 @@ app.whenReady().then(async () => {
|
|||||||
});
|
});
|
||||||
|
|
||||||
app.on("window-all-closed", () => {
|
app.on("window-all-closed", () => {
|
||||||
logger.info("Shutting down...");
|
if (app.isQuitting) {
|
||||||
app.quit();
|
logger.info("Shutting down...");
|
||||||
|
app.quit();
|
||||||
|
} else if (process.platform !== "darwin") {
|
||||||
|
logger.info("Main window closed, app running in background (Tray).");
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
app.on("before-quit", async () => {
|
app.on("before-quit", async () => {
|
||||||
|
app.isQuitting = true;
|
||||||
|
destroyTray();
|
||||||
await stopRPC();
|
await stopRPC();
|
||||||
logger.info("All services stopped. Have a nice day!");
|
logger.info("All services stopped. Have a nice day!");
|
||||||
logSessionEnd();
|
logSessionEnd();
|
||||||
|
|||||||
1730
package-lock.json
generated
1730
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
27
package.json
27
package.json
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "freedom-loader",
|
"name": "freedom-loader",
|
||||||
"productName": "Freedom Loader",
|
"productName": "Freedom Loader",
|
||||||
"version": "1.6.0",
|
"version": "1.6.2-preview",
|
||||||
"author": "MasterAcnolo <MasterAcnolo@users.noreply.github.com>",
|
"author": "MasterAcnolo <MasterAcnolo@users.noreply.github.com>",
|
||||||
"description": "Free and open-source GUI for yt-dlp — download video and audio from hundreds of platforms",
|
"description": "Free and open-source GUI for yt-dlp — download video and audio from hundreds of platforms",
|
||||||
"homepage": "https://masteracnolo.github.io/Freedom-Loader-Site/",
|
"homepage": "https://masteracnolo.github.io/Freedom-Loader-Site/",
|
||||||
@@ -15,16 +15,24 @@
|
|||||||
},
|
},
|
||||||
"main": "main.js",
|
"main": "main.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"start": "electron --trace-warnings .",
|
"start": "electron --no-warnings .",
|
||||||
|
"start:warn": "electron --trace-warnings .",
|
||||||
|
"start:debug": "WAYLAND_DEBUG=1 ELECTRON_ENABLE_LOGGING=1 ELECTRON_ENABLE_STACK_DUMPING=1 electron --enable-logging --v=1 .",
|
||||||
|
"dev": "nodemon --watch server --watch app --watch main.js --watch config.js --ext js,json --exec \"electron --no-warnings .\"",
|
||||||
|
"dev:warn": "nodemon --watch server --watch app --watch main.js --watch config.js --ext js,json --exec \"electron --trace-warnings .\"",
|
||||||
|
"dev:debug": "nodemon --watch server --watch app --watch main.js --watch config.js --ext js,json --exec \"WAYLAND_DEBUG=1 ELECTRON_ENABLE_LOGGING=1 ELECTRON_ENABLE_STACK_DUMPING=1 electron --enable-logging --v=1 .\"",
|
||||||
|
|
||||||
"build": "electron-builder",
|
"build": "electron-builder",
|
||||||
"build:win": "electron-builder --win",
|
"build:win": "electron-builder --win",
|
||||||
"build:linux": "electron-builder --linux",
|
"build:linux": "electron-builder --linux",
|
||||||
"build:rpm": "bash scripts/create-copr-package.sh",
|
"build:rpm": "bash scripts/create-copr-package.sh",
|
||||||
"build:all": "electron-builder -wl",
|
"build:all": "electron-builder -wl",
|
||||||
|
"release": "bash scripts/release.sh",
|
||||||
|
"release:publish": "bash scripts/release.sh --publish",
|
||||||
|
"release:dry-run": "bash scripts/release.sh --dry-run",
|
||||||
|
|
||||||
"test": "jest",
|
"test": "jest",
|
||||||
"test:unit": "jest tests/unit",
|
"test:unit": "jest test/unit",
|
||||||
|
|
||||||
"update": "npm update"
|
"update": "npm update"
|
||||||
},
|
},
|
||||||
@@ -44,9 +52,10 @@
|
|||||||
"@electron/devtron": "^2.1.1",
|
"@electron/devtron": "^2.1.1",
|
||||||
"@jest/globals": "^30.4.1",
|
"@jest/globals": "^30.4.1",
|
||||||
"@playwright/test": "^1.62.1",
|
"@playwright/test": "^1.62.1",
|
||||||
"electron": "^41.2.0",
|
"electron": "^43.3.0",
|
||||||
"electron-builder": "^26.15.3",
|
"electron-builder": "^26.15.3",
|
||||||
"jest": "^30.4.2",
|
"jest": "^30.4.2",
|
||||||
|
"nodemon": "^3.1.14",
|
||||||
"playwright": "^1.62.1"
|
"playwright": "^1.62.1"
|
||||||
},
|
},
|
||||||
"build": {
|
"build": {
|
||||||
@@ -75,6 +84,14 @@
|
|||||||
"from": "theme",
|
"from": "theme",
|
||||||
"to": "theme"
|
"to": "theme"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"from": "build/app-icon.ico",
|
||||||
|
"to": "app-icon.ico"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"from": "build/app-icon-64x64.png",
|
||||||
|
"to": "app-icon-64x64.png"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"from": "build/confirm-icon.png",
|
"from": "build/confirm-icon.png",
|
||||||
"to": "confirm-icon.png"
|
"to": "confirm-icon.png"
|
||||||
@@ -99,7 +116,7 @@
|
|||||||
"win": {
|
"win": {
|
||||||
"target": "nsis",
|
"target": "nsis",
|
||||||
"icon": "build/app-icon.ico",
|
"icon": "build/app-icon.ico",
|
||||||
"artifactName": "${productName}-Setup-${version}.${ext}",
|
"artifactName": "Freedom-Loader-Setup-${version}.${ext}",
|
||||||
"extraResources": [
|
"extraResources": [
|
||||||
{
|
{
|
||||||
"from": "resources/binaries/win-32/yt-dlp.exe",
|
"from": "resources/binaries/win-32/yt-dlp.exe",
|
||||||
|
|||||||
@@ -106,10 +106,10 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="setting-item">
|
<div class="setting-item">
|
||||||
<input type="checkbox" data-key="autoCheckInfo" id="autoCheckInfo">
|
<input data-key="keepPlaylistOrder" id="keepPlaylistOrder" type="checkbox">
|
||||||
<div class="setting-info">
|
<div class="setting-info">
|
||||||
<span class="setting-title">Auto Fetch Info</span>
|
<span class="setting-title">Keep Playlist Order</span>
|
||||||
<small>Automatically fetch information for new downloads.</small>
|
<small>Add index before output file, to keep the order.</small>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@@ -127,15 +127,31 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- <div class="setting-item">
|
<div class="setting-item">
|
||||||
<input type="checkbox" data-key="outputTitleCheck" id="outputTitleCheck">
|
<input data-key="systemTray" id="systemTray" type="checkbox">
|
||||||
<div class="setting-info">
|
<div class="setting-info">
|
||||||
<span class="setting-title">Output title (special chars)</span>
|
<span class="setting-title">System Tray</span>
|
||||||
<small>Check for unusual characters in output titles.</small>
|
<small>Minimize app on close, in the System Tray.</small>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div> -->
|
|
||||||
|
|
||||||
<div class="setting-item">
|
<!-- <div class="setting-item">
|
||||||
|
<input type="checkbox" data-key="outputTitleCheck" id="outputTitleCheck">
|
||||||
|
<div class="setting-info">
|
||||||
|
<span class="setting-title">Output title (special chars)</span>
|
||||||
|
<small>Check for unusual characters in output titles.</small>
|
||||||
|
</div>
|
||||||
|
</div> -->
|
||||||
|
|
||||||
|
<div class="setting-item">
|
||||||
|
<input data-key="autoCheckInfo" id="autoCheckInfo" type="checkbox">
|
||||||
|
<div class="setting-info">
|
||||||
|
<span class="setting-title">Auto Fetch Info</span>
|
||||||
|
<small>Automatically fetch information for new downloads.</small>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="setting-item">
|
||||||
<input type="checkbox" data-key="addMetadata" id="addMetadata">
|
<input type="checkbox" data-key="addMetadata" id="addMetadata">
|
||||||
<div class="setting-info">
|
<div class="setting-info">
|
||||||
<span class="setting-title">Add Metadata</span>
|
<span class="setting-title">Add Metadata</span>
|
||||||
|
|||||||
@@ -1,21 +1,54 @@
|
|||||||
/**
|
/**
|
||||||
* Retrieves the application version from the Electron main process
|
* Retrieves the application version and build state from the backend.
|
||||||
* and displays it in the UI version badge (bottom-right corner).
|
* Displays a formatted string indicating packaging state and preview status.
|
||||||
|
* Hides the "Packaged" state for production builds to keep the UI clean.
|
||||||
*
|
*
|
||||||
* This is mainly used for debugging and build identification.
|
* Example outputs: "Not Packaged Preview v1.6.2" or "Preview v1.6.2"
|
||||||
|
*
|
||||||
|
* @returns {Promise<void>}
|
||||||
*/
|
*/
|
||||||
async function versionLabel() {
|
async function versionLabel() {
|
||||||
|
/**
|
||||||
|
* Raw version string from the backend (e.g., "dev-1.6.2-preview" or "v1.6.2")
|
||||||
|
* @type {string}
|
||||||
|
*/
|
||||||
const appVersion = await window.electronAPI.getVersion();
|
const appVersion = await window.electronAPI.getVersion();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* UI element displaying the current application version.
|
* UI element displaying the current application version.
|
||||||
* Updated at runtime after IPC call resolves.
|
* @type {HTMLElement | null}
|
||||||
*/
|
*/
|
||||||
const versionBadge = document.getElementById("version-badge");
|
const versionBadge = document.getElementById("version-badge");
|
||||||
|
|
||||||
if (!versionBadge) return;
|
if (!versionBadge) return;
|
||||||
|
|
||||||
versionBadge.textContent = `${appVersion}`;
|
/**
|
||||||
|
* Extracts the numeric semantic version (e.g., "1.6.2").
|
||||||
|
* @type {RegExpMatchArray | null}
|
||||||
|
*/
|
||||||
|
const versionMatch = appVersion.match(/(\d+\.\d+\.\d+)/);
|
||||||
|
const baseVersion = versionMatch ? versionMatch[0] : "Unknown";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determines the packaging state. The backend prepends "dev-" if unpackaged.
|
||||||
|
* @type {boolean}
|
||||||
|
*/
|
||||||
|
const isPackaged = !appVersion.includes("dev-");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determines if the current build is a preview version.
|
||||||
|
* @type {boolean}
|
||||||
|
*/
|
||||||
|
const isPreview = appVersion.includes("preview");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Construct the final display string.
|
||||||
|
* If packaged, we don't mention it. If not, we explicitly say "Not Packaged ".
|
||||||
|
*/
|
||||||
|
const packageStateStr = isPackaged ? "" : "Not Packaged ";
|
||||||
|
const previewStr = isPreview ? "Preview " : "";
|
||||||
|
|
||||||
|
versionBadge.textContent = `${packageStateStr}${previewStr}v${baseVersion}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
versionLabel();
|
versionLabel();
|
||||||
@@ -30,15 +30,15 @@ function formatSize(bytes) {
|
|||||||
*/
|
*/
|
||||||
async function fetchVideoInfo(url) {
|
async function fetchVideoInfo(url) {
|
||||||
try {
|
try {
|
||||||
const res = await fetch("/info", {
|
const res = await fetch(`/info?url=${encodeURIComponent(url)}`, {
|
||||||
method: "POST",
|
method: "GET",
|
||||||
headers: { "Content-Type": "application/x-www-form-urlencoded" },
|
headers: {"Accept": "application/json"}
|
||||||
body: new URLSearchParams({ url }),
|
|
||||||
});
|
});
|
||||||
|
|
||||||
if (!res.ok) return { error: `An Error occured when fetching info` };
|
|
||||||
|
|
||||||
const data = await res.json();
|
const data = await res.json();
|
||||||
|
|
||||||
|
if (!res.ok) return {error: `An Error occured when fetching info`};
|
||||||
|
|
||||||
if (!data) return { error: "Data is Missing" };
|
if (!data) return { error: "Data is Missing" };
|
||||||
|
|
||||||
return data;
|
return data;
|
||||||
|
|||||||
@@ -6,15 +6,74 @@ ROOT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
|
|||||||
VERSION=$(node -p "require('$ROOT_DIR/package.json').version")
|
VERSION=$(node -p "require('$ROOT_DIR/package.json').version")
|
||||||
RPM_OUT="$ROOT_DIR/dist/freedom-loader-${VERSION}.x86_64.rpm"
|
RPM_OUT="$ROOT_DIR/dist/freedom-loader-${VERSION}.x86_64.rpm"
|
||||||
|
|
||||||
|
# ------------------------------------------------------------
|
||||||
|
# Resolve fpm from electron-builder cache
|
||||||
|
# Excludes Ruby gem wrappers, targets standalone binaries only
|
||||||
|
# Prefers fpm@2.x over legacy fpm-1.9.x
|
||||||
|
# ------------------------------------------------------------
|
||||||
|
FPM=$(find ~/.cache/electron-builder -name "fpm" -type f 2>/dev/null \
|
||||||
|
| grep -v "/gems/bin/fpm" \
|
||||||
|
| grep -v "/gems/gems/" \
|
||||||
|
| grep -v "/lib/app/bin/fpm" \
|
||||||
|
| grep "fpm@" \
|
||||||
|
| head -1)
|
||||||
|
|
||||||
|
# Fallback to legacy fpm-1.9.x if fpm@2.x not found
|
||||||
|
if [ -z "$FPM" ]; then
|
||||||
|
FPM=$(find ~/.cache/electron-builder -name "fpm" -type f 2>/dev/null \
|
||||||
|
| grep -v "/gems/" \
|
||||||
|
| grep -v "/lib/app/bin/fpm" \
|
||||||
|
| head -1)
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -z "$FPM" ]; then
|
||||||
|
echo "Error: fpm not found in electron-builder cache. Run 'npm run build:linux' once first to download it."
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Using fpm: $FPM"
|
||||||
|
|
||||||
# Check that linux-unpacked exists
|
# Check that linux-unpacked exists
|
||||||
if [ ! -d "$ROOT_DIR/dist/linux-unpacked" ]; then
|
if [ ! -d "$ROOT_DIR/dist/linux-unpacked" ]; then
|
||||||
echo "Error: dist/linux-unpacked not found. Run 'npm run build:linux' first."
|
echo "Error: dist/linux-unpacked not found. Run 'npm run build:linux' first."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Step 1 — Build .rpm from linux-unpacked via fpm
|
# ------------------------------------------------------------
|
||||||
|
# Prepare staging files
|
||||||
|
# fpm requires exact file-to-destination mappings to avoid
|
||||||
|
# scanning system directories (which causes permission errors)
|
||||||
|
# ------------------------------------------------------------
|
||||||
|
|
||||||
|
# Shell wrapper for /usr/bin/freedom-loader
|
||||||
|
TMP_WRAPPER="$ROOT_DIR/.rpm-pkg-tmp-wrapper"
|
||||||
|
mkdir -p "$TMP_WRAPPER"
|
||||||
|
cat > "$TMP_WRAPPER/freedom-loader" << 'EOF'
|
||||||
|
#!/bin/sh
|
||||||
|
exec /opt/freedom-loader/freedom-loader "$@"
|
||||||
|
EOF
|
||||||
|
chmod +x "$TMP_WRAPPER/freedom-loader"
|
||||||
|
|
||||||
|
# Desktop entry file
|
||||||
|
TMP_DESKTOP="$ROOT_DIR/.rpm-pkg-tmp-desktop"
|
||||||
|
mkdir -p "$TMP_DESKTOP"
|
||||||
|
cat > "$TMP_DESKTOP/freedom-loader.desktop" << 'EOF'
|
||||||
|
[Desktop Entry]
|
||||||
|
Name=Freedom Loader
|
||||||
|
Exec=/opt/freedom-loader/freedom-loader %U
|
||||||
|
Icon=freedom-loader
|
||||||
|
Type=Application
|
||||||
|
Categories=AudioVideo;Utility;Network;
|
||||||
|
Comment=Free and open-source GUI for yt-dlp
|
||||||
|
StartupWMClass=Freedom Loader
|
||||||
|
EOF
|
||||||
|
|
||||||
|
# ------------------------------------------------------------
|
||||||
|
# Step 1 - Build .rpm from linux-unpacked via fpm
|
||||||
|
# ------------------------------------------------------------
|
||||||
echo "Building RPM..."
|
echo "Building RPM..."
|
||||||
fpm -s dir -t rpm --force \
|
"$FPM" -s dir -t rpm --force \
|
||||||
|
--rpm-use-file-permissions \
|
||||||
--name freedom-loader \
|
--name freedom-loader \
|
||||||
--version "$VERSION" \
|
--version "$VERSION" \
|
||||||
--architecture x86_64 \
|
--architecture x86_64 \
|
||||||
@@ -26,14 +85,21 @@ fpm -s dir -t rpm --force \
|
|||||||
--depends nss \
|
--depends nss \
|
||||||
--depends libXScrnSaver \
|
--depends libXScrnSaver \
|
||||||
--depends at-spi2-core \
|
--depends at-spi2-core \
|
||||||
|
--rpm-attr "4755,root,root:/opt/freedom-loader/chrome-sandbox" \
|
||||||
--package "$RPM_OUT" \
|
--package "$RPM_OUT" \
|
||||||
"$ROOT_DIR/dist/linux-unpacked/=/opt/freedom-loader" \
|
"$ROOT_DIR/dist/linux-unpacked/=/opt/freedom-loader" \
|
||||||
|
"$TMP_WRAPPER/freedom-loader=/usr/bin/freedom-loader" \
|
||||||
|
"$TMP_DESKTOP/freedom-loader.desktop=/usr/share/applications/freedom-loader.desktop" \
|
||||||
"$ROOT_DIR/build/app-icon.png=/usr/share/icons/hicolor/512x512/apps/freedom-loader.png" \
|
"$ROOT_DIR/build/app-icon.png=/usr/share/icons/hicolor/512x512/apps/freedom-loader.png" \
|
||||||
"$ROOT_DIR/package/com.masteracnolo.freedomloader.metainfo.xml=/usr/share/metainfo/com.masteracnolo.freedomloader.metainfo.xml"
|
"$ROOT_DIR/package/com.masteracnolo.freedomloader.metainfo.xml=/usr/share/metainfo/com.masteracnolo.freedomloader.metainfo.xml"
|
||||||
|
|
||||||
|
rm -rf "$TMP_WRAPPER" "$TMP_DESKTOP"
|
||||||
echo "RPM built: $RPM_OUT"
|
echo "RPM built: $RPM_OUT"
|
||||||
|
|
||||||
# Step 2 — Build SRPM for COPR (wraps the .rpm above)
|
# ------------------------------------------------------------
|
||||||
|
# Step 2 - Build SRPM for COPR
|
||||||
|
# Wraps the .rpm above into a source RPM for COPR submission
|
||||||
|
# ------------------------------------------------------------
|
||||||
echo "Building SRPM for COPR..."
|
echo "Building SRPM for COPR..."
|
||||||
mkdir -p "$ROOT_DIR/srpm-out"
|
mkdir -p "$ROOT_DIR/srpm-out"
|
||||||
|
|
||||||
|
|||||||
187
scripts/release.sh
Executable file
187
scripts/release.sh
Executable file
@@ -0,0 +1,187 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
|
ROOT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
|
||||||
|
VERSION=$(node -p "require('$ROOT_DIR/package.json').version")
|
||||||
|
TAG="$VERSION"
|
||||||
|
|
||||||
|
# Parse arguments
|
||||||
|
PUBLISH_SNAP=false
|
||||||
|
PUBLISH_COPR=false
|
||||||
|
DRY_RUN=false
|
||||||
|
|
||||||
|
for arg in "$@"; do
|
||||||
|
case $arg in
|
||||||
|
--snap) PUBLISH_SNAP=true ;;
|
||||||
|
--copr) PUBLISH_COPR=true ;;
|
||||||
|
--publish) PUBLISH_SNAP=true; PUBLISH_COPR=true ;;
|
||||||
|
--dry-run) DRY_RUN=true ;;
|
||||||
|
*) echo "⚠️ Argument inconnu : $arg" ; exit 1 ;;
|
||||||
|
esac
|
||||||
|
done
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "============================================"
|
||||||
|
echo " Freedom Loader - Release Pipeline"
|
||||||
|
echo " Version : $VERSION"
|
||||||
|
echo " Tag : $TAG"
|
||||||
|
echo " Snap : $PUBLISH_SNAP"
|
||||||
|
echo " COPR : $PUBLISH_COPR"
|
||||||
|
echo " Dry run : $DRY_RUN"
|
||||||
|
echo "============================================"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
# ------------------------------------------------------------
|
||||||
|
# Step 0.1 - Check Dependencies
|
||||||
|
# ------------------------------------------------------------
|
||||||
|
echo "[0/5] Checking dependencies..."
|
||||||
|
|
||||||
|
command -v gh >/dev/null 2>&1 || { echo "'gh' CLI missing, need to be installed (https://cli.github.com/)."; exit 1; }
|
||||||
|
|
||||||
|
if [ "$PUBLISH_SNAP" = true ] && [ "$DRY_RUN" = false ]; then
|
||||||
|
command -v snapcraft >/dev/null 2>&1 || { echo "'snapcraft' missing, need to be installed."; exit 1; }
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$PUBLISH_COPR" = true ] && [ "$DRY_RUN" = false ]; then
|
||||||
|
command -v copr-cli >/dev/null 2>&1 || { echo "'copr-cli' missing, need to be installed."; exit 1; }
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "All dependencies found"
|
||||||
|
|
||||||
|
# ------------------------------------------------------------
|
||||||
|
# Step 0.2 - Clean Workspace
|
||||||
|
# ------------------------------------------------------------
|
||||||
|
echo "[0/5] Cleaning workspace..."
|
||||||
|
# On supprime les dossiers générés lors des builds précédents
|
||||||
|
rm -rf "$ROOT_DIR/dist" "$ROOT_DIR/srpm-out"
|
||||||
|
echo "Workspace cleaned (dist/ and srpm-out/ removed)"
|
||||||
|
|
||||||
|
# ------------------------------------------------------------
|
||||||
|
# Step 1 - Build Linux packages (AppImage, deb, snap)
|
||||||
|
# ------------------------------------------------------------
|
||||||
|
echo "[1/5] Building Linux packages..."
|
||||||
|
cd "$ROOT_DIR"
|
||||||
|
npm run build:linux
|
||||||
|
echo "Linux packages built"
|
||||||
|
|
||||||
|
# ------------------------------------------------------------
|
||||||
|
# Step 2 - Build RPM binary + SRPM for COPR
|
||||||
|
# Uses the create-copr-package.sh script which handles:
|
||||||
|
# - fpm binary resolution from electron-builder cache
|
||||||
|
# - .rpm generation from linux-unpacked
|
||||||
|
# - .src.rpm generation for COPR submission
|
||||||
|
# ------------------------------------------------------------
|
||||||
|
echo "[2/5] Building RPM and SRPM..."
|
||||||
|
bash "$ROOT_DIR/scripts/create-copr-package.sh"
|
||||||
|
echo "RPM and SRPM built"
|
||||||
|
|
||||||
|
# ------------------------------------------------------------
|
||||||
|
# Step 3 - Build Windows installer
|
||||||
|
# Note: requires Windows binaries to be present locally under
|
||||||
|
# resources/binaries/win-32/ (not committed to the repo)
|
||||||
|
# ------------------------------------------------------------
|
||||||
|
echo "[3/5] Building Windows installer..."
|
||||||
|
npm run build:win
|
||||||
|
echo " Windows installer built"
|
||||||
|
|
||||||
|
# ------------------------------------------------------------
|
||||||
|
# Step 4 - Create a draft release on GitHub
|
||||||
|
# Release notes are pre-filled with the standard template.
|
||||||
|
# Edit and publish manually from the GitHub web interface.
|
||||||
|
# Requires gh CLI to be installed and authenticated.
|
||||||
|
# ------------------------------------------------------------
|
||||||
|
echo "[4/5] Creating GitHub draft release $TAG..."
|
||||||
|
|
||||||
|
# Utilise une méthode un peu plus robuste pour trouver l'ancien tag (ignore le HEAD actuel s'il est déjà tagué)
|
||||||
|
PREV_TAG=$(git rev-list --tags --skip=1 --max-count=1 | xargs git describe --tags 2>/dev/null || echo "previous")
|
||||||
|
|
||||||
|
RELEASE_NOTES="# Freedom Loader - $VERSION
|
||||||
|
|
||||||
|
## Found a bug or issue?
|
||||||
|
Please report it in the [GitHub Issues](https://github.com/MasterAcnolo/Freedom-Loader/issues) section.
|
||||||
|
|
||||||
|
## Next Release (non-exhaustive roadmap)
|
||||||
|
- More format options
|
||||||
|
- Subtitle support
|
||||||
|
- Improved UI / UX
|
||||||
|
- Language selection
|
||||||
|
- Download specific parts of videos
|
||||||
|
- File renaming options
|
||||||
|
- Parallel downloads
|
||||||
|
- Skip sponsored parts automatically
|
||||||
|
|
||||||
|
**Full Changelog**: https://github.com/MasterAcnolo/Freedom-Loader/compare/${PREV_TAG}...${TAG}"
|
||||||
|
|
||||||
|
if [ "$DRY_RUN" = false ]; then
|
||||||
|
gh release create "$TAG" \
|
||||||
|
--title "$TAG" \
|
||||||
|
--notes "$RELEASE_NOTES" \
|
||||||
|
--draft \
|
||||||
|
"$ROOT_DIR/dist/Freedom-Loader-Setup-${VERSION}.exe" \
|
||||||
|
"$ROOT_DIR/dist/Freedom-Loader-Setup-${VERSION}.exe.blockmap" \
|
||||||
|
"$ROOT_DIR/dist/freedom-loader-${VERSION}.x86_64.rpm" \
|
||||||
|
"$ROOT_DIR/dist/freedom-loader_${VERSION}_amd64.deb" \
|
||||||
|
"$ROOT_DIR/dist/Freedom Loader-${VERSION}.AppImage" \
|
||||||
|
"$ROOT_DIR/dist/freedom-loader_${VERSION}_amd64.snap" \
|
||||||
|
"$ROOT_DIR/dist/latest.yml" \
|
||||||
|
"$ROOT_DIR/dist/latest-linux.yml"
|
||||||
|
echo "Draft release created: https://github.com/MasterAcnolo/Freedom-Loader/releases"
|
||||||
|
else
|
||||||
|
echo " [DRY RUN] gh release create $TAG (skipped)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ------------------------------------------------------------
|
||||||
|
# Step 5 - Publish to package stores
|
||||||
|
# Snap and COPR are opt-in via --snap, --copr, or --publish.
|
||||||
|
# Without these flags, this step is skipped entirely.
|
||||||
|
# Run after the GitHub release is published (not the draft),
|
||||||
|
# so store users always get the same version as GitHub users.
|
||||||
|
# ------------------------------------------------------------
|
||||||
|
echo "[5/5] Publishing to package stores..."
|
||||||
|
|
||||||
|
if [ "$PUBLISH_SNAP" = true ]; then
|
||||||
|
echo " Publishing to Snap Store..."
|
||||||
|
if [ "$DRY_RUN" = false ]; then
|
||||||
|
export PATH=$PATH:/var/lib/snapd/snap/bin
|
||||||
|
snapcraft upload \
|
||||||
|
"$ROOT_DIR/dist/freedom-loader_${VERSION}_amd64.snap" \
|
||||||
|
--release=stable
|
||||||
|
echo " Snap published"
|
||||||
|
else
|
||||||
|
echo " [DRY RUN] snapcraft upload (skipped)"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo " Snap: skipped (use --snap or --publish to enable)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$PUBLISH_COPR" = true ]; then
|
||||||
|
echo " Publishing to COPR..."
|
||||||
|
if [ "$DRY_RUN" = false ]; then
|
||||||
|
copr-cli build freedom-loader \
|
||||||
|
"$ROOT_DIR/srpm-out/freedom-loader-${VERSION}-1"*.src.rpm
|
||||||
|
echo "COPR build triggered"
|
||||||
|
else
|
||||||
|
echo " [DRY RUN] copr-cli build (skipped)"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo " COPR: skipped (use --copr or --publish to enable)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# ------------------------------------------------------------
|
||||||
|
# Done - Summary
|
||||||
|
# ------------------------------------------------------------
|
||||||
|
echo ""
|
||||||
|
echo "============================================"
|
||||||
|
echo " Release pipeline complete."
|
||||||
|
echo ""
|
||||||
|
echo " Next steps:"
|
||||||
|
echo " 1. Fill in the release notes on GitHub"
|
||||||
|
echo " 2. Publish the draft release"
|
||||||
|
if [ "$PUBLISH_SNAP" = false ] || [ "$PUBLISH_COPR" = false ]; then
|
||||||
|
echo ""
|
||||||
|
echo " Store publishing (not done yet):"
|
||||||
|
[ "$PUBLISH_SNAP" = false ] && echo " - Snap : bash scripts/release.sh --snap"
|
||||||
|
[ "$PUBLISH_COPR" = false ] && echo " - COPR : bash scripts/release.sh --copr"
|
||||||
|
fi
|
||||||
|
echo "============================================"
|
||||||
@@ -18,7 +18,9 @@ const { isValidUrl } = require("../helpers/validation.helpers");
|
|||||||
*/
|
*/
|
||||||
async function infoController(req, res) {
|
async function infoController(req, res) {
|
||||||
|
|
||||||
const url = req.body.url || req.query.url; // Supports POST and GET requests
|
// Previously, i support both POST and GET element, but it's kinda weird. So now it only support GET.
|
||||||
|
const url = req.query.url;
|
||||||
|
const encodedUrl = encodeURIComponent(url)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Basic validation:
|
* Basic validation:
|
||||||
@@ -30,9 +32,10 @@ async function infoController(req, res) {
|
|||||||
return res.status(400).send("Invalid URL Or Missing");
|
return res.status(400).send("Invalid URL Or Missing");
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.info(`Info request received. URL: ${url}`);
|
logger.info(`Info request received. RAW URL: ${url}`);
|
||||||
|
logger.info(`Info request received. ENCODED: ${encodedUrl}`);
|
||||||
|
|
||||||
// Lightweight heuristic to detect playlist URLs
|
// Lightweight heuristic to detect playlist URLs. It works for Youtube.
|
||||||
const isPlaylistUrl = url.includes("&list") || url.includes("?list");
|
const isPlaylistUrl = url.includes("&list") || url.includes("?list");
|
||||||
|
|
||||||
logger.info(
|
logger.info(
|
||||||
@@ -86,6 +89,16 @@ async function infoController(req, res) {
|
|||||||
*/
|
*/
|
||||||
if (data._type === "playlist") {
|
if (data._type === "playlist") {
|
||||||
|
|
||||||
|
// If the playlist got only one video, show it as a video.
|
||||||
|
if (data.entries && data.entries.length === 1) {
|
||||||
|
|
||||||
|
const singleVideo = parseVideo(data.entries[0]);
|
||||||
|
|
||||||
|
logger.info(`Playlist with 1 item converted to video: ${singleVideo.title}`);
|
||||||
|
|
||||||
|
return res.json(singleVideo);
|
||||||
|
}
|
||||||
|
|
||||||
const playlist = parsePlaylist(data);
|
const playlist = parsePlaylist(data);
|
||||||
|
|
||||||
logger.info(
|
logger.info(
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ function validateCodec(codec){
|
|||||||
*
|
*
|
||||||
* @returns {string[]} Array of arguments ready to be passed to yt-dlp.
|
* @returns {string[]} Array of arguments ready to be passed to yt-dlp.
|
||||||
*/
|
*/
|
||||||
function buildYtDlpArgs({ url, audioOnly, quality, outputFolder }) {
|
function buildYtDlpArgs({url, audioOnly, quality, outputFolder, isPlaylist}) {
|
||||||
|
|
||||||
logger.info("--- CONFIGURATION ---");
|
logger.info("--- CONFIGURATION ---");
|
||||||
|
|
||||||
@@ -70,6 +70,7 @@ function buildYtDlpArgs({ url, audioOnly, quality, outputFolder }) {
|
|||||||
logger.info(`CONFIG discordRPC: ${configFeatures.discordRPC}`);
|
logger.info(`CONFIG discordRPC: ${configFeatures.discordRPC}`);
|
||||||
logger.info(`CONFIG customTopBar: ${configFeatures.customTopBar}`);
|
logger.info(`CONFIG customTopBar: ${configFeatures.customTopBar}`);
|
||||||
logger.info(`CONFIG autoCheckInfo: ${configFeatures.autoCheckInfo}`);
|
logger.info(`CONFIG autoCheckInfo: ${configFeatures.autoCheckInfo}`);
|
||||||
|
logger.info(`CONFIG keepPlaylistOrder: ${configFeatures.keepPlaylistOrder}`);
|
||||||
logger.info(`CONFIG addThumbnail: ${configFeatures.addThumbnail}`);
|
logger.info(`CONFIG addThumbnail: ${configFeatures.addThumbnail}`);
|
||||||
logger.info(`CONFIG addMetadata: ${configFeatures.addMetadata}`);
|
logger.info(`CONFIG addMetadata: ${configFeatures.addMetadata}`);
|
||||||
logger.info(`CONFIG verboseLogs: ${configFeatures.verboseLogs}`);
|
logger.info(`CONFIG verboseLogs: ${configFeatures.verboseLogs}`);
|
||||||
@@ -117,7 +118,19 @@ function buildYtDlpArgs({ url, audioOnly, quality, outputFolder }) {
|
|||||||
};
|
};
|
||||||
|
|
||||||
args.push("-f", qualityMap[quality] || "best");
|
args.push("-f", qualityMap[quality] || "best");
|
||||||
args.push("-o", path.join(outputFolder, "%(title)s.%(ext)s"));
|
|
||||||
|
/**
|
||||||
|
* Default title output template
|
||||||
|
* @type {string}
|
||||||
|
*/
|
||||||
|
let outputTemplate = "%(title)s.%(ext)s";
|
||||||
|
|
||||||
|
// If it's a playlist, and we want to keep the playlist order. Add an index before the title.
|
||||||
|
if (isPlaylist && configFeatures.keepPlaylistOrder && configFeatures.autoDownloadPlaylist) {
|
||||||
|
outputTemplate = "%(playlist_index)02d - %(title)s.%(ext)s";
|
||||||
|
}
|
||||||
|
|
||||||
|
args.push("-o", path.join(outputFolder, outputTemplate));
|
||||||
args.push(url);
|
args.push(url);
|
||||||
|
|
||||||
return args.filter(Boolean);
|
return args.filter(Boolean);
|
||||||
|
|||||||
@@ -2,6 +2,12 @@ const { Notification, shell } = require("electron");
|
|||||||
const { iconPaths } = require("./path.helpers");
|
const { iconPaths } = require("./path.helpers");
|
||||||
const { logger } = require("../logger");
|
const { logger } = require("../logger");
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set that is holding all notifications. Used to avoid Race Condition and notification crash
|
||||||
|
* @type {Set<any>}
|
||||||
|
*/
|
||||||
|
const activeNotifications = new Set();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Displays a system notification when a download completes successfully.
|
* Displays a system notification when a download completes successfully.
|
||||||
*
|
*
|
||||||
@@ -14,14 +20,34 @@ const { logger } = require("../logger");
|
|||||||
function notifyDownloadFinished(folder, notifyEnabled = true) {
|
function notifyDownloadFinished(folder, notifyEnabled = true) {
|
||||||
if (!notifyEnabled) return;
|
if (!notifyEnabled) return;
|
||||||
if (!folder) return;
|
if (!folder) return;
|
||||||
|
|
||||||
const notif = new Notification({
|
const notif = new Notification({
|
||||||
title: "Freedom Loader",
|
title: "Freedom Loader",
|
||||||
body: "Your download is complete, click here to open it.",
|
body: "Your download is complete, click here to open it.",
|
||||||
icon: iconPaths.confirm,
|
icon: iconPaths.confirm,
|
||||||
});
|
});
|
||||||
|
|
||||||
notif.on("click", () => shell.openPath(folder));
|
// Protect notification to garbage collection and race condition, by adding a 150ms timeout before trying to open the folder
|
||||||
|
activeNotifications.add(notif);
|
||||||
|
|
||||||
|
notif.on("click", () => {
|
||||||
|
activeNotifications.delete(notif);
|
||||||
|
|
||||||
|
setTimeout(() => {
|
||||||
|
shell.openPath(folder).then((errorMessage) => {
|
||||||
|
if (errorMessage) {
|
||||||
|
logger.error(`Impossible d'ouvrir le dossier : ${errorMessage}`);
|
||||||
|
}
|
||||||
|
}).catch(err => {
|
||||||
|
logger.error(`Erreur inattendue de shell.openPath : ${err}`);
|
||||||
|
});
|
||||||
|
}, 150);
|
||||||
|
});
|
||||||
|
|
||||||
|
notif.on("close", () => {
|
||||||
|
activeNotifications.delete(notif);
|
||||||
|
});
|
||||||
|
|
||||||
notif.show();
|
notif.show();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -41,11 +67,16 @@ function notifyCookiesBrowserError(){
|
|||||||
icon: iconPaths.error,
|
icon: iconPaths.error,
|
||||||
});
|
});
|
||||||
|
|
||||||
notif.on("click", () =>
|
activeNotifications.add(notif);
|
||||||
shell.openExternal(
|
|
||||||
"https://youtube.com/shorts/cN9f4s1Mf88?si=519QCVd_-fzJqRf1"
|
notif.on("click", () => {
|
||||||
)
|
shell.openExternal("https://www.firefox.com/en-US/download/");
|
||||||
);
|
activeNotifications.delete(notif);
|
||||||
|
});
|
||||||
|
|
||||||
|
notif.on("close", () => {
|
||||||
|
activeNotifications.delete(notif);
|
||||||
|
});
|
||||||
|
|
||||||
notif.show();
|
notif.show();
|
||||||
}
|
}
|
||||||
@@ -65,11 +96,16 @@ function notifyFirefoxBrowserMissing() {
|
|||||||
icon: iconPaths.error,
|
icon: iconPaths.error,
|
||||||
});
|
});
|
||||||
|
|
||||||
notif.on("click", () =>
|
activeNotifications.add(notif);
|
||||||
shell.openExternal(
|
|
||||||
"https://youtube.com/shorts/cN9f4s1Mf88?si=519QCVd_-fzJqRf1"
|
notif.on("click", () => {
|
||||||
)
|
shell.openExternal("https://www.firefox.com/en-US/download/");
|
||||||
);
|
activeNotifications.delete(notif);
|
||||||
|
});
|
||||||
|
|
||||||
|
notif.on("close", () => {
|
||||||
|
activeNotifications.delete(notif);
|
||||||
|
});
|
||||||
|
|
||||||
notif.show();
|
notif.show();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,6 +22,31 @@ const logFormat = format.combine(
|
|||||||
format.printf(({ timestamp, level, message }) => `${timestamp} | ${level.toUpperCase()} | ${message}`)
|
format.printf(({ timestamp, level, message }) => `${timestamp} | ${level.toUpperCase()} | ${message}`)
|
||||||
);
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Format used by the saved file
|
||||||
|
* @type {Format}
|
||||||
|
*/
|
||||||
|
const fileFormat = format.combine(
|
||||||
|
format.timestamp({format: "YYYY-MM-DD HH:mm:ss"}),
|
||||||
|
format.errors({stack: true}), // Capture la stack trace complète des erreurs
|
||||||
|
format.printf(({timestamp, level, message, stack}) => {
|
||||||
|
return `${timestamp} | ${level.toUpperCase()} | ${stack || message}`;
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Formated used by the IDE/Console
|
||||||
|
* @type {Format}
|
||||||
|
*/
|
||||||
|
const consoleFormat = format.combine(
|
||||||
|
format.colorize({all: true}),
|
||||||
|
format.timestamp({format: "HH:mm:ss"}),
|
||||||
|
format.errors({stack: true}),
|
||||||
|
format.printf(({timestamp, level, message, stack}) => {
|
||||||
|
return `[${timestamp}] ${level}: ${stack || message}`;
|
||||||
|
})
|
||||||
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Logger Instance with differents types
|
* Logger Instance with differents types
|
||||||
* - info
|
* - info
|
||||||
@@ -33,7 +58,6 @@ const logFormat = format.combine(
|
|||||||
*/
|
*/
|
||||||
const logger = createLogger({
|
const logger = createLogger({
|
||||||
level: "info",
|
level: "info",
|
||||||
format: logFormat,
|
|
||||||
transports: [
|
transports: [
|
||||||
new DailyRotateFile({
|
new DailyRotateFile({
|
||||||
dirname: logDir,
|
dirname: logDir,
|
||||||
@@ -41,11 +65,11 @@ const logger = createLogger({
|
|||||||
datePattern: "YYYY-MM-DD",
|
datePattern: "YYYY-MM-DD",
|
||||||
zippedArchive: false,
|
zippedArchive: false,
|
||||||
maxFiles: "7d",
|
maxFiles: "7d",
|
||||||
format: logFormat,
|
format: fileFormat,
|
||||||
options: { flags: "a" },
|
options: { flags: "a" },
|
||||||
}),
|
}),
|
||||||
new transports.Console({
|
new transports.Console({
|
||||||
format: logFormat,
|
format: consoleFormat,
|
||||||
}),
|
}),
|
||||||
],
|
],
|
||||||
});
|
});
|
||||||
@@ -55,8 +79,9 @@ const logger = createLogger({
|
|||||||
*/
|
*/
|
||||||
function logSessionStart(logDir, downloadPath) {
|
function logSessionStart(logDir, downloadPath) {
|
||||||
logger.info(`--- Starting session: ${new Date().toISOString()} ---`);
|
logger.info(`--- Starting session: ${new Date().toISOString()} ---`);
|
||||||
|
logger.info("============================================================")
|
||||||
logger.info(`Application Version: ${config.version}`)
|
logger.info(`Application Version: ${config.version}`)
|
||||||
logSystemInfo(logger, logDir, downloadPath)
|
if (typeof logSystemInfo === 'function') logSystemInfo(logger, logDir, downloadPath);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -2,6 +2,6 @@ const express = require("express");
|
|||||||
const router = express.Router();
|
const router = express.Router();
|
||||||
const { infoController } = require("../controller/info.controller");
|
const { infoController } = require("../controller/info.controller");
|
||||||
|
|
||||||
router.post("/", infoController);
|
router.get("/", infoController);
|
||||||
|
|
||||||
module.exports = router;
|
module.exports = router;
|
||||||
@@ -13,7 +13,9 @@ app.use(express.static(path.join(__dirname, "../public")));
|
|||||||
|
|
||||||
// Routes
|
// Routes
|
||||||
app.use("/download", require("./routes/download.route"));
|
app.use("/download", require("./routes/download.route"));
|
||||||
app.use("/info", require("./routes/info.route"));
|
app.use("/info", require("./routes/info.route"));
|
||||||
|
|
||||||
|
// Interface
|
||||||
app.get("/", rateLimit, (req, res) => {
|
app.get("/", rateLimit, (req, res) => {
|
||||||
res.sendFile(path.join(__dirname, "../public/index.html"));
|
res.sendFile(path.join(__dirname, "../public/index.html"));
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ const { buildYtDlpArgs } = require("../helpers/buildArgs.helpers");
|
|||||||
const notify = require("../helpers/notify.helpers");
|
const notify = require("../helpers/notify.helpers");
|
||||||
const path = require("path");
|
const path = require("path");
|
||||||
const { isSafePath } = require("../helpers/validation.helpers");
|
const { isSafePath } = require("../helpers/validation.helpers");
|
||||||
const { configFeatures } = require("../../config.js");
|
const {reloadFeatures} = require("../../config");
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reference to the currently running yt-dlp process.
|
* Reference to the currently running yt-dlp process.
|
||||||
@@ -135,7 +135,10 @@ function createPlaylistFolder(basePath, playlistTitle) {
|
|||||||
function fetchDownload(options, listeners, speedListeners, stageListeners, playlistInfoListeners) {
|
function fetchDownload(options, listeners, speedListeners, stageListeners, playlistInfoListeners) {
|
||||||
|
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
logger.info(`CONFIG createPlaylistFolders: ${configFeatures.createPlaylistFolders}`);
|
|
||||||
|
const userConfig = reloadFeatures();
|
||||||
|
|
||||||
|
logger.info(`CONFIG createPlaylistFolders: ${userConfig.createPlaylistFolders}`);
|
||||||
|
|
||||||
let outputFolder = options.outputFolder || defaultDownloadFolder;
|
let outputFolder = options.outputFolder || defaultDownloadFolder;
|
||||||
|
|
||||||
@@ -158,8 +161,8 @@ function fetchDownload(options, listeners, speedListeners, stageListeners, playl
|
|||||||
|
|
||||||
// Détecte si c'est une playlist et crée un dossier approprié
|
// Détecte si c'est une playlist et crée un dossier approprié
|
||||||
const isPlaylist = options.playlistTitle || isPlaylistUrl(options.url);
|
const isPlaylist = options.playlistTitle || isPlaylistUrl(options.url);
|
||||||
|
|
||||||
if (isPlaylist && configFeatures.createPlaylistFolders) {
|
if (isPlaylist && userConfig.createPlaylistFolders) {
|
||||||
try {
|
try {
|
||||||
const playlistName = options.playlistTitle || "Untitled Playlist";
|
const playlistName = options.playlistTitle || "Untitled Playlist";
|
||||||
safeOutputFolder = createPlaylistFolder(safeOutputFolder, playlistName);
|
safeOutputFolder = createPlaylistFolder(safeOutputFolder, playlistName);
|
||||||
@@ -168,11 +171,16 @@ function fetchDownload(options, listeners, speedListeners, stageListeners, playl
|
|||||||
logger.error(`Failed to create playlist folder: ${err.message}`);
|
logger.error(`Failed to create playlist folder: ${err.message}`);
|
||||||
return reject(err);
|
return reject(err);
|
||||||
}
|
}
|
||||||
} else if (isPlaylist && !configFeatures.createPlaylistFolders) {
|
} else if (isPlaylist && !userConfig.createPlaylistFolders) {
|
||||||
logger.info(`Playlist detected but createPlaylistFolders is disabled, using base folder`);
|
logger.info(`Playlist detected but createPlaylistFolders is disabled, using base folder`);
|
||||||
}
|
}
|
||||||
|
|
||||||
const args = buildYtDlpArgs({ ...options, outputFolder: safeOutputFolder });
|
const args = buildYtDlpArgs({
|
||||||
|
...options,
|
||||||
|
outputFolder: safeOutputFolder,
|
||||||
|
isPlaylist
|
||||||
|
});
|
||||||
|
|
||||||
logger.info(`[yt-dlp args] ${args.join(" ")}`);
|
logger.info(`[yt-dlp args] ${args.join(" ")}`);
|
||||||
|
|
||||||
const child = execFile(userYtDlp, args);
|
const child = execFile(userYtDlp, args);
|
||||||
|
|||||||
Reference in New Issue
Block a user