usps sensor: better delivery handling (#5202)

* better delivery handling

* bump dep version

homeassistant/components/sensor/usps.py

@@ -15,14 +15,16 @@
 from homeassistant.helpers.entity import Entity
 from homeassistant.util import slugify
 from homeassistant.util import Throttle
+from homeassistant.util.dt import now, parse_datetime
 import homeassistant.helpers.config_validation as cv
 
-REQUIREMENTS = ['myusps==1.0.0']
+REQUIREMENTS = ['myusps==1.0.1']
 
 _LOGGER = logging.getLogger(__name__)
 
 CONF_UPDATE_INTERVAL = 'update_interval'
 ICON = 'mdi:package-variant-closed'
+STATUS_DELIVERED = 'delivered'
 
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend({
     vol.Required(CONF_USERNAME): cv.string,
@@ -54,7 +56,8 @@ def __init__(self, session, interval):
         import myusps
         self._session = session
         self._profile = myusps.get_profile(session)
-        self._packages = None
+        self._attributes = None
+        self._state = None
         self.update = Throttle(interval)(self._update)
         self.update()
 
@@ -66,25 +69,28 @@ def name(self):
     @property
     def state(self):
         """Return the state of the sensor."""
-        return len(self._packages)
+        return self._state
 
     def _update(self):
         """Update device state."""
         import myusps
-        self._packages = myusps.get_packages(self._session)
+        status_counts = defaultdict(int)
+        for package in myusps.get_packages(self._session):
+            status = slugify(package['primary_status'])
+            if status == STATUS_DELIVERED and \
+                    parse_datetime(package['date']).date() < now().date():
+                continue
+            status_counts[status] += 1
+        self._attributes = {
+            ATTR_ATTRIBUTION: myusps.ATTRIBUTION
+        }
+        self._attributes.update(status_counts)
+        self._state = sum(status_counts.values())
 
     @property
     def device_state_attributes(self):
         """Return the state attributes."""
-        import myusps
-        status_counts = defaultdict(int)
-        for package in self._packages:
-            status_counts[slugify(package['status'])] += 1
-        attributes = {
-            ATTR_ATTRIBUTION: myusps.ATTRIBUTION
-        }
-        attributes.update(status_counts)
-        return attributes
+        return self._attributes
 
     @property
     def icon(self):

requirements_all.txt

@@ -309,7 +309,7 @@ mficlient==0.3.0
 miflora==0.1.14
 
 # homeassistant.components.sensor.usps
-myusps==1.0.0
+myusps==1.0.1
 
 # homeassistant.components.discovery
 netdisco==0.8.1