From aa8a6d6248b43477de3345eec736d15cef7da4f6 Mon Sep 17 00:00:00 2001 From: TheArcaneBrony Date: Fri, 13 Jan 2023 13:09:09 +0100 Subject: Fix console fuckery to allow running in a headless terminal, and to fix flickering of output. Signed-off-by: TheArcaneBrony --- scripts/client.js | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/scripts/client.js b/scripts/client.js index 32ccca00..980ff4bf 100644 --- a/scripts/client.js +++ b/scripts/client.js @@ -198,17 +198,15 @@ const processFile = async (name) => { while (INDEX_SCRIPTS.length > 0) { const asset = INDEX_SCRIPTS.shift(); - process.stdout.clearLine(0); - process.stdout.cursorTo(0); process.stdout.write( - `Scraping asset ${asset}. Remaining: ${INDEX_SCRIPTS.length}`, + `Scraping asset ${asset}. Remaining: ${INDEX_SCRIPTS.length} \r`, ); const newAssets = await processFile(asset); assets.push(...newAssets); } - process.stdout.moveCursor(0, 1); + console.log(); const CACHE_MISSES = ( await fs.readFile(path.join(CACHE_PATH, "..", "cacheMisses")) @@ -219,10 +217,9 @@ const processFile = async (name) => { .split("\n"); while (CACHE_MISSES.length > 0) { const asset = CACHE_MISSES.shift(); - process.stdout.clearLine(0); - process.stdout.cursorTo(0); + process.stdout.write( - `Scraping cache misses ${asset}. Remaining: ${CACHE_MISSES.length}`, + `Scraping cache misses ${asset}. Remaining: ${CACHE_MISSES.length} \r`, ); if (existsSync(path.join(CACHE_PATH, `${asset}`))) { @@ -239,10 +236,8 @@ const processFile = async (name) => { while (existing.length > 0) { var file = existing.shift(); - process.stdout.clearLine(0); - process.stdout.cursorTo(0); process.stdout.write( - `Patching existing ${file}. Remaining: ${existing.length}.`, + `Patching existing ${file}. Remaining: ${existing.length}. \r`, ); var text = await fs.readFile(path.join(CACHE_PATH, file)); @@ -257,7 +252,7 @@ const processFile = async (name) => { } } - process.stdout.moveCursor(0, 1); + console.log(); let rates = []; let lastFinished = Date.now(); @@ -278,8 +273,6 @@ const processFile = async (name) => { : 1; const finishTime = averageRate * (assets.length - i); - process.stdout.clearLine(0); - process.stdout.cursorTo(0); process.stdout.write( `Caching asset ${asset}. ` + `${i}/${assets.length - 1} = ${Math.floor( @@ -289,6 +282,8 @@ const processFile = async (name) => { // Date.now() + finishTime, // ).toLocaleTimeString()}`, ); + //not adding to the previous mess, incase the finish time is added back or something + process.stdout.write(" \r"); promises.push(processFile(asset)); // await processFile(asset); -- cgit 1.4.1 From 1c4e6e6c911cd651550c7fe7a1591f468f0b9488 Mon Sep 17 00:00:00 2001 From: TheArcaneBrony Date: Fri, 13 Jan 2023 13:12:12 +0100 Subject: Fix missed moveCursor call Signed-off-by: TheArcaneBrony --- scripts/client.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/client.js b/scripts/client.js index 980ff4bf..3cdd3719 100644 --- a/scripts/client.js +++ b/scripts/client.js @@ -230,7 +230,7 @@ const processFile = async (name) => { assets.push(...newAssets); } - process.stdout.moveCursor(0, 1); + console.log(); var existing = await fs.readdir(CACHE_PATH); while (existing.length > 0) { -- cgit 1.4.1