Raise exception if special attribute could not be set

Second-Hand-Friends · Mar 12, 2022 · 1d5fc64 · 1d5fc64
1 parent e213e8d
commit 1d5fc64
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 19 deletions.
diff --git a/kleinanzeigen_bot/__init__.py b/kleinanzeigen_bot/__init__.py
@@ -11,7 +11,7 @@
 
 from overrides import overrides
 from ruamel.yaml import YAML
-from selenium.common.exceptions import NoSuchElementException, TimeoutException
+from selenium.common.exceptions import NoSuchElementException, TimeoutException, WebDriverException
 from selenium.webdriver.common.by import By
 from selenium.webdriver.support import expected_conditions as EC
 
@@ -405,27 +405,26 @@ def publish_ad(self, ad_file, ad_cfg: dict[str, Any], ad_cfg_orig: dict[str, Any
             self.web_input(By.ID, "pstad-price", ad_cfg["price"])
 
         #############################
-        # set special properties of category
+        # set category specific attributes
         #############################
         if ad_cfg["special_attributes"]:
-            LOG.debug('found %i special attributes', len(ad_cfg["special_attributes"]))
-            for special_property_key, special_property_value in ad_cfg["special_attributes"].items():
-                LOG.debug("trying to add special attribute %s: %s ", special_property_key, special_property_value)
+            LOG.debug('Found %i special attributes', len(ad_cfg["special_attributes"]))
+            for special_attribute_key, special_attribute_value in ad_cfg["special_attributes"].items():
+                LOG.debug("Setting special attribute [%s] to [%s]...", special_attribute_key, special_attribute_value)
                 try:
-                    self.web_select(By.XPATH, "//select[@id='" + special_property_key + "']", special_property_value)
-                    LOG.debug("Successfully set attribute field '%s': '%s' ", special_property_key, special_property_value)
-                except BaseException:
-                    LOG.debug("attribute field '%s' is not of kind dropdown, trying to input as plain text ", special_property_key)
-                try:
-                    self.web_input(By.ID, special_property_key, special_property_value)
-                    LOG.debug("Successfully set attribute field '%s': '%s' ", special_property_key, special_property_value)
-                except BaseException:
-                    LOG.debug("attribute field '%s' is not of kind plain text, trying to input as radio button ", special_property_key)
-                try:
-                    self.web_click(By.XPATH, "//*[@id='" + special_property_key + "']/option[@value='" + special_property_value + "']")
-                    LOG.debug("Successfully set attribute field '%s': '%s' ", special_property_key, special_property_value)
-                except BaseException:
-                    LOG.debug("attribute field '%s' is not of kind radio button. No more options. Wasn't able to set attribute ", special_property_key)
+                    self.web_select(By.XPATH, f"//select[@id='{special_attribute_key}']", special_attribute_value)
+                except WebDriverException:
+                    LOG.debug("Attribute field '%s' is not of kind dropdown, trying to input as plain text...", special_attribute_key)
+                    try:
+                        self.web_input(By.ID, special_attribute_key, special_attribute_value)
+                    except WebDriverException:
+                        LOG.debug("Attribute field '%s' is not of kind plain text, trying to input as radio button...", special_attribute_key)
+                        try:
+                            self.web_click(By.XPATH, f"//*[@id='{special_attribute_key}']/option[@value='{special_attribute_value}']")
+                        except WebDriverException as ex:
+                            LOG.debug("Attribute field '%s' is not of kind radio button.", special_attribute_key)
+                            raise NoSuchElementException(f"Failed to set special attribute [{special_attribute_key}]") from ex
+                LOG.debug("Successfully set attribute field [%s] to [%s]...", special_attribute_key, special_attribute_value)
 
         #############################
         # set description

diff --git a/kleinanzeigen_bot/selenium_mixin.py b/kleinanzeigen_bot/selenium_mixin.py
@@ -283,6 +283,7 @@ def web_select(self, selector_type:By, selector_value:str, selected_value:Any, t
 
         :param timeout: timeout in seconds
         :raises NoSuchElementException: if element could not be found within time
+        :raises UnexpectedTagNameException: if element is not a <select> element
         """
         elem = self.web_await(EC.element_to_be_clickable((selector_type, selector_value)), timeout, NoSuchElementException)
         Select(elem).select_by_value(selected_value)