From 0bb7f8c4cf8e0eea746ba4fba3fbbbbc88a53a6b Mon Sep 17 00:00:00 2001 From: Kazhnuz Date: Sun, 16 Feb 2025 13:55:31 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=8A=20Improve=20logs?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- main.js | 46 ++++++++++++++++------------------------------ 1 file changed, 16 insertions(+), 30 deletions(-) diff --git a/main.js b/main.js index 8f5b3d8..8713ff1 100644 --- a/main.js +++ b/main.js @@ -61,30 +61,12 @@ function createMetadatas(prideflag, text, now = false) { const __filename = fileURLToPath(import.meta.url); const __dirname = path.dirname(__filename); -fs.mkdir(path.join(__dirname, 'build'), - { recursive: true }, - (err) => { - if (err) { - return console.error(err); - } - console.log('Build directory created successfully!'); - }); -fs.mkdir(path.join(__dirname, 'output'), - { recursive: true }, - (err) => { - if (err) { - return console.error(err); - } - console.log('Output directory created successfully!'); - }); -fs.mkdir(path.join(__dirname, 'tmp'), - { recursive: true }, - (err) => { - if (err) { - return console.error(err); - } - console.log('Tmp directory created successfully!'); - }); +fs.mkdirSync(path.join(__dirname, 'build'), + { recursive: true }); +fs.mkdirSync(path.join(__dirname, 'output'), + { recursive: true }); +fs.mkdirSync(path.join(__dirname, 'tmp'), + { recursive: true }); // Start generating @@ -94,13 +76,13 @@ let flagCount = 0; const start = Date.now(); data.forEach(prideflag => { - console.log(`== Creating flags for ${prideflag.name.en}`); + console.log(`- Creating flags for ${prideflag.name.en}`); const imageMetadata = {title:`Drapeau ${prideflag.name.fr.toLowerCase()} :`, list:[]}; prideflag.texts.forEach(text => { const metadatas = createMetadatas(prideflag, text, false) imageMetadata.list.push(metadatas); - console.log(`Creating button for text "${metadatas.text}" (${metadatas.file})`); + //console.log(`Creating button for text "${metadatas.text}" (${metadatas.file})`); createButton(prideflag.source, position.x, position.y, text, position.gravity) .write(`./output/${metadatas.file}`, function (err) { if (err) { @@ -116,7 +98,7 @@ data.forEach(prideflag => { const metadatas = createMetadatas(prideflag, text, true) imageMetadata.list.push(metadatas); - console.log(`Creating button for text "${metadatas.text}" (${metadatas.file})`); + //console.log(`Creating button for text "${metadatas.text}" (${metadatas.file})`); createButton(prideflag.source, position.x+12, position.y, text, position.gravity) .write(`./tmp/${metadatas.file}`, function (err) { if (err) { @@ -154,9 +136,10 @@ fs.writeFile("./output/pridebuttons.json", JSON.stringify(metadatas), (err) => { var output = fs.createWriteStream(`build/${zipname}`); var archive = archiver('zip'); +var size = 0; output.on('close', function () { - console.log(archive.pointer() + ' total bytes'); + size = archive.pointer(); console.log('archiver has been finalized and the output file descriptor has closed.'); }); @@ -169,16 +152,19 @@ archive.pipe(output); // append files from a sub-directory, putting its contents at the root of archive archive.directory('output/', false); -archive.finalize(); +await archive.finalize(); // Show final result const millis = Date.now() - start; setTimeout(() => { console.log(""); - console.log("-----------------------") + console.log("-----------------------"); + console.log(""); console.log(`Pride Button version ${VERSION}`); console.log(`Generation finished in ${millis / 1000}s`); console.log(`${flagCount} flags processed`); console.log(`${count} files generated`); + console.log(`Archive name : ${zipname}`); + console.log(`Archive size : ${size/1000} kB`); }, 500); \ No newline at end of file