From 81244b75cd9ebcaa95f9175d1048c2b0e77ae9a2 Mon Sep 17 00:00:00 2001
From: Book Pauk <bookpauk@gmail.com>
Date: Sun, 13 Jan 2019 16:10:46 +0700
Subject: [PATCH] =?UTF-8?q?=D0=A0=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/core/FileDownloader.js | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/server/core/FileDownloader.js b/server/core/FileDownloader.js
index 455b1658..2965afbd 100644
--- a/server/core/FileDownloader.js
+++ b/server/core/FileDownloader.js
@@ -10,21 +10,27 @@ class FileDownloader {
 
         const response = await got(url, {method: 'HEAD'});
 
-        let estSize = 100000;
+        let estSize = 0;
         if (response.headers['content-length']) {
             estSize = response.headers['content-length'];
         }
 
+        let prevProg = 0;
         const request = got(url, {encoding: null}).on('downloadProgress', progress => {
             if (progress.transferred > maxDownloadSize) {
                 errMes = 'file too big';
                 request.cancel();
             }
-            const prog = Math.round(progress.transferred/estSize*100);
-            if (callback)
-                callback((prog > 100 ? 100 : prog));
-            if (prog > 100)
-                estSize *= 1.5;
+
+            let prog = 0;
+            if (estSize)
+                prog = Math.round(progress.transferred/estSize*100);
+            else if (progress.transferred)
+                prog = Math.round(progress.transferred/(progress.transferred + 100000)*100);
+
+            if (prog != prevProg && callback)
+                callback(prog);
+            prevProg = prog;
         });