Merge pull request #1 from pippyn/beta

Merge beta with master

Author: pippyn

README.md

@@ -12,15 +12,16 @@ This sensor works with the following waste collectors: Blink, Cure, Cyclus, DAR,
 ```yaml
   sensor:
     - platform: afvalbeheer
-      wastecollector: Blink
-      dateformat: '%d-%m-%Y'
-      resources:                      # (at least 1 required)
+      wastecollector: Blink            (required)
+      resources:                       (at least 1 required)
         - restafval
         - gft
         - papier
         - pmd
-      postcode: 1111AA                # (required)
-      streetnumber: 1                 # (required)
+      postcode: 1111AA                 (required)
+      streetnumber: 1                  (required)
+      upcomingsensor: 1                   (optional)
+      dateformat: '%d-%m-%Y'           (optional)
 ```
 ### Wastecollector
 ```
@@ -75,6 +76,15 @@ Postcode is required and is your own postcode
 ### Street number
 Street number is required and is your own street number
 
+### Upcoming sensor
+```yaml
+upcomingsensor: 1
+```
+If you activate this option you'll get 2 extra sensors (today and tomorrow) which are handy for automations. 
+The today sensor will display the fractions collected today.
+The tomorrow sensor will display the fractions collected tomorrow.
+Default is 0.
+
 ### Date format
 ```yaml
 dateformat:
@@ -89,6 +99,12 @@ If you wish to remove the year and the dashes and want to show the name of the m
 21 Sep
 ```
 
+### Date only
+```yaml
+dateonly: 1
+```
+If you don't want to add dayname, tomorrow or today in front of date activate this option. Default is 0.
+
 ## Custom updater
 You can use the custom updater with this sensor
 ```yaml

afvalbeheer.py

@@ -1,12 +1,14 @@
 """
 Sensor component for waste pickup dates from dutch waste collectors (using the http://www.opzet.nl app)
 Original Author: Pippijn Stortelder
-Current Version: 2.0.5 20190130 - Pippijn Stortelder
+Current Version: 2.1.2 20190201 - Pippijn Stortelder
 20190116 - Merged different waste collectors into 1 component
 20190119 - Added an option to change date format and fixed spelling mistakes
 20190122 - Refactor code and bug fix
 20190123 - Added 12 more waste collectors
 20190130 - FIXED PMD for some waste collectors
+20190131 - Added Today and Tomorrow sensors
+20190201 - Added option for date only
 
 Description:
   Provides sensors for the following Dutch waste collectors;
@@ -52,15 +54,17 @@
 Configuration.yaml:
   sensor:
     - platform: afvalbeheer
-      wastecollector: Blink
-      dateformat: '%d-%m-%Y'
+      wastecollector: Blink            (required)
       resources:                       (at least 1 required)
         - restafval
         - gft
         - papier
         - pmd
       postcode: 1111AA                 (required)
       streetnumber: 1                  (required)
+      upcomingsensor: 0                (optional)
+      dateformat: '%d-%m-%Y'           (optional)
+      dateonly: 0                      (optional)
 """
 
 import logging
@@ -75,7 +79,7 @@
 from homeassistant.util import Throttle
 from homeassistant.helpers.entity import Entity
 
-__version__ = '2.0.5'
+__version__ = '2.1.2'
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -84,6 +88,8 @@
 CONF_POSTCODE = 'postcode'
 CONF_STREETNUMBER = 'streetnumber'
 CONF_DATE_FORMAT = 'dateformat'
+CONF_TODAY_TOMORROW = 'upcomingsensor'
+CONF_DATE_ONLY = 'dateonly'
 
 ATTR_OFFICIAL_NAME = 'Official name'
 ATTR_WASTE_COLLECTOR = 'wastecollector'
@@ -137,6 +143,8 @@
     vol.Required(CONF_STREETNUMBER, default='1'): cv.string,
     vol.Optional(CONF_WASTE_COLLECTOR, default='Cure'): cv.string,
     vol.Optional(CONF_DATE_FORMAT, default='%d-%m-%Y'): cv.string,
+    vol.Optional(CONF_TODAY_TOMORROW, default=False): cv.boolean,
+    vol.Optional(CONF_DATE_ONLY, default=False): cv.boolean,
 })
 
 
@@ -147,6 +155,8 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     street_number = config.get(CONF_STREETNUMBER)
     waste_collector = config.get(CONF_WASTE_COLLECTOR).lower()
     date_format = config.get(CONF_DATE_FORMAT)
+    sensor_today = config.get(CONF_TODAY_TOMORROW)
+    date_only = config.get(CONF_DATE_ONLY)
 
     try:
         data = WasteData(postcode, street_number, waste_collector)
@@ -158,7 +168,11 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
 
     for resource in config[CONF_RESOURCES]:
         sensor_type = resource.lower()
-        entities.append(WasteSensor(data, sensor_type, waste_collector, date_format))
+        entities.append(WasteSensor(data, sensor_type, waste_collector, date_format, date_only))
+
+    if sensor_today:
+        entities.append(WasteTodaySensor(data, config[CONF_RESOURCES], waste_collector, "vandaag"))
+        entities.append(WasteTodaySensor(data, config[CONF_RESOURCES], waste_collector, "morgen"))
 
     add_entities(entities)
 
@@ -227,11 +241,12 @@ def update(self):
 
 class WasteSensor(Entity):
 
-    def __init__(self, data, sensor_type, waste_collector, date_format):
+    def __init__(self, data, sensor_type, waste_collector, date_format, date_only):
         self.data = data
         self.type = sensor_type
         self.waste_collector = waste_collector
         self.date_format = date_format
+        self.date_only = date_only
         self._name = waste_collector + ' ' + self.type
         self._unit = ''
         self._hidden = False
@@ -279,24 +294,28 @@ def update(self):
                             today = datetime.today()
                             pickup_info = waste_data.get(waste_id)
                             pick_update = pickup_info[0]
-                            datediff = (pick_update - today).days + 1
+                            date_diff = (pick_update - today).days + 1
 
                             self._official_name = pickup_info[1]
                             self._fraction_id = waste_id
                             self._entity_picture = pickup_info[3]
                             self._last_update = today.strftime('%d-%m-%Y %H:%M')
                             self._hidden = False
 
-                            if datediff >= 8:
-                                self._state = pick_update.strftime(self.date_format)
-                            elif datediff > 1:
-                                self._state = pick_update.strftime('%A, ' + self.date_format)
-                            elif datediff == 1:
-                                self._state = pick_update.strftime('Tomorrow, ' + self.date_format)
-                            elif datediff <= 0:
-                                self._state = pick_update.strftime('Today, ' + self.date_format)
+                            if self.date_only:
+                                if date_diff >= 0:
+                                    self._state = pick_update.strftime(self.date_format)
                             else:
-                                self._state = None
+                                if date_diff >= 8:
+                                    self._state = pick_update.strftime(self.date_format)
+                                elif date_diff > 1:
+                                    self._state = pick_update.strftime('%A, ' + self.date_format)
+                                elif date_diff == 1:
+                                    self._state = pick_update.strftime('Tomorrow, ' + self.date_format)
+                                elif date_diff == 0:
+                                    self._state = pick_update.strftime('Today, ' + self.date_format)
+                                else:
+                                    self._state = None
                             retrieved_data = 1
 
                     if retrieved_data == 0:
@@ -320,3 +339,74 @@ def update(self):
             self._official_name = None
             self._fraction_id = None
             self._hidden = True
+
+
+class WasteTodaySensor(Entity):
+
+    def __init__(self, data, sensor_types, waste_collector, day_sensor):
+        self.data = data
+        self.types = sensor_types
+        self.waste_collector = waste_collector
+        self.day = day_sensor
+        self._name = waste_collector + ' ' + self.day
+        self._unit = ''
+        self._hidden = False
+        self._state = None
+
+    @property
+    def name(self):
+        return self._name
+
+    @property
+    def state(self):
+        return self._state
+
+    @property
+    def device_state_attributes(self):
+        return {
+            ATTR_HIDDEN: self._hidden
+        }
+
+    @property
+    def unit_of_measurement(self):
+        return self._unit
+
+    def update(self):
+        self.data.update()
+        waste_data = self.data.data
+        retrieved_data = 0
+        try:
+            if waste_data is not None:
+                new_state = []
+                for type in self.types:
+                    if type in COLLECTOR_WASTE_ID[self.waste_collector]:
+                        for waste_id in COLLECTOR_WASTE_ID[self.waste_collector][type]:
+                            if waste_id in waste_data:
+                                today = datetime.today()
+                                pickup_info = waste_data.get(waste_id)
+                                pick_update = pickup_info[0]
+                                date_diff = (pick_update - today).days + 1
+
+                                if date_diff == 1 and self.day == "morgen":
+                                    new_state.append(type)
+                                    retrieved_data = 1
+                                elif date_diff < 1 and self.day == "vandaag":
+                                    new_state.append(type)
+                                    retrieved_data = 1
+
+                        if retrieved_data == 0:
+                            self._state = "None"
+                            self._hidden = True
+                        else:
+                            self._state = ', '.join(new_state)
+                            self._hidden = False
+                    else:
+                        self._state = None
+                        self._hidden = True
+            else:
+                self._state = None
+                self._hidden = True
+
+        except ValueError:
+            self._state = None
+            self._hidden = True

custom_components.json

@@ -1,6 +1,6 @@
 {
     "sensor.afvalbeheer": {
-      "version": "2.0.5",
+      "version": "2.1.2",
       "local_location": "custom_components/sensor/afvalbeheer.py",
       "remote_location": "https://raw.githubusercontent.com/pippyn/Home-Assistant-Sensor-Afvalbeheer/master/afvalbeheer.py",
       "visit_repo": "https://github.com/pippyn/Home-Assistant-Sensor-Afvalbeheer",