-
-
Notifications
You must be signed in to change notification settings - Fork 718
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into repserv_yardwaste
- Loading branch information
Showing
9 changed files
with
279 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
120 changes: 120 additions & 0 deletions
120
custom_components/waste_collection_schedule/waste_collection_schedule/source/eth_erd_hu.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| import json | ||
| import requests | ||
| import datetime | ||
|
|
||
| from bs4 import BeautifulSoup | ||
| from waste_collection_schedule import Collection | ||
|
|
||
| TITLE = "ÉTH (Érd, Diósd, Nagytarcsa, Sóskút, Tárnok)" | ||
| DESCRIPTION = "Source script for www.eth-erd.hu" | ||
| URL = "https://www.eth-erd.hu" | ||
| COUNTRY = "hu" | ||
| TEST_CASES = { | ||
| "Test_1": { | ||
| "city": "Diósd", | ||
| "street": "Diófasor", | ||
| "house_number": 10 | ||
| }, | ||
| "Test_2": { | ||
| "city": "Érd", | ||
| "street": "Hordó", | ||
| "house_number": 3 | ||
| }, | ||
| "Test_3": { | ||
| "city": "Sóskút" | ||
| } | ||
| } | ||
|
|
||
| API_URL = "https://www.eth-erd.hu/trashcalendarget" | ||
|
|
||
| ICON_MAP = { | ||
| "Kommunális": "mdi:trash-can", | ||
| "Szelektív": "mdi:recycle", | ||
| "Zöldhulladék": "mdi:leaf", | ||
| "Papír": "mdi:newspaper", | ||
| "Fenyőfa": "mdi:pine-tree", | ||
| "Üveg": "mdi:glass-fragile", | ||
| } | ||
|
|
||
| NAME_MAP = { | ||
| "Kommunális": "Communal", | ||
| "Szelektív": "Selective", | ||
| "Zöldhulladék": "Green", | ||
| "Papír": "Paper", | ||
| "Fenyőfa": "Pine Tree", | ||
| "Üveg": "Glass", | ||
| } | ||
|
|
||
| CITY_MAP = { | ||
| "diósd": 1, | ||
| "érd": 2, | ||
| "nagytarcsa": 822, | ||
| "sóskút": 3, | ||
| "tárnok": 4, | ||
| } | ||
|
|
||
|
|
||
| class Source: | ||
| def __init__(self, city: str, street: str = "", house_number: int = 1) -> None: | ||
| self._city = city | ||
| self._street = street | ||
| self._house_number = house_number | ||
|
|
||
| def fetch(self): | ||
| session = requests.Session() | ||
|
|
||
| city_id = CITY_MAP.get(self._city.lower()) | ||
| if city_id == None: raise Exception("City not found") | ||
| has_streets = city_id != CITY_MAP["sóskút"] | ||
|
|
||
| if has_streets: | ||
| r = session.post( | ||
| API_URL + "streets", | ||
| data={ | ||
| "sid": city_id | ||
| }, | ||
| headers={ | ||
| "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8", | ||
| "X-Requested-With": "XMLHttpRequest", | ||
| } | ||
| ) | ||
| r.raise_for_status() | ||
| streets = json.loads(r.text)["results"] | ||
| available_streets = [item["text"] for item in streets] | ||
| try: street_id = [item for item in streets if item.get('text') == self._street][0]["id"] | ||
| except IndexError: raise Exception("Street not found, available streets: " + ", ".join(available_streets)) | ||
|
|
||
| r = session.post( | ||
| API_URL, | ||
| data={ | ||
| "wctown": city_id, | ||
| "wcstreet": street_id, | ||
| "wchousenumber": self._house_number, | ||
| } if has_streets else { | ||
| "wctown": city_id, | ||
| }, | ||
| headers={ | ||
| "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8", | ||
| "X-Requested-With": "XMLHttpRequest", | ||
| } | ||
| ) | ||
| r.raise_for_status() | ||
| result: dict = json.loads(r.text) | ||
|
|
||
| entries = [] | ||
|
|
||
| for trash_type_id in result["types"]: | ||
| trash_type = result["types"][trash_type_id] | ||
| trash_icon = ICON_MAP[trash_type["name"]] | ||
| trash_name = NAME_MAP[trash_type["name"]] | ||
|
|
||
| for element in result["routelist"][trash_type_id]: | ||
| entries.append( | ||
| Collection( | ||
| date = datetime.datetime.strptime(element, "%Y-%m-%d").date(), | ||
| t = trash_name, | ||
| icon = trash_icon, | ||
| ) | ||
| ) | ||
|
|
||
| return entries |
52 changes: 52 additions & 0 deletions
52
...components/waste_collection_schedule/waste_collection_schedule/source/warwickdc_gov_uk.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| from datetime import datetime | ||
|
|
||
| import requests | ||
| from bs4 import BeautifulSoup | ||
| from waste_collection_schedule import Collection # type: ignore[attr-defined] | ||
|
|
||
| TITLE = "Warwick District Council" | ||
| DESCRIPTION = "Source for Warwick District Council rubbish collection." | ||
| URL = "https://www.warwickdc.gov.uk" | ||
| TEST_CASES = { | ||
| "Test_001": {"uprn": "100070260258"}, | ||
| "Test_002": {"uprn": "100070258568"}, | ||
| "Test_003": {"uprn": 100070263501}, | ||
| } | ||
| ICON_MAP = { | ||
| "FOOD": "mdi:food", | ||
| "GARDEN": "mdi:leaf", | ||
| "RECYCLING": "mdi:recycle", | ||
| "REFUSE": "mdi:trash-can", | ||
| } | ||
|
|
||
|
|
||
| class Source: | ||
| def __init__(self, uprn): | ||
| self._uprn = str(uprn) | ||
|
|
||
| def fetch(self): | ||
| s = requests.Session() | ||
| r = s.get( | ||
| f"https://estates7.warwickdc.gov.uk/PropertyPortal/Property/Recycling/{self._uprn}" | ||
| ) | ||
| soup = BeautifulSoup(r.text, "html.parser") | ||
|
|
||
| infoboxes = soup.findAll( | ||
| "div", {"class": "col-xs-12 text-center waste-dates margin-bottom-15"} | ||
| ) | ||
|
|
||
| entries = [] | ||
| for box in infoboxes: | ||
| items = box.findAll("p") | ||
| waste_type = items[0].text.strip().split(" ")[0].strip() | ||
| dates = [datetime.strptime(d.text, "%d/%m/%Y").date() for d in items[1:]] | ||
| for date in dates: | ||
| entries.append( | ||
| Collection( | ||
| date=date, | ||
| t=waste_type, | ||
| icon=ICON_MAP.get(waste_type.upper()), | ||
| ) | ||
| ) | ||
|
|
||
| return entries |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| # ÉTH (Érd, Diósd, Nagytarcsa, Sóskút, Tárnok) | ||
|
|
||
| Support for schedules provided by [ÉTH](https://www.eth-erd.hu/hulladeknaptar), serving Diósd, Érd, Nagytarcsa, Sóskút, Tárnok, HU. | ||
|
|
||
| ## Configuration via configuration.yaml | ||
|
|
||
| ```yaml | ||
| waste_collection_schedule: | ||
| sources: | ||
| - name: eth_erd_hu | ||
| args: | ||
| city: CITY_NAME | ||
| street: FULL_STREET_NAME | ||
| house_number: HOUSE_NUMBER | ||
| ``` | ||
| ### Configuration Variables | ||
| **CITY** | ||
| *(string) (required)* | ||
| **STREET** | ||
| *(string) (required)* | ||
| without "utca", "út", etc. | ||
| not required in Sóskút | ||
| **HOUSE_NUMBER** | ||
| *(number) (required)* | ||
| not required in Sóskút | ||
| ## Example | ||
| ```yaml | ||
| waste_collection_schedule: | ||
| sources: | ||
| - name: eth_erd_hu | ||
| args: | ||
| city: Diósd | ||
| street: Diófasor | ||
| house_number: 10 | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| # Warwick District Council | ||
|
|
||
| Support for schedules provided by [Warwick District Council](https://www.warwickdc.gov.uk/info/20465/rubbish_waste_and_recycling). | ||
|
|
||
| ## Configuration via configuration.yaml | ||
|
|
||
| ```yaml | ||
| waste_collection_schedule: | ||
| sources: | ||
| - name: warwickdc_gov_uk | ||
| args: | ||
| uprn: UNIQUE_PROPERTY_REFERENCE_NUMBER | ||
| ``` | ||
| ### Configuration Variables | ||
| **uprn** | ||
| *(string) (required)* | ||
| ## Example using UPRN | ||
| ```yaml | ||
| waste_collection_schedule: | ||
| sources: | ||
| - name: warwickdc_gov_uk | ||
| args: | ||
| uprn: "100070263501" | ||
| ``` | ||
| ## How to find your `UPRN` | ||
|
|
||
| An easy way to find your Unique Property Reference Number (UPRN) is by going to <https://www.findmyaddress.co.uk/> and entering in your address details. | ||
|
|
||
| Alternatively you can inspect the URL on [Warwick District Council](https://www.warwickdc.gov.uk/info/20465/rubbish_waste_and_recycling). Having searched for your collection schedule, your UPRN is the collection of digits at the end of the URL, for example: _https://estates7.warwickdc.gov.uk/PropertyPortal/Property/Recycling/`100070260258`_ |
Oops, something went wrong.