Mobile search fix, less CPU usage, & verbose notifs

main.py

@@ -15,9 +15,9 @@
 
 
 def main():
-    setupLogging()
     args = argumentParser()
     notifier = Notifier(args)
+    setupLogging(args.verbosenotifs, notifier)
     loadedAccounts = setupAccounts()
     for currentAccount in loadedAccounts:
         try:
@@ -26,7 +26,10 @@ def main():
             logging.exception(f"{e.__class__.__name__}: {e}")
 
 
-def setupLogging():
+def setupLogging(verbose_notifs, notifier):
+    ColoredFormatter.verbose_notifs = verbose_notifs
+    ColoredFormatter.notifier = notifier
+
     format = "%(asctime)s [%(levelname)s] %(message)s"
     terminalHandler = logging.StreamHandler(sys.stdout)
     terminalHandler.setFormatter(ColoredFormatter(format))
@@ -83,6 +86,12 @@ def argumentParser() -> argparse.Namespace:
         default=None,
         help="Optional: Discord Webhook URL (ex: https://discord.com/api/webhooks/123456789/ABCdefGhIjKlmNoPQRsTUVwxyZ)",
     )
+    parser.add_argument(
+        "-vn",
+        "--verbosenotifs",
+        action="store_true",
+        help="Optional: Send all the logs to discord/telegram",
+    )
     return parser.parse_args()
 
 
@@ -151,6 +160,7 @@ def executeBot(currentAccount, notifier: Notifier, args: argparse.Namespace):
                 accountPointsCounter = Searches(mobileBrowser).bingSearches(
                     remainingSearchesM
                 )
+        desktopBrowser.webdriver.quit()
 
         logging.info(
             f"[POINTS] You have earned {desktopBrowser.utils.formatNumber(accountPointsCounter - startingPoints)} points today !"

src/loggingColoredFormatter.py

@@ -2,6 +2,9 @@
 
 
 class ColoredFormatter(logging.Formatter):
+    verbose_notifs = False
+    notifier = str()
+
     grey = "\x1b[38;21m"
     blue = "\x1b[38;5;39m"
     yellow = "\x1b[38;5;226m"
@@ -22,5 +25,9 @@ def __init__(self, fmt):
 
     def format(self, record):
         logFmt = self.FORMATS.get(record.levelno)
+
+        if self.verbose_notifs:
+            self.notifier.send(f"[{logging.getLevelName(record.levelno)}] {record.msg}")
+
         formatter = logging.Formatter(logFmt)
         return formatter.format(record)

src/searches.py

@@ -55,6 +55,8 @@ def bingSearches(self, numberOfSearches: int, pointsCounter: int = 0):
 
         i = 0
         search_terms = self.getGoogleTrends(numberOfSearches)
+        self.webdriver.get("https://bing.com")
+
         for word in search_terms:
             i += 1
             logging.info("[BING] " + f"{i}/{numberOfSearches}")
@@ -75,16 +77,26 @@ def bingSearches(self, numberOfSearches: int, pointsCounter: int = 0):
         return pointsCounter
 
     def bingSearch(self, word: str):
+        i = 0
+
         while True:
             try:
-                self.webdriver.get("https://bing.com")
                 self.browser.utils.waitUntilClickable(By.ID, "sb_form_q")
                 searchbar = self.webdriver.find_element(By.ID, "sb_form_q")
+                searchbar.clear()
                 searchbar.send_keys(word)
                 searchbar.submit()
                 time.sleep(random.randint(10, 15))
                 return self.browser.utils.getBingAccountPoints()
             except TimeoutException:
+                if i == 5:
+                    logging.error(
+                        "[BING] "
+                        + "Cancelling mobile searches due to too many retries."
+                    )
+                    return self.browser.utils.getBingAccountPoints()
+
                 logging.error("[BING] " + "Timeout, retrying in 5 seconds...")
                 time.sleep(5)
+                i += 1
                 continue