fixed a bug in punchcard

Author: AnthonyZJiang

helper/browser.py

@@ -258,8 +258,7 @@ def click_by_xpath(self, xpath) -> bool:
         except WebDriverException:
             logging.exception(
                 msg=f'Webdriver Error for click by xpath to {xpath} object')
-        finally:
-            return False
+        return False
 
     def clear_by_id(self, obj_id) -> bool:
         """

ms_rewards.py

@@ -107,8 +107,8 @@ def get_login_info():
             msr.work(flag_pc=parser.pc_mode, flag_mob=parser.mobile_mode,
                      flag_quiz=parser.quiz_mode)
 
-    except WebDriverException:
-        logging.exception(msg='Failure at main()')
+    except Exception:
+        logging.exception('An error has occurred.', exc_info=True)
     finally:
         logging.info(msg='--------------------------------------------------')
         logging.info(msg='-----------------------End------------------------')

msreward/worker/dashboard/punchcard.py

@@ -32,10 +32,8 @@ def _click_through_punch_card(self, max_attempts=5):
         for _ in range(max_attempts):
             try:
                 if not self._browser.click_by_xpath('//a[@class= "offer-cta"]/child::button[contains(@class, "btn-primary")]'):
-                    self._browser.close()
-                    self._browser.goto_latest_window()
                     break
-                time.sleep(4)
+                time.sleep(1)
                 self._browser.goto_latest_window()
                 self._browser.close()
                 self._browser.goto_latest_window()