From 855a874f9eb4a91914d8f21cd469477565234237 Mon Sep 17 00:00:00 2001
From: Nikolai Tschacher <nikolai.tschacher@informatik.hu-berlin.de>
Date: Wed, 4 Sep 2019 12:27:53 +0200
Subject: [PATCH] some minor changes

---
 src/modules/se_scraper.js | 36 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/src/modules/se_scraper.js b/src/modules/se_scraper.js
index 23b58c5..5674754 100644
--- a/src/modules/se_scraper.js
+++ b/src/modules/se_scraper.js
@@ -151,19 +151,19 @@ module.exports = class Scraper {
             this.results[keyword] = {};
             this.result_rank = 1;
 
-            if (this.pluggable && this.pluggable.before_keyword_scraped) {
-                await this.pluggable.before_keyword_scraped({
-                    results: this.results,
-                    num_keywords: this.num_keywords,
-                    num_requests: this.num_requests,
-                    keyword: keyword,
-                });
-            }
-
-            this.page_num = 1;
-
             try {
 
+                if (this.pluggable && this.pluggable.before_keyword_scraped) {
+                    await this.pluggable.before_keyword_scraped({
+                        results: this.results,
+                        num_keywords: this.num_keywords,
+                        num_requests: this.num_requests,
+                        keyword: keyword,
+                    });
+                }
+
+                this.page_num = 1;
+
                 // load scraped page from file if `scrape_from_file` is given
                 if (this.config.scrape_from_file.length <= 0) {
                     await this.search_keyword(keyword);
@@ -286,23 +286,17 @@ module.exports = class Scraper {
                         if (this.config.throw_on_detection === true) {
                             throw( e );
                         } else {
-                            break;
+                            return;
                         }
                     }
                 } else {
                     // some other error, quit scraping process if stuff is broken
-                    if (this.config.is_local === true) {
-                        console.error('You have 30 seconds to fix this.');
-                        await this.sleep(30000);
+                    if (this.config.throw_on_detection === true) {
+                        throw( e );
                     } else {
-                        if (this.config.throw_on_detection === true) {
-                            throw( e );
-                        } else {
-                            break;
-                        }
+                        return;
                     }
                 }
-
             }
         }
     }