uk_bin_collection 0.148.0__tar.gz → 0.148.2__tar.gz

{uk_bin_collection-0.148.0 → uk_bin_collection-0.148.2}/PKG-INFO

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

{uk_bin_collection-0.148.0 → uk_bin_collection-0.148.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "uk_bin_collection"
-version = "0.148.0"
+version = "0.148.2"
 description = "Python Lib to collect UK Bin Data"
 readme = "README.md"
 authors = ["Robert Bradley <robbrad182@gmail.com>"]

{uk_bin_collection-0.148.0 → uk_bin_collection-0.148.2}/uk_bin_collection/uk_bin_collection/councils/CheltenhamBoroughCouncil.py

@@ -1,6 +1,6 @@
-# import re
-
 import requests
+from bs4 import BeautifulSoup
+from dateutil.parser import parse
 
 from uk_bin_collection.uk_bin_collection.common import (
     check_postcode,
@@ -232,11 +232,46 @@ class CouncilClass(AbstractGetBinDataClass):
         )
         garden_dates: list[str] = get_dates_every_x_days(week[garden_week], 14, 28)
 
+        # Build a dictionary of bank holiday changes
+        bank_holiday_bins_url = "https://www.cheltenham.gov.uk/bank-holiday-collections"
+        response = requests.get(bank_holiday_bins_url)
+        soup = BeautifulSoup(response.content, "html.parser")
+        response.close()
+        tables = soup.find_all("table")
+
+        # Build a dictionary to modify any bank holiday collections
+        bh_dict = {}
+        for table in tables:
+            # extract table body
+            for row in table.find_all("tr")[1:]:
+                if row.find_all("td")[1].text.strip() == "Normal collection day":
+                    bh_dict[
+                        parse(
+                            row.find_all("td")[0].text.strip(),
+                            dayfirst=True,
+                            fuzzy=True,
+                        ).date()
+                    ] = parse(
+                        row.find_all("td")[0].text.strip(), dayfirst=True, fuzzy=True
+                    ).date()
+                else:
+                    bh_dict[
+                        parse(
+                            row.find_all("td")[0].text.strip(),
+                            dayfirst=True,
+                            fuzzy=True,
+                        ).date()
+                    ] = parse(
+                        row.find_all("td")[1].text.strip(), dayfirst=True, fuzzy=True
+                    ).date()
+
         for refuse_date in refuse_dates:
-            collection_date = (
-                datetime.strptime(refuse_date, "%d/%m/%Y")
-                + timedelta(days=refuse_day_offset)
-            ).strftime("%d/%m/%Y")
+            collection_date = datetime.strptime(refuse_date, "%d/%m/%Y") + timedelta(
+                days=refuse_day_offset
+            )
+            if collection_date in bh_dict:
+                collection_date = bh_dict[collection_date]
+            collection_date = collection_date.strftime("%d/%m/%Y")
 
             dict_data = {
                 "type": "Refuse Bin",
@@ -246,10 +281,12 @@ class CouncilClass(AbstractGetBinDataClass):
 
         for recycling_date in recycling_dates:
 
-            collection_date = (
-                datetime.strptime(recycling_date, "%d/%m/%Y")
-                + timedelta(days=recycling_day_offset)
-            ).strftime("%d/%m/%Y")
+            collection_date = datetime.strptime(recycling_date, "%d/%m/%Y") + timedelta(
+                days=recycling_day_offset
+            )
+            if collection_date in bh_dict:
+                collection_date = bh_dict[collection_date]
+            collection_date = collection_date.strftime("%d/%m/%Y")
 
             dict_data = {
                 "type": "Recycling Bin",
@@ -259,10 +296,12 @@ class CouncilClass(AbstractGetBinDataClass):
 
         for garden_date in garden_dates:
 
-            collection_date = (
-                datetime.strptime(garden_date, "%d/%m/%Y")
-                + timedelta(days=garden_day_offset)
-            ).strftime("%d/%m/%Y")
+            collection_date = datetime.strptime(garden_date, "%d/%m/%Y") + timedelta(
+                days=garden_day_offset
+            )
+            if collection_date in bh_dict:
+                collection_date = bh_dict[collection_date]
+            collection_date = collection_date.strftime("%d/%m/%Y")
 
             dict_data = {
                 "type": "Garden Waste Bin",
@@ -279,10 +318,12 @@ class CouncilClass(AbstractGetBinDataClass):
 
             for food_date in food_dates:
 
-                collection_date = (
-                    datetime.strptime(food_date, "%d/%m/%Y")
-                    + timedelta(days=food_day_offset)
-                ).strftime("%d/%m/%Y")
+                collection_date = datetime.strptime(food_date, "%d/%m/%Y") + timedelta(
+                    days=food_day_offset
+                )
+                if collection_date in bh_dict:
+                    collection_date = bh_dict[collection_date]
+                collection_date = collection_date.strftime("%d/%m/%Y")
 
                 dict_data = {
                     "type": "Food Waste Bin",
@@ -313,10 +354,12 @@ class CouncilClass(AbstractGetBinDataClass):
 
             for food_date in food_dates_first:
 
-                collection_date = (
-                    datetime.strptime(food_date, "%d/%m/%Y")
-                    + timedelta(days=food_day_offset)
-                ).strftime("%d/%m/%Y")
+                collection_date = datetime.strptime(food_date, "%d/%m/%Y") + timedelta(
+                    days=food_day_offset
+                )
+                if collection_date in bh_dict:
+                    collection_date = bh_dict[collection_date]
+                collection_date = collection_date.strftime("%d/%m/%Y")
 
                 dict_data = {
                     "type": "Food Waste Bin",
@@ -325,10 +368,12 @@ class CouncilClass(AbstractGetBinDataClass):
                 bindata["bins"].append(dict_data)
             for food_date in food_dates_second:
 
-                collection_date = (
-                    datetime.strptime(food_date, "%d/%m/%Y")
-                    + timedelta(days=second_week_offset)
-                ).strftime("%d/%m/%Y")
+                collection_date = datetime.strptime(food_date, "%d/%m/%Y") + timedelta(
+                    days=second_week_offset
+                )
+                if collection_date in bh_dict:
+                    collection_date = bh_dict[collection_date]
+                collection_date = collection_date.strftime("%d/%m/%Y")
 
                 dict_data = {
                     "type": "Food Waste Bin",

{uk_bin_collection-0.148.0 → uk_bin_collection-0.148.2}/uk_bin_collection/uk_bin_collection/councils/EastLindseyDistrictCouncil.py

@@ -33,7 +33,7 @@ class CouncilClass(AbstractGetBinDataClass):
             # Wait for the postcode field to appear then populate it
             inputElement_postcode = WebDriverWait(driver, 30).until(
                 EC.presence_of_element_located(
-                    (By.ID, "WASTECOLLECTIONDAYS202425_LOOKUP_ADDRESSLOOKUPPOSTCODE")
+                    (By.ID, "WASTECOLLECTIONDAYS202526_LOOKUP_ADDRESSLOOKUPPOSTCODE")
                 )
             )
             inputElement_postcode.send_keys(user_postcode)
@@ -41,7 +41,7 @@ class CouncilClass(AbstractGetBinDataClass):
             # Click search button
             findAddress = WebDriverWait(driver, 10).until(
                 EC.presence_of_element_located(
-                    (By.ID, "WASTECOLLECTIONDAYS202425_LOOKUP_ADDRESSLOOKUPSEARCH")
+                    (By.ID, "WASTECOLLECTIONDAYS202526_LOOKUP_ADDRESSLOOKUPSEARCH")
                 )
             )
             findAddress.click()
@@ -51,7 +51,7 @@ class CouncilClass(AbstractGetBinDataClass):
                 EC.element_to_be_clickable(
                     (
                         By.XPATH,
-                        "//select[@id='WASTECOLLECTIONDAYS202425_LOOKUP_ADDRESSLOOKUPADDRESS']//option[contains(., '"
+                        "//select[@id='WASTECOLLECTIONDAYS202526_LOOKUP_ADDRESSLOOKUPADDRESS']//option[contains(., '"
                         + user_paon
                         + "')]",
                     )
@@ -61,7 +61,7 @@ class CouncilClass(AbstractGetBinDataClass):
             # Wait for the submit button to appear, then click it to get the collection dates
             submit = WebDriverWait(driver, 10).until(
                 EC.presence_of_element_located(
-                    (By.ID, "WASTECOLLECTIONDAYS202425_LOOKUP_FIELD2_NEXT")
+                    (By.ID, "WASTECOLLECTIONDAYS202526_LOOKUP_FIELD2_NEXT")
                 )
             )
             submit.click()

{uk_bin_collection-0.148.0 → uk_bin_collection-0.148.2}/uk_bin_collection/uk_bin_collection/councils/HarrogateBoroughCouncil.py

@@ -37,7 +37,7 @@ class CouncilClass(AbstractGetBinDataClass):
         collections = []
 
         # Find section with bins in
-        table = soup.find_all("table", {"class": "hbcRounds"})[1]
+        table = soup.find_all("table", {"class": "hbcRounds"})[-1]
 
         # For each bin section, get the text and the list elements
         for row in table.find_all("tr"):