mirror of
https://github.com/MasterAcnolo/Freedom-Loader.git
synced 2026-07-29 18:25:47 +02:00
Download Speed
This commit is contained in:
@@ -65,6 +65,7 @@
|
||||
</div>
|
||||
|
||||
<div id="downloadProgressText"></div>
|
||||
<div id="downloadSpeedText"></div>
|
||||
|
||||
<div id="downloadStatus"></div>
|
||||
|
||||
|
||||
@@ -2,11 +2,17 @@ const progressWrapper = document.getElementById("downloadProgressWrapper");
|
||||
const progressBar = document.getElementById("downloadProgress");
|
||||
const progressBarText = document.getElementById("downloadProgressText")
|
||||
|
||||
const speedElement = document.getElementById("downloadSpeedText");
|
||||
const speedEvt = new EventSource("/download/speed");
|
||||
|
||||
function startProgress() {
|
||||
progressWrapper.style.display = "block";
|
||||
progressBar.style.width = "0%";
|
||||
progressBarText.style.display = "block";
|
||||
progressBarText.innerHTML = "0%";
|
||||
|
||||
speedElement.style.display = "block";
|
||||
speedElement.innerHTML = "0 Mib/s";
|
||||
}
|
||||
|
||||
function updateProgress(percent) {
|
||||
@@ -16,9 +22,12 @@ function updateProgress(percent) {
|
||||
|
||||
function resetProgress() {
|
||||
progressBar.style.width = "0%";
|
||||
progressBarText.innerHTML = "";
|
||||
progressBarText.textContent = "";
|
||||
progressBarText.style.display = "none";
|
||||
progressWrapper.style.display = "none";
|
||||
|
||||
speedElement.textContent = "0 Mib/s";
|
||||
speedElement.style.display = "none";
|
||||
}
|
||||
|
||||
// Connexion SSE
|
||||
@@ -37,6 +46,7 @@ evtSource.onmessage = e => {
|
||||
}
|
||||
|
||||
const percent = parseFloat(e.data);
|
||||
|
||||
if (!isNaN(percent)) {
|
||||
updateProgress(percent);
|
||||
window.electronAPI.setProgress(percent); // update barre des tâches
|
||||
@@ -46,3 +56,8 @@ evtSource.onmessage = e => {
|
||||
}, 500);
|
||||
}
|
||||
};
|
||||
|
||||
speedEvt.onmessage = e => {
|
||||
speedElement.style.display = "block";
|
||||
speedElement.textContent = e.data; // ex: "5.2MiB/s"
|
||||
};
|
||||
@@ -5,6 +5,7 @@ const { buildYtDlpArgs } = require("../helpers/buildArgs");
|
||||
const { notifyDownloadFinished } = require("../helpers/notify");
|
||||
|
||||
const listeners = [];
|
||||
const speedListeners = [];
|
||||
|
||||
async function downloadController(req, res) {
|
||||
try {
|
||||
@@ -18,7 +19,7 @@ async function downloadController(req, res) {
|
||||
if (!options.url || !isValidUrl(options.url)) return res.status(400).send("❌ URL invalide !");
|
||||
if (options.outputFolder && !isSafePath(options.outputFolder)) return res.status(400).send("❌ Chemin de sauvegarde non autorisé.");
|
||||
|
||||
const filePath = await fetchDownload(options, listeners);
|
||||
const filePath = await fetchDownload(options, listeners, speedListeners);
|
||||
notifyDownloadFinished(filePath);
|
||||
res.send("✅ Téléchargement terminé !");
|
||||
|
||||
@@ -44,4 +45,21 @@ function progressController(req, res) {
|
||||
});
|
||||
}
|
||||
|
||||
module.exports = { downloadController, progressController };
|
||||
function speedController(req, res) {
|
||||
res.set({
|
||||
'Content-Type': 'text/event-stream',
|
||||
'Cache-Control': 'no-cache',
|
||||
'Connection': 'keep-alive',
|
||||
});
|
||||
|
||||
const sendSpeed = speed => res.write(`data: ${speed}\n\n`);
|
||||
speedListeners.push(sendSpeed);
|
||||
|
||||
req.on('close', () => {
|
||||
speedListeners.splice(speedListeners.indexOf(sendSpeed), 1);
|
||||
res.end();
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
module.exports = { downloadController, progressController, speedController};
|
||||
|
||||
@@ -1,10 +1,11 @@
|
||||
const express = require("express");
|
||||
const router = express.Router();
|
||||
const { downloadController, progressController } = require("../controller/download.controller");
|
||||
const { downloadController, progressController, speedController } = require("../controller/download.controller");
|
||||
|
||||
router.post("/", downloadController);
|
||||
|
||||
// SSE pour la progression du téléchargement
|
||||
router.get("/progress", progressController);
|
||||
router.get("/speed", speedController);
|
||||
|
||||
module.exports = router;
|
||||
@@ -5,7 +5,7 @@ const fs = require("fs");
|
||||
const { logger } = require("../logger");
|
||||
const { buildYtDlpArgs } = require("../helpers/buildArgs");
|
||||
|
||||
function fetchDownload(options, listeners) {
|
||||
function fetchDownload(options, listeners, speedListeners) {
|
||||
|
||||
return new Promise((resolve, reject) => {
|
||||
const outputFolder = options.outputFolder || path.join(process.env.USERPROFILE, "Downloads", "Freedom Loader");
|
||||
@@ -34,12 +34,24 @@ function fetchDownload(options, listeners) {
|
||||
if (line.startsWith("[download] Destination:")) listeners.forEach(fn => fn("reset"));
|
||||
const match = line.match(/\[download\]\s+(\d+\.\d+)%/);
|
||||
if (match) listeners.forEach(fn => fn(parseFloat(match[1])));
|
||||
|
||||
if (line.includes("MiB/s") || line.includes("KiB/s")) {
|
||||
const match = line.match(/\d+(\.\d+)?[KM]?iB\/s/);
|
||||
if (match) {
|
||||
const speed = match[0];
|
||||
speedListeners.forEach(fn => fn(speed));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
});
|
||||
});
|
||||
|
||||
child.stderr.on("data", data => {
|
||||
data.toString().split("\n").forEach(line => line.trim() && logger.error(`[yt-dlp stderr] ${line}`));
|
||||
});
|
||||
|
||||
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user