From 0d2fa16bfdd96ebfc6bdd7cd8a4e4452097a1f28 Mon Sep 17 00:00:00 2001
From: KX-Apple <57068530+AnAppleforlife@users.noreply.github.com>
Date: Sun, 2 May 2021 19:24:36 +0200
Subject: [PATCH] Updated output

---
 funi.js | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/funi.js b/funi.js
index f8f5b73..a45ff52 100644
--- a/funi.js
+++ b/funi.js
@@ -566,7 +566,12 @@ async function downloadStreams(){
             }
             key = crypto.createDecipheriv('aes-128-cbc', key, iv);
             
-            let last = 0;
+            let progress, intervall;
+        
+            function logInfo() {
+                if (progress && progress.percent && progress.transferred)
+                    console.log(`[INFO] Downloaded ${progress.percent.toFixed(2) * 100}% (${(progress.transferred/1024).toFixed(0)}kb/${progress.total?(progress.total/1024).toFixed(0) + 'kb':'unknown'})`);
+            }
 
             let res = (await got({
                 url: chunk.uri,
@@ -575,12 +580,12 @@ async function downloadStreams(){
                 },
                 responseType: 'buffer'
             }).on("downloadProgress", (pro) => {
-                if (pro.percent.toFixed(2) * 100 > last + 5) {
-                    console.log(`[INFO] Downloaded ${pro.percent.toFixed(2) * 100}%`);
-                    last = pro.percent.toFixed(2) * 100;
-                }
+                progress = pro
+                if (intervall === undefined)
+                    intervall = setInterval(logInfo, 2500)
             })
             .catch(error => console.log(`[ERROR] ${error.name}: ${error.code||error.message}`)))
+            clearInterval(intervall)
 
             if (!res.body) { return; }
             let dec = key.update(res.body);
@@ -664,7 +669,12 @@ async function downloadStreams(){
         }
         key = crypto.createDecipheriv('aes-128-cbc', key, iv);
         
-        let last = 0;
+        let progress, intervall;
+        
+        function logInfo() {
+            if (progress && progress.percent && progress.transferred)
+                console.log(`[INFO] Downloaded ${progress.percent.toFixed(2) * 100}% (${(progress.transferred/1024).toFixed(0)}kb/${progress.total?(progress.total/1024).toFixed(0) + 'kb':'unknown'})`);
+        }
 
         let res = (await got({
             url: chunk.uri,
@@ -673,13 +683,12 @@ async function downloadStreams(){
             },
             responseType: 'buffer'
         }).on("downloadProgress", (pro) => {
-            if (pro.percent.toFixed(2) * 100 > last + 5) {
-                console.log(`[INFO] Downloaded ${pro.percent.toFixed(2) * 100}%`);
-                last = pro.percent.toFixed(2) * 100;
-            }
+            progress = pro
+            if (intervall === undefined)
+                intervall = setInterval(logInfo, 2500)
         })
         .catch(error => console.log(`[ERROR] ${error.name}: ${error.code||error.message}`)))
-
+        clearInterval(intervall)
         if (!res.body) { return; }
         let dec = key.update(res.body);
         dec = Buffer.concat([dec, key.final()]);