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 05:06:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1089 from Newspicel/master

Browse Source 
Fix CmCityMedia, to now use API without ssl
This commit is contained in:
5ila5
2023-07-16 22:35:30 +02:00
committed by GitHub
parent b3880b3769 b513126bf1
commit 303e9f74f1
2 changed files with 10 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
custom_components/waste_collection_schedule/waste_collection_schedule/source/cmcitymedia_de.py
View File

@@ -19,18 +19,9 @@ def EXTRA_INFO():
return [{"title": s["region"], "url": URL} for s in SERVICE_MAP]
API_URL = "https://sslslim.cmcitymedia.de/v1/{}/waste/{}/dates"
API_URL = "http://slim.cmcitymedia.de/v1/{}/waste/{}/dates"
DATE_FORMAT = "%Y-%m-%d"
class TLSAdapter(requests.adapters.HTTPAdapter):
def init_poolmanager(self, *args, **kwargs):
ctx = ssl.create_default_context()
ctx.set_ciphers("DEFAULT@SECLEVEL=1")
kwargs["ssl_context"] = ctx
return super().init_poolmanager(*args, **kwargs)
class Source:
def __init__(self, hpid, realmid=None, district=None):
self.hpid = hpid
@@ -39,17 +30,13 @@ class Source:
)
self.realmid = realmid if realmid else self.service["realm"]
self.district = district
self.session = requests.Session()
self.session.mount("https://", TLSAdapter())
def fetch(self):
entries = []
district_param = f"?district={self.district}" if self.district else ""
result = self.session.get(
API_URL.format(self.hpid, self.service["realm"]) + district_param
)
result = requests.get(API_URL.format(self.hpid, self.service["realm"]) + district_param)
result.raise_for_status()

37
custom_components/waste_collection_schedule/waste_collection_schedule/wizard/cmcitymedia_de.py
View File

@@ -1,20 +1,8 @@
import requests
import ssl
class TLSAdapter(requests.adapters.HTTPAdapter):
def init_poolmanager(self, *args, **kwargs):
ctx = ssl.create_default_context()
ctx.set_ciphers('DEFAULT@SECLEVEL=1')
kwargs['ssl_context'] = ctx
return super(TLSAdapter, self).init_poolmanager(*args, **kwargs)
def get_waste_types(hpid, realmid):
session = requests.session()
session.mount('https://', TLSAdapter())
r = session.get(f"https://sslslim.cmcitymedia.de/v1/{hpid}/waste/{realmid}/types")
def get_waste_types(hpid, realmid):
r = requests.get(
f"http://slim.cmcitymedia.de/v1/{hpid}/waste/{realmid}/types")
r.raise_for_status()
r = r.json()
@@ -23,10 +11,8 @@ def get_waste_types(hpid, realmid):
return items
def get_waste_districts(hpid, realmid):
session = requests.session()
session.mount('https://', TLSAdapter())
r = session.get(f"https://sslslim.cmcitymedia.de/v1/{hpid}/waste/{realmid}/districts")
r = requests.get(
f"http://slim.cmcitymedia.de/v1/{hpid}/waste/{realmid}/districts")
r.raise_for_status()
r = r.json()
@@ -35,10 +21,7 @@ def get_waste_districts(hpid, realmid):
return items
def get_waste_realms(hpid):
session = requests.session()
session.mount('https://', TLSAdapter())
r = session.get(f"https://sslslim.cmcitymedia.de/v1/{hpid}/waste")
r = requests.get(f"http://slim.cmcitymedia.de/v1/{hpid}/waste")
r.raise_for_status()
r = r.json()
@@ -48,15 +31,11 @@ def get_waste_realms(hpid):
def get_all_hpid():
i_from = 0
i_to = 1000 # currently max i found is 447
i_to = 1000 # currently max hpid found is 447
founds = []
session = requests.session()
session.mount('https://', TLSAdapter())
for i in range(i_from, i_to):
r = session.get(f"https://sslslim.cmcitymedia.de/v1/{i}/waste")
r = requests.get(f"http://slim.cmcitymedia.de/v1/{i}/waste")
if r.status_code == 200:
r = r.json()
items = r["result"][1]["items"]