uk_bin_collection 0.82.0__py3-none-any.whl → 0.83.0__py3-none-any.whl

uk_bin_collection/tests/input.json

@@ -283,10 +283,10 @@
         "wiki_name": "Doncaster Council"
     },
     "DorsetCouncil": {
-        "url": "https://gi.dorsetcouncil.gov.uk/mapping/mylocal/viewresults/100040711049",
-        "wiki_command_url_override": "https://gi.dorsetcouncil.gov.uk/mapping/mylocal/viewresults/XXXXXXXX",
-        "wiki_name": "Dorset Council",
-        "wiki_note": "Replace XXXXXXXX with UPRN."
+        "skip_get_url": true,
+        "url": "https://www.dorsetcouncil.gov.uk/",
+        "uprn": "100040711049",
+        "wiki_name": "Dorset Council"
     },
     "DoverDistrictCouncil": {
         "url": "https://collections.dover.gov.uk/property/100060908340",
@@ -393,11 +393,11 @@
         "wiki_note": "Pass the house name/number in the house number parameter, wrapped in double quotes"
     },
     "GedlingBoroughCouncil": {
-        "house_number": "Valeside Gardens",
+        "house_number": "Friday G4, Friday J",
         "skip_get_url": true,
         "url": "https://www.gedling.gov.uk/",
         "wiki_name": "Gedling Borough Council",
-        "wiki_note": "Pass the street name into the -n parameter. Use [this](https://apps.gedling.gov.uk/refuse/search.aspx) to help work out a street search that is unique. Known issues: 1) If multiple streets returned, it will pick the first and these may have different bin schedules. 2) This data is hand entered as council only provide non-parseable non-accessible PDFs - Please double check for any issues. 2b) Data is only included until end of Nov 2024 (refuse) and March 2024 (Garden). Data will need to be updated by hand after these dates."
+        "wiki_note": "Use [this site](https://www.gbcbincalendars.co.uk/) to find the collections for your address. Use the -n parameter to add them in a comma-separated list inside quotes, such as: 'Friday G4, Friday J'."
     },
     "GlasgowCityCouncil": {
         "url": "https://www.glasgow.gov.uk/forms/refuseandrecyclingcalendar/PrintCalendar.aspx?UPRN=906700034497",

uk_bin_collection/uk_bin_collection/common.py

@@ -106,6 +106,15 @@ def get_date_with_ordinal(date_number: int) -> str:
         else {1: "st", 2: "nd", 3: "rd"}.get(date_number % 10, "th")
     )
 
+def has_numbers(inputString: str) -> bool:
+    """
+
+    :rtype: bool
+    :param inputString: String to check for numbers
+    :return: True if any numbers are found in input string
+    """
+    return any(char.isdigit() for char in inputString)
+
 
 def remove_ordinal_indicator_from_date_string(date_string: str) -> str:
     """

uk_bin_collection/uk_bin_collection/councils/DorsetCouncil.py

@@ -14,38 +14,22 @@ class CouncilClass(AbstractGetBinDataClass):
     def parse_data(self, page: str, **kwargs) -> dict:
         data = {"bins": []}
         collections = []
-
-        # Parse the page and find all the result boxes
-        soup = BeautifulSoup(page.text, features="html.parser")
-        soup.prettify()
-        results = soup.find_all("li", {"class": "resultListItem"})
-
-        # If the result box has a wanted string in, we can use it. Check the contents of each box and find the
-        # desired text and dates
-        for r in results:
-            if "Your next" in r.text:
-                if type(r.contents[10]) is element.NavigableString:
-                    bin_text = r.contents[10].text.split(" ")[2].title() + " bin"
-                    bin_date = datetime.strptime(
-                        remove_ordinal_indicator_from_date_string(
-                            r.contents[11].text.strip()
-                        ),
-                        "%A %d %B %Y",
-                    )
-                else:
-                    bin_text = r.contents[11].text.split(" ")[2].title() + " bin"
-                    bin_date = datetime.strptime(
-                        remove_ordinal_indicator_from_date_string(
-                            r.contents[12].text.strip()
-                        ),
-                        "%A %d %B %Y",
-                    )
-
-                if bin_date.date() >= datetime.now().date():
-                    collections.append((bin_text, bin_date))
-
-                # Sort the text and date elements by date
-                ordered_data = sorted(collections, key=lambda x: x[1])
+        url_base = "https://geoapi.dorsetcouncil.gov.uk/v1/services/"
+        url_types = ["recyclingday", "refuseday", "foodwasteday", "gardenwasteday"]
+
+        uprn = kwargs.get("uprn")
+        # Check the UPRN is valid
+        check_uprn(uprn)
+
+        for url_type in url_types:
+            response = requests.get(f"{url_base}{url_type}/{uprn}")
+            if response.status_code != 200:
+                raise ConnectionError(f"Could not fetch from {url_type} endpoint")
+            json_data = response.json()["values"][0]
+            collections.append((f"{json_data.get('type')} bin", datetime.strptime(json_data.get('dateNextVisit'), "%Y-%m-%d")))
+
+        # Sort the text and date elements by date
+        ordered_data = sorted(collections, key=lambda x: x[1])
 
         # Put the elements into the dictionary
         for item in ordered_data: