Merge branch 'master' of https://github.com/bbr111/hacs_waste_collection_schedule

Author: bbr111

custom_components/waste_collection_schedule/manifest.json

@@ -6,6 +6,6 @@
   "dependencies": [],
   "codeowners": ["@mampfes"],
   "iot_class": "cloud_polling",
-  "version": "1.34.0",
+  "version": "1.35.0",
   "integration_type": "hub"
 }

custom_components/waste_collection_schedule/waste_collection_schedule/source/stavanger_no.py

@@ -1,14 +1,20 @@
 from datetime import datetime
-from waste_collection_schedule import Collection  # type: ignore[attr-defined]
-import json
+
 import requests
 from bs4 import BeautifulSoup
+from waste_collection_schedule import Collection  # type: ignore[attr-defined]
 
-TITLE = "Stavanger"
+TITLE = "Stavanger Kommune"
 DESCRIPTION = "Source for Stavanger Kommune, Norway"
 URL = "https://www.stavanger.kommune.no/"
 TEST_CASES = {
-    "TestcaseI": {"id": "57bf9d36-722e-400b-ae93-d80f8e354724", "municipality": "Stavanger", "gnumber": "57", "bnumber": "922", "snumber": "0"},
+    "TestcaseI": {
+        "id": "57bf9d36-722e-400b-ae93-d80f8e354724",
+        "municipality": "Stavanger",
+        "gnumber": "57",
+        "bnumber": "922",
+        "snumber": "0",
+    },
 }
 
 ICON_MAP = {
@@ -18,6 +24,7 @@
     "Juletre": "mdi:pine-tree",
 }
 
+
 class Source:
     def __init__(self, id, municipality, gnumber, bnumber, snumber):
         self._id = id
@@ -27,43 +34,38 @@ def __init__(self, id, municipality, gnumber, bnumber, snumber):
         self._snumber = snumber
 
     def fetch(self):
-      url = 'https://www.stavanger.kommune.no/renovasjon-og-miljo/tommekalender/finn-kalender/show'
-      headers = {
-          'referer': 'https://www.stavanger.kommune.no'
-      }
-
-      params = {
-          'id' : self._id,
-          'municipality' : self._municipality,
-          'gnumber' : self._gnumber,
-          'bnumber' : self._bnumber,
-          'snumber' : self._snumber
-      }
+        url = "https://www.stavanger.kommune.no/renovasjon-og-miljo/tommekalender/finn-kalender/show"
+        headers = {"referer": "https://www.stavanger.kommune.no"}
 
-      r = requests.get(url, params=params, headers=headers)
+        params = {
+            "id": self._id,
+            "municipality": self._municipality,
+            "gnumber": self._gnumber,
+            "bnumber": self._bnumber,
+            "snumber": self._snumber,
+        }
 
-      print(r.text)
+        r = requests.get(url, params=params, headers=headers)
+        r.raise_for_status()
 
-      soup = BeautifulSoup(r.text, "html.parser")
+        soup = BeautifulSoup(r.text, "html.parser")
 
-      tag = soup.find_all("option")
-      year = tag[0].get('value').split('-')
-      year = year[1]
+        tag = soup.find_all("option")
+        year = tag[0].get("value").split("-")
+        year = year[1]
 
-      entries = []
-      for tag in soup.find_all("tr", {"class":"waste-calendar__item"}):
-        if tag.text.strip() == 'Dato og dag\nAvfallstype':
-          continue
+        entries = []
+        for tag in soup.find_all("tr", {"class": "waste-calendar__item"}):
+            if tag.text.strip() == "Dato og dag\nAvfallstype":
+                continue
 
-        date = tag.text.strip().split(' - ')
-        date =  datetime.strptime(date[0]+'.'+year, '%d.%m.%Y').date()
-        #print (date)
+            date = tag.text.strip().split(" - ")
+            date = datetime.strptime(date[0] + "." + year, "%d.%m.%Y").date()
 
-        for img in tag.find_all("img"):
-          print (date,img.get('title'))
-          icon = ICON_MAP.get(img.get('title'))
-          entries.append(
-            Collection(date, img.get('title'), icon=icon)
-          )
+            for img in tag.find_all("img"):
+                waste_type = img.get("title")
+                entries.append(
+                    Collection(date, waste_type, icon=ICON_MAP.get(waste_type))
+                )
 
-      return entries
+        return entries

doc/installation.md

@@ -71,23 +71,34 @@ waste_collection_schedule:
 
 | Parameter | Type | Requirement | Description |
 |-----|-----|-----|-----|
-| sources: | | required | Contains information for the service provider being used |
-| name: | string | required | name of the service provider source to use. Should be the same as the source filename, but without the `.py` extension. See the [README](/README.md#supported-service-providers) for supported service providers |
-| args: | various | required | source-specific arguments provided to service provider to unambiguously identify the collection schedule to return. Depending on the service provider, some arguments may be mandatory, and some may be optional. See individual sources for more details |
-| customize: | | optional | Can be used to customise data retrieved from a source |
-| type: | string | required | The identity of the waste type as returned from the source  |
-| alias: | string | optional | A more readable, or user-friendly, name for the type of waste being collected. Default is `None` |
-| show: | boolean | optional | Show (`True`) or hide (`False`) collections of this specific waste type. Default is `True` |
-| icon: | string | optional | Icon to use for this specific waste type. Icons from the Home Assistant mdi icon set can be used. Default is `None`. |
-| picture: | string | optional | string representation of the path to a picture used to represent this specific waste type. Default is `None` |
-| use_dedicated_calendar: | boolean | optional | Creates a calendar dedicated to this specific waste type. Default is `False` |
-| dedicated_calendar_title: | string | optional | A more readable, or user-friendly, name for this specific waste calendar object. If nothing is provided, the name returned by the source will be used |
-| fetch_time: | time | optional | representation of the time of day in "HH:MM" that Home Assistant polls service provider for latest collection schedule. If no time is provided, the default of "01:00" is used |
-| random_fetch_time_offset: | int | optional | randomly offsets the `fetch_time` by up to _int_ minutes. Can be used to distribute Home Assistant fetch commands over a longer time frame to avoid peak loads at service providers |
-| day_switch_time: | time | optional | time of the day in "HH:MM" that Home Assistant dismisses the current entry and moves to the next entry. If no time if provided, the default of "10:00" is used. |
-| separator: | string | optional | Used to join entries if the multiple values for a single day are returned by the source. If no value is entered, the default of ", " is used |
-
-## Configuring source sensor(s)
+| sources | list | required | Contains information for the service provider being used. For details see [Attributes for sources](#attributes-for-sources) |
+| fetch_time | time | optional | representation of the time of day in "HH:MM" that Home Assistant polls service provider for latest collection schedule. If no time is provided, the default of "01:00" is used |
+| random_fetch_time_offset | int | optional | randomly offsets the `fetch_time` by up to _int_ minutes. Can be used to distribute Home Assistant fetch commands over a longer time frame to avoid peak loads at service providers |
+| day_switch_time | time | optional | time of the day in "HH:MM" that Home Assistant dismisses the current entry and moves to the next entry. If no time if provided, the default of "10:00" is used. |
+| separator | string | optional | Used to join entries if the multiple values for a single day are returned by the source. If no value is entered, the default of ", " is used |
+
+## Attributes for _sources_
+
+| Parameter | Type | Requirement | Description |
+|-----|-----|-----|-----|
+| name | string | required | name of the service provider source to use. Should be the same as the source filename, but without the `.py` extension. See the [README](/README.md#supported-service-providers) for supported service providers |
+| args | various | required | source-specific arguments provided to service provider to unambiguously identify the collection schedule to return. Depending on the service provider, some arguments may be mandatory, and some may be optional. See individual sources for more details |
+| customize | list | optional | Can be used to customise data retrieved from a source. For details see [Attributes for customize](#attributes-for-customize) |
+| use_dedicated_calendar | boolean | optional | Creates a calendar dedicated to this specific waste type. Default is `False` |
+| dedicated_calendar_title | string | optional | A more readable, or user-friendly, name for this specific waste calendar object. If nothing is provided, the name returned by the source will be used |
+
+
+## Attributes for _customize_
+
+| Parameter | Type | Requirement | Description |
+|-----|-----|-----|-----|
+| type | string | required | The identity of the waste type as returned from the source  |
+| alias | string | optional | A more readable, or user-friendly, name for the type of waste being collected. Default is `None` |
+| show | boolean | optional | Show (`True`) or hide (`False`) collections of this specific waste type. Default is `True` |
+| icon | string | optional | Icon to use for this specific waste type. Icons from the Home Assistant mdi icon set can be used. Default is `None`. |
+| picture | string | optional | string representation of the path to a picture used to represent this specific waste type. Default is `None` |
+
+## Configuring Sensor(s)
 
 Add the following lines to your `configuration.yaml` file:
 
@@ -139,6 +150,14 @@ The following variables can be used within `value_template` and `date_template`:
 | `value.daysTo` | Days to collection | int  | 0 = today, 1 = tomorrow, etc |
 | `value.types`  | Waste types | list of strings | Use `join` filter to join types |
 
+Examples:
+
+```yaml
+    value_template: '{{value.types|join(", ")}}'
+    value_template: 'in {{value.daysTo}} days'
+    value_template: 'on {{value.date.strftime("%a")}}, {{value.date.strftime("%d.%m.%Y")}}'
+```
+
 ## Combine Data from multiple Sources
 
 To combine data from multiple sources into one sensor, just add the source indexes like that:

doc/source/stavanger_no.md

@@ -20,14 +20,19 @@ waste_collection_schedule:
 
 **id**  
 *(string) (required)*
+
 **municipality**  
 *(string) (required)*
+
 **gnumber**  
 *(string) (required)*
+
 **bnumber**  
 *(string) (required)*
+
 **snumber**  
 *(string) (required)*
+
 ## Example
 
 ```yaml
@@ -47,7 +52,7 @@ waste_collection_schedule:
 Visit the [Stavanger Kommune, Norway](https://www.stavanger.kommune.no/renovasjon-og-miljo/tommekalender/finn-kalender/) page and search for your address.
 use the parameters for url 
 
-##Example URL
+## Example URL
 
 https://www.stavanger.kommune.no/renovasjon-og-miljo/tommekalender/finn-kalender/show?id=afe76cc0-19a9-4345-99bc-920bd16ab7cc&municipality=Stavanger&gnumber=58&bnumber=968&snumber=0
 
@@ -58,4 +63,3 @@ extract the arguments from this url you get. in this example
 **gnumber**=58
 **bnumber**=968
 **snumber**=0
-