Merge pull request #50 from HuiiBuh/features

Fixed download all bug
igdownloader · Jul 17, 2019 · 7e51f8b · 7e51f8b
2 parents b4b0c5c + a0fd4c7
commit 7e51f8b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/chrome/js/downloadAll.js b/chrome/js/downloadAll.js
@@ -3,6 +3,7 @@ const dlAllImage = "v1Nh3 kIKUG  _bz0w";
 const dlAllLoader = "By4nA";
 const dlAllStopClass = "_0mzm- sqdOP yWX7d";
 
+let visited = false;
 
 class DownloadAll {
     /**
@@ -141,6 +142,9 @@ class DownloadAll {
      * Start the video download
      */
     async start() {
+
+        alert("The download starts. Please be patient event after the scrolling.");
+
         //scroll down and get the xhttp requests and the json
         await this.scrollDown();
         await this.requests(this.urls);
@@ -151,14 +155,17 @@ class DownloadAll {
 
         let dlUrl = this.createDownloadImages();
         chrome.runtime.sendMessage({"url": dlUrl, "user": "HuiBuh", "type": "bulk"});
+
+        visited = false;
     }
 
     /**
      * Scrolls down until all images are collected and takes the links to the images
      */
     async scrollDown() {
         await sleep(10);
-        while (document.getElementsByClassName(dlAllLoader).length > 0) {
+        while (document.getElementsByClassName(dlAllLoader).length > 0 || !visited) {
+            visited = true;
             scrollBy(0, 10000);
             if (document.getElementsByClassName(dlAllStopClass).length > 0)
                 return;

diff --git a/firefox/js/downloadAll.js b/firefox/js/downloadAll.js
@@ -3,6 +3,8 @@ const dlAllImage = "v1Nh3 kIKUG  _bz0w";
 const dlAllLoader = "By4nA";
 const dlAllStopClass = "_0mzm- sqdOP yWX7d";
 
+let visited = false;
+
 
 class DownloadAll {
     /**
@@ -141,6 +143,9 @@ class DownloadAll {
      * Start the video download
      */
     async start() {
+
+        alert("The download starts. Please be patient event after the scrolling.");
+
         //scroll down and get the xhttp requests and the json
         await this.scrollDown();
         await this.requests(this.urls);
@@ -151,14 +156,18 @@ class DownloadAll {
 
         let dlUrl = this.createDownloadImages();
         browser.runtime.sendMessage({"url": dlUrl, "user": "HuiBuh", "type": "bulk"});
+
+        visited = false;
     }
 
     /**
      * Scrolls down until all images are collected and takes the links to the images
      */
     async scrollDown() {
         await sleep(10);
-        while (document.getElementsByClassName(dlAllLoader).length > 0) {
+
+        while (document.getElementsByClassName(dlAllLoader).length > 0 || !visited) {
+            visited = true;
             scrollBy(0, 10000);
             if (document.getElementsByClassName(dlAllStopClass).length > 0)
                 return;