sascha_hemi/hacs_waste_collection_schedule
1
0
Fork 0
mirror of https://github.com/sascha-hemi/hacs_waste_collection_schedule.git synced 2026-03-21 04:06:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #811 from mampfes/westberk

Browse Source 
fix westberks_gov_uk
This commit is contained in:
Steffen Zimmermann
2023-03-28 08:14:26 +02:00
committed by GitHub
parent 736f6881a4 83208b2fa9
commit 59107c0b35
1 changed files with 70 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
custom_components/waste_collection_schedule/waste_collection_schedule/source/westberks_gov_uk.py
View File

@@ -1,9 +1,8 @@
import json
import time
from datetime import date, datetime
import time
import json
import requests
from waste_collection_schedule import Collection
TITLE = "West Berkshire Council"
@@ -11,9 +10,13 @@ DESCRIPTION = "Source for westberks.gov.uk services for West Berkshire Council"
URL = "https://westberks.gov.uk"
TEST_CASES = {
"known_uprn": {"uprn": "100080241094"},
"unknown_uprn_by_name": {"postcode": "RG7 6NZ", "housenumberorname": "PARROG HOUSE"},
"known_uprn as number": {"uprn": 100081026602},
"unknown_uprn_by_name": {
"postcode": "RG7 6NZ",
"housenumberorname": "PARROG HOUSE",
},
"unknown_uprn_by_number": {"postcode": "RG18 4QU", "housenumberorname": "6"},
"unknown_uprn_business": {"postcode": "RG18 4GE", "housenumberorname": "3"}
"unknown_uprn_business": {"postcode": "RG18 4GE", "housenumberorname": "3"},
}
ICON_MAP = {
@@ -28,11 +31,12 @@ SEARCH_URLS = {
COLLECTIONS = {"Rubbish", "Recycling"}
class Source:
def __init__(
self, uprn=None, postcode=None, housenumberorname=None
): # argX correspond to the args dict in the source configuration
self._uprn = uprn
self._uprn = str(uprn).zfill(12) if uprn is not None else None
self._postcode = postcode
self._housenumberorname = housenumberorname
@@ -43,21 +47,27 @@ class Source:
# Find the UPRN based on the postcode and the property name/number
if self._uprn is None:
self._postcode = self._postcode.strip()
jsonrpc = {"id": str(int(time.time())),"method": "location.westberks.echoPostcodeFinder","params": {"provider": "", "postcode": self._postcode}}
args = { "callback": "HomeAssistant", "jsonrpc": json.dumps(jsonrpc), "_": 0 }
r = requests.get(SEARCH_URLS["uprn_search"], params = args)
jsonrpc = {
"id": str(int(time.time())),
"method": "location.westberks.echoPostcodeFinder",
"params": {"provider": "", "postcode": self._postcode},
}
args = {"callback": "HomeAssistant", "jsonrpc": json.dumps(jsonrpc), "_": 0}
r = requests.get(SEARCH_URLS["uprn_search"], params=args)
# I don't really know python so there *must* be a better way to do these four lines!
response_str = r.content.decode("utf-8")
data_length = len(response_str) -1
data_length = len(response_str) - 1
response_sub = response_str[14:data_length]
address_data = json.loads(response_sub)
propertyUprns = address_data['result']
propertyUprns = address_data["result"]
for match in propertyUprns:
if match['line1'].startswith(self._housenumberorname):
if match["line1"].startswith(self._housenumberorname):
self._uprn = match["udprn"]
if match['buildingnumber'].startswith(self._housenumberorname): # no evidence (yet) that their database uses this
if match["buildingnumber"].startswith(
self._housenumberorname
): # no evidence (yet) that their database uses this
self._uprn = match["udprn"]
entries = []
@@ -66,11 +76,21 @@ class Source:
if self._uprn is not None:
# POST request - one for each type as it is a separate method in the api
rubbish_args = {"jsonrpc":"2.0","id":str(int(time.time())) ,"method":"goss.echo.westberks.forms.getNextRubbishCollectionDate","params":{"uprn":self._uprn}}
recycling_args = {"jsonrpc":"2.0","id":str(int(time.time())),"method":"goss.echo.westberks.forms.getNextRecyclingCollectionDate","params":{"uprn":self._uprn}}
r = session.post(SEARCH_URLS["collection_search"], json = rubbish_args)
rubbish_args = {
"jsonrpc": "2.0",
"id": str(int(time.time())),
"method": "goss.echo.westberks.forms.getNextRubbishCollectionDate",
"params": {"uprn": self._uprn},
}
recycling_args = {
"jsonrpc": "2.0",
"id": str(int(time.time())),
"method": "goss.echo.westberks.forms.getNextRecyclingCollectionDate",
"params": {"uprn": self._uprn},
}
r = session.post(SEARCH_URLS["collection_search"], json=rubbish_args)
rubbish_data = json.loads(r.content)
r = session.post(SEARCH_URLS["collection_search"], json = recycling_args)
r = session.post(SEARCH_URLS["collection_search"], json=recycling_args)
recycling_data = json.loads(r.content)
# if subtext is empty, use datetext
@@ -78,12 +98,20 @@ class Source:
# Extract dates from json
waste_type = "Rubbish"
if not rubbish_data['result']['nextRubbishDateSubText']:
dt_str = rubbish_data['result']['nextRubbishDateText'] + " " + str(date.today().year)
if not rubbish_data["result"]["nextRubbishDateSubText"]:
dt_str = (
rubbish_data["result"]["nextRubbishDateText"]
+ " "
+ str(date.today().year)
)
else:
if len(rubbish_data['result']['nextRubbishDateText'])<12:
dt_str = rubbish_data['result']['nextRubbishDateSubText'] + " " + str(date.today().year)
dt_zulu = datetime.strptime(dt_str, '%A %d %B %Y')
if len(rubbish_data["result"]["nextRubbishDateText"]) < 12:
dt_str = (
rubbish_data["result"]["nextRubbishDateSubText"]
+ " "
+ str(date.today().year)
)
dt_zulu = datetime.strptime(dt_str, "%A %d %B %Y")
dt_local = dt_zulu.astimezone(None)
entries.append(
Collection(
@@ -94,12 +122,20 @@ class Source:
)
waste_type = "Recycling"
if not recycling_data['result']['nextRecyclingDateSubText']:
dt_str = recycling_data['result']['nextRecyclingDateText'] + " " + str(date.today().year)
if not recycling_data["result"]["nextRecyclingDateSubText"]:
dt_str = (
recycling_data["result"]["nextRecyclingDateText"]
+ " "
+ str(date.today().year)
)
else:
if len(recycling_data['result']['nextRecyclingDateText'])<12:
dt_str = recycling_data['result']['nextRecyclingDateSubText'] + " " + str(date.today().year)
dt_zulu = datetime.strptime(dt_str, '%A %d %B %Y')
if len(recycling_data["result"]["nextRecyclingDateText"]) < 12:
dt_str = (
recycling_data["result"]["nextRecyclingDateSubText"]
+ " "
+ str(date.today().year)
)
dt_zulu = datetime.strptime(dt_str, "%A %d %B %Y")
dt_local = dt_zulu.astimezone(None)
entries.append(
Collection(