Merge pull request #440 from Hari-Nagarajan/hotfix

Hot fix 0.5.3

cli/cli.py

@@ -142,10 +142,6 @@ def amazon(
     slow_mode,
     p,
 ):
-    if no_image:
-        selenium_utils.no_amazon_image()
-    else:
-        selenium_utils.yes_amazon_image()
 
     notification_handler.sound_enabled = not disable_sound
     if not notification_handler.sound_enabled:
@@ -162,6 +158,7 @@ def amazon(
         disable_presence=disable_presence,
         slow_mode=slow_mode,
         encryption_pass=p,
+        no_image=no_image,
     )
     try:
         amzn_obj.run(delay=delay, test=test)

stores/amazon.py

@@ -145,6 +145,7 @@
     "Currently, there are no sellers that can deliver this item to your location.",
     "There are currently no listings for this search. Try a different refinement.",
     "There are currently no listings for this search. Try a different refinement.",
+    "There are currently no listings for this product in . Try changing the condition type.",
 ]
 
 # OFFER_PAGE_TITLES = ["Amazon.com: Buying Choices:"]
@@ -191,6 +192,7 @@ def __init__(
         disable_presence=False,
         slow_mode=False,
         encryption_pass=None,
+        no_image=False,
     ):
         self.notification_handler = notification_handler
         self.asin_list = []
@@ -211,6 +213,7 @@ def __init__(
         self.slow_mode = slow_mode
         self.setup_driver = True
         self.headless = headless
+        self.no_image = no_image
 
         presence.enabled = not disable_presence
         presence.start_presence()
@@ -522,6 +525,7 @@ def check_stock(self, asin, reserve_min, reserve_max, retry=0):
                 )
         fail_counter = 0
         presence.searching_update()
+
         while True:
             try:
                 self.get_page(f.url)
@@ -1013,7 +1017,7 @@ def save_page_source(self, page):
             f.write(page_source)
 
     def wait_for_page_change(self, page_title, timeout=3):
-        time_to_end = time.time() + timeout
+        time_to_end = self.get_timeout(timeout=timeout)
         while time.time() < time_to_end and (
             self.driver.title == page_title or not self.driver.title
         ):
@@ -1044,13 +1048,30 @@ def get_webdriver_pids(self):
             self.webdriver_child_pids.append(child.pid)
 
     def get_page(self, url):
-        current_page = self.driver.title
+        check_cart_element = []
+        current_page = []
+        try:
+            check_cart_element = self.driver.find_element_by_xpath(
+                '//*[@id="nav-cart"]'
+            )
+        except exceptions.NoSuchElementException:
+            current_page = self.driver.title
         try:
             self.driver.get(url=url)
         except exceptions.WebDriverException or exceptions.TimeoutException:
             log.error(f"failed to load page at url: {url}")
             return False
-        if self.wait_for_page_change(current_page):
+        if check_cart_element:
+            timeout = self.get_timeout()
+            while True:
+                try:
+                    check_cart_element.is_displayed()
+                except exceptions.StaleElementReferenceException:
+                    break
+                if time.time() > timeout:
+                    return False
+            return True
+        elif self.wait_for_page_change(current_page):
             return True
         else:
             log.error("page did not change")
@@ -1102,6 +1123,10 @@ def create_driver(self):
                 "profile.password_manager_enabled": False,
                 "credentials_enable_service": False,
             }
+            if self.no_image:
+                prefs["profile.managed_default_content_settings.images"] = 2
+            else:
+                prefs["profile.managed_default_content_settings.images"] = 0
             options.add_experimental_option("prefs", prefs)
             options.add_argument(f"user-data-dir=.profile-amz")
             if not self.slow_mode:

utils/selenium_utils.py

@@ -31,16 +31,6 @@ def __call__(self, driver):
                 pass
 
 
-def no_amazon_image():
-    prefs = {"profile.managed_default_content_settings.images": 2}
-    options.add_experimental_option("prefs", prefs)
-
-
-def yes_amazon_image():
-    prefs = {"profile.managed_default_content_settings.images": 0}
-    options.add_experimental_option("prefs", prefs)
-
-
 def wait_for_element(d, e_id, time=30):
     """
     Uses webdriver(d) to wait for page title(title) to become visible

utils/version.py

@@ -4,7 +4,7 @@
 
 LATEST_URL = "https://api.github.com/repos/Hari-Nagarajan/fairgame/releases/latest"
 
-version = "0.5.2"
+version = "0.5.3"
 
 
 def check_version():