uk_bin_collection 0.121.0__py3-none-any.whl → 0.121.1__py3-none-any.whl

uk_bin_collection/uk_bin_collection/councils/LondonBoroughLewisham.py

@@ -1,3 +1,4 @@
+import re
 import time
 
 from bs4 import BeautifulSoup
@@ -27,106 +28,113 @@ class CouncilClass(AbstractGetBinDataClass):
         bindata = {"bins": []}
 
         # Initialize the WebDriver (Chrome in this case)
-        driver = create_webdriver(
+        with create_webdriver(
             web_driver,
             headless,
             "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36",
             __name__,
-        )
+        ) as driver:
 
-        # Step 1: Navigate to the form page
-        driver.get(
-            "https://lewisham.gov.uk/myservices/recycling-and-rubbish/your-bins/collection"
-        )
+            # Step 1: Navigate to the form page
+            driver.get(
+                "https://lewisham.gov.uk/myservices/recycling-and-rubbish/your-bins/collection"
+            )
 
-        try:
-            cookie_accept_button = WebDriverWait(driver, 5).until(
-                EC.element_to_be_clickable(
-                    (By.ID, "CybotCookiebotDialogBodyLevelButtonLevelOptinAllowAll")
+            try:
+                cookie_accept_button = WebDriverWait(driver, 5).until(
+                    EC.element_to_be_clickable(
+                        (By.ID, "CybotCookiebotDialogBodyLevelButtonLevelOptinAllowAll")
+                    )
                 )
+                cookie_accept_button.click()
+            except Exception:
+                print("No cookie consent banner found or already dismissed.")
+
+            # Wait for the form to load
+            WebDriverWait(driver, 10).until(
+                EC.presence_of_element_located((By.CLASS_NAME, "address-finder"))
             )
-            cookie_accept_button.click()
-        except Exception:
-            print("No cookie consent banner found or already dismissed.")
-
-        # Wait for the form to load
-        WebDriverWait(driver, 10).until(
-            EC.presence_of_element_located((By.CLASS_NAME, "address-finder"))
-        )
-
-        # Step 2: Locate the input field for the postcode
-        postcode_input = driver.find_element(By.CLASS_NAME, "js-address-finder-input")
-
-        # Enter the postcode
-        postcode_input.send_keys(user_postcode)  # Replace with your desired postcode
-        time.sleep(1)  # Optional: Wait for the UI to react
-
-        # Step 4: Click the "Find address" button with retry logic
-        find_button = WebDriverWait(driver, 10).until(
-            EC.element_to_be_clickable(
-                (By.CLASS_NAME, "js-address-finder-step-address")
+
+            # Step 2: Locate the input field for the postcode
+            postcode_input = driver.find_element(
+                By.CLASS_NAME, "js-address-finder-input"
             )
-        )
-        find_button.click()
-
-        # Wait for the address selector to appear and options to load
-        WebDriverWait(driver, 10).until(
-            lambda d: len(
-                d.find_element(By.ID, "address-selector").find_elements(
-                    By.TAG_NAME, "option"
+
+            # Enter the postcode
+            postcode_input.send_keys(
+                user_postcode
+            )  # Replace with your desired postcode
+            time.sleep(1)  # Optional: Wait for the UI to react
+
+            # Step 4: Click the "Find address" button with retry logic
+            find_button = WebDriverWait(driver, 10).until(
+                EC.element_to_be_clickable(
+                    (By.CLASS_NAME, "js-address-finder-step-address")
                 )
             )
-            > 1
-        )
-
-        # Select the dropdown and print available options
-        address_selector = driver.find_element(By.ID, "address-selector")
-
-        # Use Select class to interact with the dropdown
-        select = Select(address_selector)
-        if len(select.options) > 1:
-            select.select_by_value(user_uprn)
-        else:
-            print("No additional addresses available to select")
-
-        # Wait until the URL contains the expected substring
-        WebDriverWait(driver, 10).until(
-            EC.url_contains("/find-your-collection-day-result")
-        )
-
-        # Parse the HTML
-        soup = BeautifulSoup(driver.page_source, "html.parser")
-
-        # Extract the main container
-        collection_result = soup.find("div", class_="js-find-collection-result")
-
-        # Extract each collection type and its frequency/day
-        for strong_tag in collection_result.find_all("strong"):
-            bin_type = strong_tag.text.strip()  # e.g., "Food waste"
-            # Extract day from the sibling text
-            schedule_text = (
-                strong_tag.next_sibling.next_sibling.next_sibling.text.strip()
-                .split("on\n")[-1]
-                .replace("\n", "")
-                .replace("\t", "")
+            find_button.click()
+
+            # Wait for the address selector to appear and options to load
+            WebDriverWait(driver, 10).until(
+                lambda d: len(
+                    d.find_element(By.ID, "address-selector").find_elements(
+                        By.TAG_NAME, "option"
+                    )
+                )
+                > 1
             )
-            day = schedule_text.strip().split(".")[0]
 
-            # Extract the next collection date
-            if "Your next collection date is" in schedule_text:
-                start_index = schedule_text.index("Your next collection date is") + len(
-                    "Your next collection date is"
-                )
-                next_collection_date = (
-                    schedule_text[start_index:].strip().split("\n")[0].strip()
-                )
+            # Select the dropdown and print available options
+            address_selector = driver.find_element(By.ID, "address-selector")
+
+            # Use Select class to interact with the dropdown
+            select = Select(address_selector)
+            if len(select.options) > 1:
+                select.select_by_value(user_uprn)
             else:
-                next_collection_date = get_next_day_of_week(day, date_format)
+                print("No additional addresses available to select")
+
+            # Wait until the URL contains the expected substring
+            WebDriverWait(driver, 10).until(
+                EC.url_contains("/find-your-collection-day-result")
+            )
+
+            # Parse the HTML
+            soup = BeautifulSoup(driver.page_source, "html.parser")
 
-            dict_data = {
-                "type": bin_type,
-                "collectionDate": next_collection_date,
-            }
-            bindata["bins"].append(dict_data)
+            # Extract the main container
+            collection_result = soup.find("div", class_="js-find-collection-result")
 
-        return bindata
+            # Extract each collection type and its frequency/day
+            for strong_tag in collection_result.find_all("strong"):
+                bin_type = strong_tag.text.strip()  # e.g., "Food waste"
+                # Extract the sibling text
+                schedule_text = (
+                    strong_tag.next_sibling.next_sibling.next_sibling.text.strip()
+                    .replace("\n", " ")
+                    .replace("\t", " ")
+                )
+
+                # Extract the day using regex
+                print(schedule_text)
+                day_match = re.search(r"on\s*(\w+day)", schedule_text)
+                print(day_match)
+                day = day_match.group(1) if day_match else None
+
+                # Extract the next collection date using regex
+                date_match = re.search(
+                    r"Your next collection date is\s*(\d{2}/\d{2}/\d{4})(.?)",
+                    schedule_text,
+                )
+                if date_match:
+                    next_collection_date = date_match.group(1)
+                else:
+                    next_collection_date = get_next_day_of_week(day, date_format)
+
+                dict_data = {
+                    "type": bin_type,
+                    "collectionDate": next_collection_date,
+                }
+                bindata["bins"].append(dict_data)
+
+            return bindata

{uk_bin_collection-0.121.0.dist-info → uk_bin_collection-0.121.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uk_bin_collection
-Version: 0.121.0
+Version: 0.121.1
 Summary: Python Lib to collect UK Bin Data
 Author: Robert Bradley
 Author-email: robbrad182@gmail.com

{uk_bin_collection-0.121.0.dist-info → uk_bin_collection-0.121.1.dist-info}/RECORD

@@ -141,7 +141,7 @@ uk_bin_collection/uk_bin_collection/councils/LondonBoroughHarrow.py,sha256=kzKwb
 uk_bin_collection/uk_bin_collection/councils/LondonBoroughHavering.py,sha256=6DNX6IShdoEG4FjoyrzrY_HLEu9R2Bgl6PN0bSCbhow,2436
 uk_bin_collection/uk_bin_collection/councils/LondonBoroughHounslow.py,sha256=UOeiOxGMvVMm2UFaqjmQpm7vxzqJNSSN8LM9lAUjs2c,3021
 uk_bin_collection/uk_bin_collection/councils/LondonBoroughLambeth.py,sha256=r9D5lHe5kIRStCd5lRIax16yhb4KTFzzfYEFv1bacWw,2009
-uk_bin_collection/uk_bin_collection/councils/LondonBoroughLewisham.py,sha256=s5RIuNeOpuQd8z_NO1-YdSaq8l3snE5D95SNVd0on9s,4871
+uk_bin_collection/uk_bin_collection/councils/LondonBoroughLewisham.py,sha256=d8rlJDTbY3nj-Zjg6iwvwfe-X13Gq86DGGW6QkQAUW0,5310
 uk_bin_collection/uk_bin_collection/councils/LondonBoroughRedbridge.py,sha256=A_6Sis5hsF53Th04KeadHRasGbpAm6aoaWJ6X8eC4Y8,6604
 uk_bin_collection/uk_bin_collection/councils/LondonBoroughSutton.py,sha256=c2haHOwX7Dy1phVUTv3xaQgM9VeHmFuBwdAgqGcGs8Y,2369
 uk_bin_collection/uk_bin_collection/councils/LutonBoroughCouncil.py,sha256=vScUi_R8FnBddii2_zLlZBLxuh85mKmCm8nKW3zxky0,2758
@@ -285,8 +285,8 @@ uk_bin_collection/uk_bin_collection/councils/YorkCouncil.py,sha256=I2kBYMlsD4bId
 uk_bin_collection/uk_bin_collection/councils/council_class_template/councilclasstemplate.py,sha256=EQWRhZ2pEejlvm0fPyOTsOHKvUZmPnxEYO_OWRGKTjs,1158
 uk_bin_collection/uk_bin_collection/create_new_council.py,sha256=m-IhmWmeWQlFsTZC4OxuFvtw5ZtB8EAJHxJTH4O59lQ,1536
 uk_bin_collection/uk_bin_collection/get_bin_data.py,sha256=YvmHfZqanwrJ8ToGch34x-L-7yPe31nB_x77_Mgl_vo,4545
-uk_bin_collection-0.121.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.121.0.dist-info/METADATA,sha256=f-aX3ZbYEjfWr5ieH7-qxbRqF7ChjB79u73BupT5sIY,17574
-uk_bin_collection-0.121.0.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
-uk_bin_collection-0.121.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.121.0.dist-info/RECORD,,
+uk_bin_collection-0.121.1.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.121.1.dist-info/METADATA,sha256=ZqB1SnI8jyknJKcVIK20CPMBBgHQMIV5jpHIhx1jHFM,17574
+uk_bin_collection-0.121.1.dist-info/WHEEL,sha256=Nq82e9rUAnEjt98J6MlVmMCZb-t9cYE2Ir1kpBmnWfs,88
+uk_bin_collection-0.121.1.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.121.1.dist-info/RECORD,,