uk_bin_collection 0.100.0__py3-none-any.whl → 0.102.0__py3-none-any.whl

uk_bin_collection/tests/input.json

@@ -719,6 +719,12 @@
         "wiki_name": "Mid and East Antrim Borough Council",
         "wiki_note": "Pass the house name/number plus the name of the street with the postcode parameter, wrapped in double quotes.  Check the address in the web site first. This version will only pick the first SHOW button returned by the search or if it is fully unique.  The search is not very predictable (e.g. house number 4 returns 14,24,4,44 etc.)."
     },
+    "MidlothianCouncil": {
+        "url": "https://www.midlothian.gov.uk/directory_record/92551426/glenesk_bonnyrigg_eh19_3je",
+        "wiki_command_url_override": "https://www.midlothian.gov.uk/directory_record/XXXXXX/XXXXXX",
+        "wiki_name": "Midlothian Council",
+        "wiki_note": "Follow the instructions [here](https://www.midlothian.gov.uk/info/1054/bins_and_recycling/343/bin_collection_days) until you get the page that shows the weekly collections for your address then copy the URL and replace the URL in the command."
+    },
     "MidSussexDistrictCouncil": {
         "house_number": "OAKLANDS, OAKLANDS ROAD RH16 1SS",
         "postcode": "RH16 1SS",

uk_bin_collection/uk_bin_collection/councils/MidlothianCouncil.py

@@ -0,0 +1,68 @@
+from bs4 import BeautifulSoup
+
+from uk_bin_collection.uk_bin_collection.common import *
+from uk_bin_collection.uk_bin_collection.get_bin_data import AbstractGetBinDataClass
+
+
+# import the wonderful Beautiful Soup and the URL grabber
+class CouncilClass(AbstractGetBinDataClass):
+    """
+    Concrete classes have to implement all abstract operations of the
+    base class. They can also override some operations with a default
+    implementation.
+    """
+
+    def parse_data(self, page: str, **kwargs) -> dict:
+        # Parse the HTML content using BeautifulSoup
+        soup = BeautifulSoup(page.text, features="html.parser")
+
+        # Initialize a dictionary to store the parsed bin data
+        data = {"bins": []}
+
+        # Define a mapping of bin collection labels to their corresponding types
+        bin_types = {
+            "Next recycling collection": "Recycling",
+            "Next grey bin collection": "Grey Bin",
+            "Next brown bin collection": "Brown Bin",
+            "Next food bin collection": "Food Bin",
+        }
+
+        # Locate the <ul> element with the class "data-table"
+        bin_collections = soup.find("ul", {"class": "data-table"})
+
+        # Proceed only if the <ul> element is found
+        if bin_collections:
+            # Retrieve all <li> elements within the <ul>, skipping the first two (not relevant)
+            bin_items = bin_collections.find_all("li")[2:]
+
+            # Iterate through each bin item
+            for bin in bin_items:
+                bin_type = None
+                # Retrieve the bin type from the header if it exists
+                if bin.h2 and bin.h2.text.strip() in bin_types:
+                    bin_type = bin_types[bin.h2.text.strip()]
+
+                bin_collection_date = None
+                # Retrieve the bin collection date from the div if it exists
+                if bin.div and bin.div.text.strip():
+                    try:
+                        # Parse the collection date from the div text and format it
+                        bin_collection_date = datetime.strptime(
+                            bin.div.text.strip(),
+                            "%A %d/%m/%Y",
+                        ).strftime(date_format)
+                    except ValueError:
+                        # If date parsing fails, keep bin_collection_date as None
+                        pass
+
+                # If both bin type and collection date are identified, add to the data
+                if bin_type and bin_collection_date:
+                    data["bins"].append(
+                        {
+                            "type": bin_type,
+                            "collectionDate": bin_collection_date,
+                        }
+                    )
+
+        # Return the parsed data, which may be empty if no bins were found
+        return data

{uk_bin_collection-0.100.0.dist-info → uk_bin_collection-0.102.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: uk_bin_collection
-Version: 0.100.0
+Version: 0.102.0
 Summary: Python Lib to collect UK Bin Data
 Author: Robert Bradley
 Author-email: robbrad182@gmail.com
@@ -98,6 +98,24 @@ This integration can be installed directly via HACS. To install:
 1. Restart your Home Assistant.
 1. In the Home Assistant UI go to `Settings` > `Devices & Services` click `+ Add Integration` and search for `UK Bin Collection Data`.
 
+### Overriding the Bin Icon and Bin Colour
+We realise it is difficult to set a colour from the councils text for the Bin Type and to keep the integration generic we dont capture colour from a council(not all councils supply this as a field), only bin type and next collection date.
+
+When you configure the componenent on the first screen you can set a JSON string to map the bin type to the colour and icon
+
+Here is an example to set the colour and icon for the type `Empty Standard General Waste`. This type is the type returned from the council for the bin. You can do this for multiple bins.
+
+If you miss this on the first setup you can reconfigure it.
+
+```
+{     
+  "Empty Standard General Waste": 
+  {         
+    "icon": "mdi:trash-can",         
+    "color": "blue"     
+  }
+}
+
 ---
 
 ## Standalone Usage

{uk_bin_collection-0.100.0.dist-info → uk_bin_collection-0.102.0.dist-info}/RECORD

@@ -2,7 +2,7 @@ uk_bin_collection/README.rst,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 uk_bin_collection/tests/council_feature_input_parity.py,sha256=DO6Mk4ImYgM5ZCZ-cutwz5RoYYWZRLYx2tr6zIs_9Rc,3843
 uk_bin_collection/tests/features/environment.py,sha256=VQZjJdJI_kZn08M0j5cUgvKT4k3iTw8icJge1DGOkoA,127
 uk_bin_collection/tests/features/validate_council_outputs.feature,sha256=SJK-Vc737hrf03tssxxbeg_JIvAH-ddB8f6gU1LTbuQ,251
-uk_bin_collection/tests/input.json,sha256=zXnq55cYrh5bE9mLnWEk8e0ksHpZWzZJzewZeipG6x8,70569
+uk_bin_collection/tests/input.json,sha256=tzx_1v1h_XLo3-dJHd5vHnX97dIJVHFjjAkC4allAXc,71114
 uk_bin_collection/tests/output.schema,sha256=ZwKQBwYyTDEM4G2hJwfLUVM-5v1vKRvRK9W9SS1sd18,1086
 uk_bin_collection/tests/step_defs/step_helpers/file_handler.py,sha256=Ygzi4V0S1MIHqbdstUlIqtRIwnynvhu4UtpweJ6-5N8,1474
 uk_bin_collection/tests/step_defs/test_validate_council.py,sha256=LrOSt_loA1Mw3vTqaO2LpaDMu7rYJy6k5Kr-EOBln7s,3424
@@ -112,6 +112,7 @@ uk_bin_collection/uk_bin_collection/councils/MansfieldDistrictCouncil.py,sha256=
 uk_bin_collection/uk_bin_collection/councils/MertonCouncil.py,sha256=3Y2Un4xXo1sCcMsudynODSzocV_mMofWkX2JqONDb5o,1997
 uk_bin_collection/uk_bin_collection/councils/MidAndEastAntrimBoroughCouncil.py,sha256=oOWwU5FSgGej2Mv7FQ66N-EzS5nZgmGsd0WnfLWUc1I,5238
 uk_bin_collection/uk_bin_collection/councils/MidSussexDistrictCouncil.py,sha256=AZgC9wmDLEjUOtIFvf0ehF5LHturXTH4DkE3ioPSVBA,6254
+uk_bin_collection/uk_bin_collection/councils/MidlothianCouncil.py,sha256=3K3X7kv1oOJkZm2ivnT8Lx0GAzPefgFSHjruwcFgO7I,2821
 uk_bin_collection/uk_bin_collection/councils/MiltonKeynesCityCouncil.py,sha256=3olsWa77L34vz-c7NgeGK9xmNuR4Ws_oAk5D4UpIkPw,2005
 uk_bin_collection/uk_bin_collection/councils/MoleValleyDistrictCouncil.py,sha256=bvCrC4Qcg0Uzp9zZGcC7-7-oJcMh2cb1VaXfdkB11oc,5257
 uk_bin_collection/uk_bin_collection/councils/NeathPortTalbotCouncil.py,sha256=ychYR2nsyk2UIb8tjWaKrLUT4hxSsHN558l3RqZ0mjw,5635
@@ -217,8 +218,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=4s9ODGPAwPqwXc8SrTX5Wlfmizs3_58iXUtHc4Ir86o,1162
 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.100.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
-uk_bin_collection-0.100.0.dist-info/METADATA,sha256=3ZZbEhXFX2oIm-b-DbCqLelxuboNyfxOohMDxy4C9Wk,16844
-uk_bin_collection-0.100.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-uk_bin_collection-0.100.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
-uk_bin_collection-0.100.0.dist-info/RECORD,,
+uk_bin_collection-0.102.0.dist-info/LICENSE,sha256=vABBUOzcrgfaTKpzeo-si9YVEun6juDkndqA8RKdKGs,1071
+uk_bin_collection-0.102.0.dist-info/METADATA,sha256=rCPerqpfjSgcRhFMn1oXiRd7hNoVZ6DLkAKd_KV4zn4,17630
+uk_bin_collection-0.102.0.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+uk_bin_collection-0.102.0.dist-info/entry_points.txt,sha256=36WCSGMWSc916S3Hi1ZkazzDKHaJ6CD-4fCEFm5MIao,90
+uk_bin_collection-0.102.0.dist-info/RECORD,,