From 92006d864f3b9d3455bb1361337e50bfac0a4f30 Mon Sep 17 00:00:00 2001
From: Pijus Kamandulis <pkpjuklas@gmail.com>
Date: Wed, 8 Apr 2020 23:26:50 +0300
Subject: [PATCH] TTDL-20 Wait for error/items beefore quiting

---
 scraper.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scraper.js b/scraper.js
index fc374e6..8621ecc 100644
--- a/scraper.js
+++ b/scraper.js
@@ -129,9 +129,12 @@ getCurrentVideo = function() {
     };
 };
 
+scrollBottom = () => window.scrollTo(0, document.body.scrollHeight);
+
 scrollWhileNew = function(finishCallback) {
     var state = { count: 0 };
     var intervalID = window.setInterval(x => {
+        scrollBottom();
         var oldCount = state.count;
         state.count = document.getElementsByClassName(optStrings.classes.feedVideoItem).length;
         if(currentState.limit > 0) {
@@ -143,13 +146,13 @@ scrollWhileNew = function(finishCallback) {
         if(checkForErrors()) {
             window.clearInterval(intervalID);
             return;
+        } else if (state.count == 0) {
+            return;
         }
         if (oldCount !== state.count) {
             currentState.preloadCount = state.count;
-            window.scrollTo(0, document.body.scrollHeight);
         } else {
             if (document.querySelector(optStrings.selectors.feedLoading)) {
-                window.scrollTo(0, document.body.scrollHeight);
                 return;
             }
             window.clearInterval(intervalID);