TheLanc3/YoutubeDL-Material
1
0
Fork 0
mirror of https://github.com/Tzahi12345/YoutubeDL-Material.git synced 2026-04-23 06:33:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

Updated methodology of calculating download progress to rely on fs.readdir instead of glob

Browse Source
This commit is contained in:
Isaac Abadi
2022-04-24 04:15:38 -04:00
parent 0585943d67
commit 21507ee36d
2 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
backend/downloader.js
View File

@@ -3,7 +3,6 @@ const { uuid } = require('uuidv4');
const path = require('path'); const path = require('path');
const mergeFiles = require('merge-files'); const mergeFiles = require('merge-files');
const NodeID3 = require('node-id3') const NodeID3 = require('node-id3')
const glob = require('glob')
const Mutex = require('async-mutex').Mutex; const Mutex = require('async-mutex').Mutex;
const youtubedl = require('youtube-dl'); const youtubedl = require('youtube-dl');
@@ -583,21 +582,27 @@ async function checkDownloadPercent(download_uid) {
if (!resulting_file_size) return; if (!resulting_file_size) return;
let sum_size = 0; let sum_size = 0;
glob(`{${files_to_check_for_progress.join(',')}, }*`, async (err, files) => { for (let i = 0; i < files_to_check_for_progress.length; i++) {
files.forEach(async file => { const file_to_check_for_progress = files_to_check_for_progress[i];
const dir = path.dirname(file_to_check_for_progress);
if (!fs.existsSync(dir)) continue;
fs.readdir(dir, async (err, files) => {
for (let j = 0; j < files.length; j++) {
const file = files[j];
if (!file.includes(path.basename(file_to_check_for_progress))) continue;
try { try {
const file_stats = fs.statSync(file); const file_stats = fs.statSync(path.join(dir, file));
if (file_stats && file_stats.size) { if (file_stats && file_stats.size) {
sum_size += file_stats.size; sum_size += file_stats.size;
} }
} catch (e) { } catch (e) {}
} }
});
const percent_complete = (sum_size/resulting_file_size * 100).toFixed(2); const percent_complete = (sum_size/resulting_file_size * 100).toFixed(2);
await db_api.updateRecord('download_queue', {uid: download_uid}, {percent_complete: percent_complete}); await db_api.updateRecord('download_queue', {uid: download_uid}, {percent_complete: percent_complete});
}); });
} }
}
exports.generateNFOFile = (info, output_path) => { exports.generateNFOFile = (info, output_path) => {
const nfo_obj = { const nfo_obj = {

1
backend/package.json
View File

@@ -40,7 +40,6 @@
"express": "^4.17.3", "express": "^4.17.3",
"fluent-ffmpeg": "^2.1.2", "fluent-ffmpeg": "^2.1.2",
"fs-extra": "^9.0.0", "fs-extra": "^9.0.0",
"glob": "^7.1.6",
"jsonwebtoken": "^8.5.1", "jsonwebtoken": "^8.5.1",
"lowdb": "^1.0.0", "lowdb": "^1.0.0",
"md5": "^2.2.1", "md5": "^2.2.1",