backup

custom_components/afvalwijzer/collector/icalendar.py

@@ -12,8 +12,7 @@ def get_waste_data_raw(
     postal_code,
     street_number,
     suffix,
-):  # sourcery skip: avoid-builtin-shadow
-
+):
     if provider not in SENSOR_COLLECTORS_ICALENDAR.keys():
         raise ValueError(f"Invalid provider: {provider}, please verify")
 

custom_components/afvalwijzer/collector/opzet.py

@@ -17,6 +17,7 @@ def get_waste_data_raw(
 
     try:
         bag_id = None
+        suffix = suffix.strip().upper()
         _verify = provider != "suez"
         url = f"{SENSOR_COLLECTORS_OPZET[provider]}/rest/adressen/{postal_code}-{street_number}"
         raw_response = requests.get(url, verify=_verify)

custom_components/afvalwijzer/const/const.py

@@ -5,7 +5,7 @@ _LOGGER = logging.getLogger(__name__)
 
 API = "api"
 NAME = "afvalwijzer"
-VERSION = "2022.11.02"
+VERSION = "2023.01.01"
 ISSUE_URL = "https://github.com/xirixiz/homeassistant-afvalwijzer/issues"
 
 SENSOR_COLLECTOR_TO_URL = {

custom_components/afvalwijzer/manifest.json

@@ -1,7 +1,7 @@
 {
   "domain": "afvalwijzer",
   "name": "Afvalwijzer",
-  "version": "2022.11.02",
+  "version": "2023.01.01",
   "iot_class": "cloud_polling",
   "documentation": "https://github.com/xirixiz/homeassistant-afvalwijzer/blob/master/README.md",
   "issue_tracker": "https://github.com/xirixiz/homeassistant-afvalwijzer/issues",
@@ -11,4 +11,4 @@
     "@xirixiz"
   ],
   "requirements": []
-}
+}

custom_components/afvalwijzer/sensor.py

@@ -40,7 +40,7 @@ PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
         vol.Optional(CONF_SUFFIX, default=""): cv.string,
         vol.Optional(CONF_EXCLUDE_PICKUP_TODAY, default="true"): cv.string,
         vol.Optional(CONF_EXCLUDE_LIST, default=""): cv.string,
-        vol.Optional(CONF_DEFAULT_LABEL, default="Geen"): cv.string,
+        vol.Optional(CONF_DEFAULT_LABEL, default="geen"): cv.string,
         vol.Optional(CONF_ID.strip().lower(), default=""): cv.string,
     }
 )
@@ -77,7 +77,7 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
     except ValueError as err:
         _LOGGER.error(f"Check afvalwijzer platform settings {err.args}")
 
-    fetch_data = AfvalwijzerData(config)
+    fetch_data = AfvalwijzerData(hass, config)
 
     waste_types_provider = collector.waste_types_provider
     _LOGGER.debug(f"Generating waste_types_provider list = {waste_types_provider}")
@@ -98,7 +98,8 @@ async def async_setup_platform(hass, config, async_add_entities, discovery_info=
 
 
 class AfvalwijzerData(object):
-    def __init__(self, config):
+    def __init__(self, hass, config):
+        self._hass = hass
         self.config = config
 
     @Throttle(MIN_TIME_BETWEEN_UPDATES)

custom_components/afvalwijzer/tests/test_module.py

@@ -24,7 +24,7 @@ from ..collector.main_collector import MainCollector
 # Common
 suffix = ""
 exclude_pickup_today = "True"
-default_label = "Geen"
+default_label = "geen"
 exclude_list = ""
 
 # DeAfvalapp
@@ -42,6 +42,11 @@ exclude_list = ""
 # postal_code = "5146eg"
 # street_number = "1"
 
+provider = "rmn"
+postal_code = "3701XK"
+street_number = "24"
+suffix = "b"
+
 # Opzet
 # provider = "prezero"
 # postal_code = "6665CN"
@@ -54,9 +59,9 @@ exclude_list = ""
 # suffix = "C"
 
 # Ximmio
-provider = "meerlanden"
-postal_code = "2121xt"
-street_number = "38"
+# provider = "meerlanden"
+# postal_code = "2121xt"
+# street_number = "38"
 
 # Ximmio
 # provider = "acv"