Merge pull request #112 from xirixiz/dev_release

Improvements and breaking changes
xirixiz · Oct 29, 2020 · cf96e3d · cf96e3d
2 parents d21b053 + e7458e4
commit cf96e3d
Show file tree

Hide file tree

Showing 8 changed files with 354 additions and 358 deletions.
diff --git a/INFO.md b/INFO.md
@@ -1,30 +1,15 @@
 
 ## Example configuration
 
-###### SENSOR - CONFIGURATION.YAML - SCRAPER (DEFAULT)
+###### SENSOR - CONFIGURATION.YAML
 ```yaml
   sensor:
     - platform: afvalwijzer
       provider: mijnafvalwijzer        # (required, default = mijnafvalwijzer) either choose mijnafvalwijzer, rova or afvalstoffendienstkalender
-      postal_code: 1111AA              # (required, default = '')
-      street_number:  11               # (required, default = '')
-      suffix: A                        # (optional, default = '')
+      postal_code: 1234AB              # (required, default = '')
+      street_number:  5                # (required, default = '')
+      suffix: ''                       # (optional, default = '')
       include_date_today: false        # (optional, default = false) to take or not to take Today into account in the next pickup.
       default_label: Geen              # (optional, default = Geen) label if no date found
-      id: <somestring>                 # (optional, default = '') use if you'd like to have multiple waste pickup locations in HASS      
-```
-
-
-###### SENSOR - CONFIGURATION.YAML - API (KEY REQUIRED BUT CANNOT BE OBTAINED!!!)
-```yaml
-  sensor:
-    - platform: afvalwijzer
-      provider: mijnafvalwijzer        # (required, default = mijnafvalwijzer) either choose mijnafvalwijzer, rova or afvalstoffendienstkalender
-      api_token: <somestring>          # (required, default = '') KEY REQUIRED BUT CANNOT BE OBTAINED!!!
-      postal_code: 1111AA              # (required, default = '')
-      street_number:  11               # (required, default = '')
-      suffix: A                        # (optional, default = '')
-      include_date_today: false        # (optional, default = false) to take or not to take Today into account in the next pickup.
-      default_label: Geen              # (optional, default = Geen) label if no date found
-      id: <somestring>                 # (optional, default = '') use if you'd like to have multiple waste pickup locations in HASS      
+      id: ''                           # (optional, default = '') use if you'd like to have multiple waste pickup locations in HASS
 ```
diff --git a/README.md b/README.md
@@ -77,32 +77,17 @@ logger:
 Here's an example of my own Home Asisstant config: https://github.com/xirixiz/home-assistant
 
 
-###### SENSOR - CONFIGURATION.YAML - SCRAPER (DEFAULT)
+###### SENSOR - CONFIGURATION.YAML
 ```yaml
   sensor:
     - platform: afvalwijzer
       provider: mijnafvalwijzer        # (required, default = mijnafvalwijzer) either choose mijnafvalwijzer, rova or afvalstoffendienstkalender
-      postal_code: 1111AA              # (required, default = '')
-      street_number:  11               # (required, default = '')
-      suffix: A                        # (optional, default = '')
+      postal_code: 1234AB              # (required, default = '')
+      street_number:  5                # (required, default = '')
+      suffix: ''                       # (optional, default = '')
       include_date_today: false        # (optional, default = false) to take or not to take Today into account in the next pickup.
       default_label: Geen              # (optional, default = Geen) label if no date found
-      id: somestring                   # (optional, default = '') use if you'd like to have multiple waste pickup locations in HASS
-```
-
-
-###### SENSOR - CONFIGURATION.YAML - API (KEY REQUIRED BUT CANNOT BE OBTAINED!!!)
-```yaml
-  sensor:
-    - platform: afvalwijzer
-      provider: mijnafvalwijzer        # (required, default = mijnafvalwijzer) either choose mijnafvalwijzer, rova or afvalstoffendienstkalender
-      api_token: None                  # (required, default = '') KEY REQUIRED BUT CANNOT BE OBTAINED!!!
-      postal_code: 1111AA              # (required, default = '')
-      street_number:  11               # (required, default = '')
-      suffix: A                        # (optional, default = '')
-      include_date_today: false        # (optional, default = false) to take or not to take Today into account in the next pickup.
-      default_label: Geen              # (optional, default = Geen) label if no date found
-      id: somestring                   # (optional, default = '') use if you'd like to have multiple waste pickup locations in HASS      
+      id: ''                           # (optional, default = '') use if you'd like to have multiple waste pickup locations in HASS
 ```
 
 ###### INPUT BOOLEAN (FOR AUTOMATION)

diff --git a/custom_components/afvalwijzer/const/const.py b/custom_components/afvalwijzer/const/const.py
@@ -2,11 +2,8 @@
 from datetime import timedelta
 
 SENSOR_PROVIDER_TO_URL = {
-    "afvalwijzer_scraper": ["https://www.{0}.nl/nl/{1}/{2}/{3}/"],
+    "afvalwijzer_scraper_default": ["https://www.{0}.nl/nl/{1}/{2}/{3}/"],
     "afvalwijzer_scraper_rova": ["https://inzamelkalender.{0}.nl/nl/{1}/{2}/{3}/"],
-    "afvalwijzer_api": [
-        "https://api.{0}.nl/webservices/appsinput/?apikey={1}&method=postcodecheck&postcode={2}&street=&huisnummer={3}&toevoeging={4}&app_name=afvalwijzer&platform=phone&afvaldata={5}&langs=nl"
-    ],
 }
 
 MONTH_TO_NUMBER = {
@@ -52,8 +49,9 @@
 }
 
 CONF_PROVIDER = "provider"
-# 5ef443e778f41c4f75c69459eea6e6ae0c2d92de729aa0fc61653815fbd6a8ca
-CONF_API_TOKEN = "api_token"
+CONF_API_TOKEN = (
+    "api_token"  # 5ef443e778f41c4f75c69459eea6e6ae0c2d92de729aa0fc61653815fbd6a8ca
+)
 CONF_POSTAL_CODE = "postal_code"
 CONF_STREET_NUMBER = "street_number"
 CONF_SUFFIX = "suffix"
@@ -77,3 +75,17 @@
 
 MIN_TIME_BETWEEN_UPDATES = timedelta(hours=1)
 PARALLEL_UPDATES = 1
+SCAN_INTERVAL = timedelta(seconds=30)
+
+DOMAIN = "afvalwijzer"
+DOMAIN_DATA = "afvalwijzer_data"
+
+STARTUP_MESSAGE = """
+-------------------------------------------------------------------
+Afvalwijzer
+Version: 5.1.0
+This is a custom integration!
+If you have any issues with this you need to open an issue here:
+"https://github.com/xirixiz/homeassistant-afvalwijzer/issues"
+-------------------------------------------------------------------
+"""