From 638dd25affb797037988adec94d7c0fbe4b90e92 Mon Sep 17 00:00:00 2001
From: Philipp Schmitt <pschmitt@users.noreply.github.com>
Date: Wed, 13 Dec 2017 10:58:49 +0100
Subject: [PATCH] Add media position properties (#10076)

* Add media progress information

* Remove unnecessary comments

* Remove datetime import

* Remove pysonyavr dependency

* Fix doc syntax (D205)

* Lint fix: no-else-return

* Don't attempt to set media progress info if program is None

* Fix Python 3.4 compatibility

* Explicitely depend on pyteleloisirs

* Only update remaining play time when it changed

* Fix floot state table
---
 .../components/media_player/liveboxplaytv.py  | 42 ++++++++++++++++---
 requirements_all.txt                          |  5 ++-
 2 files changed, 40 insertions(+), 7 deletions(-)

diff --git a/homeassistant/components/media_player/liveboxplaytv.py b/homeassistant/components/media_player/liveboxplaytv.py
index 15698ec5022..8093f0d3dbe 100644
--- a/homeassistant/components/media_player/liveboxplaytv.py
+++ b/homeassistant/components/media_player/liveboxplaytv.py
@@ -20,8 +20,9 @@ from homeassistant.const import (
     CONF_HOST, CONF_PORT, STATE_ON, STATE_OFF, STATE_PLAYING,
     STATE_PAUSED, CONF_NAME)
 import homeassistant.helpers.config_validation as cv
+import homeassistant.util.dt as dt_util
 
-REQUIREMENTS = ['liveboxplaytv==2.0.0']
+REQUIREMENTS = ['liveboxplaytv==2.0.2', 'pyteleloisirs==3.3']
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -76,19 +77,32 @@ class LiveboxPlayTvDevice(MediaPlayerDevice):
         self._channel_list = {}
         self._current_channel = None
         self._current_program = None
+        self._media_duration = None
+        self._media_remaining_time = None
         self._media_image_url = None
+        self._media_last_updated = None
 
     @asyncio.coroutine
     def async_update(self):
         """Retrieve the latest data."""
+        import pyteleloisirs
         try:
             self._state = self.refresh_state()
             # Update current channel
             channel = self._client.channel
             if channel is not None:
-                self._current_program = yield from \
-                    self._client.async_get_current_program_name()
                 self._current_channel = channel
+                program = yield from \
+                    self._client.async_get_current_program()
+                if program and self._current_program != program.get('name'):
+                    self._current_program = program.get('name')
+                    # Media progress info
+                    self._media_duration = \
+                        pyteleloisirs.get_program_duration(program)
+                    rtime = pyteleloisirs.get_remaining_time(program)
+                    if rtime != self._media_remaining_time:
+                        self._media_remaining_time = rtime
+                        self._media_last_updated = dt_util.utcnow()
                 # Set media image to current program if a thumbnail is
                 # available. Otherwise we'll use the channel's image.
                 img_size = 800
@@ -100,7 +114,6 @@ class LiveboxPlayTvDevice(MediaPlayerDevice):
                     chan_img_url = \
                         self._client.get_current_channel_image(img_size)
                     self._media_image_url = chan_img_url
-                self.refresh_channel_list()
         except requests.ConnectionError:
             self._state = None
 
@@ -149,8 +162,25 @@ class LiveboxPlayTvDevice(MediaPlayerDevice):
             if self._current_program:
                 return '{}: {}'.format(self._current_channel,
                                        self._current_program)
-            else:
-                return self._current_channel
+            return self._current_channel
+
+    @property
+    def media_duration(self):
+        """Duration of current playing media in seconds."""
+        return self._media_duration
+
+    @property
+    def media_position(self):
+        """Position of current playing media in seconds."""
+        return self._media_remaining_time
+
+    @property
+    def media_position_updated_at(self):
+        """When was the position of the current playing media valid.
+
+        Returns value from homeassistant.util.dt.utcnow().
+        """
+        return self._media_last_updated
 
     @property
     def supported_features(self):
diff --git a/requirements_all.txt b/requirements_all.txt
index d21b58bc82a..bfdf3ba601e 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -438,7 +438,7 @@ limitlessled==1.0.8
 linode-api==4.1.4b2
 
 # homeassistant.components.media_player.liveboxplaytv
-liveboxplaytv==2.0.0
+liveboxplaytv==2.0.2
 
 # homeassistant.components.lametric
 # homeassistant.components.notify.lametric
@@ -816,6 +816,9 @@ pysma==0.1.3
 # homeassistant.components.switch.snmp
 pysnmp==4.4.2
 
+# homeassistant.components.media_player.liveboxplaytv
+pyteleloisirs==3.3
+
 # homeassistant.components.sensor.thinkingcleaner
 # homeassistant.components.switch.thinkingcleaner
 pythinkingcleaner==0.0.3