From 8e6ccea08537981d420b54b7f32e979b48bef592 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <paulus@paulusschoutsen.nl>
Date: Tue, 2 Jun 2015 22:58:10 -0700
Subject: [PATCH] Update media player state card

---
 .../cards/state-card-media_player.html        | 40 ++++++++++++++++---
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/homeassistant/components/frontend/www_static/polymer/cards/state-card-media_player.html b/homeassistant/components/frontend/www_static/polymer/cards/state-card-media_player.html
index c475846be8d..ab26365c298 100644
--- a/homeassistant/components/frontend/www_static/polymer/cards/state-card-media_player.html
+++ b/homeassistant/components/frontend/www_static/polymer/cards/state-card-media_player.html
@@ -33,8 +33,8 @@
     <div class='horizontal justified layout'>
       <state-info state-obj="[[stateObj]]"></state-info>
       <div class='state'>
-        <div class='main-text'>[[computePrimaryText(stateObj)]]</div>
-        <div class='secondary-text'>[[computeSecondaryText(stateObj)]]</div>
+        <div class='main-text'>[[computePrimaryText(stateObj, isPlaying)]]</div>
+        <div class='secondary-text'>[[computeSecondaryText(stateObj, isPlaying)]]</div>
       </div>
     </div>
   </template>
@@ -42,6 +42,7 @@
 
 <script>
 (function() {
+  var PLAYING_STATES = ['playing', 'paused'];
   Polymer({
     is: 'state-card-media_player',
 
@@ -49,14 +50,41 @@
       stateObj: {
         type: Object,
       },
+
+      isPlaying: {
+        type: Boolean,
+        computed: 'computeIsPlaying(stateObj)',
+      },
     },
 
-    computePrimaryText: function(stateObj) {
-      return stateObj.attributes.media_title || stateObj.stateDisplay;
+    computeIsPlaying: function(stateObj) {
+      return PLAYING_STATES.indexOf(stateObj.state) !== -1;
     },
 
-    computeSecondaryText: function(stateObj) {
-      return stateObj.attributes.media_title ? stateObj.stateDisplay : '';
+    computePrimaryText: function(stateObj, isPlaying) {
+      return isPlaying ? stateObj.attributes.media_title : stateObj.stateDisplay;
+    },
+
+    computeSecondaryText: function(stateObj, isPlaying) {
+      var text;
+
+      if (stateObj.attributes.media_content_type == 'music') {
+        return stateObj.attributes.media_artist;
+
+      } else if (stateObj.attributes.media_content_type == 'tvshow') {
+        text = stateObj.attributes.media_series_title;
+
+        if (stateObj.attributes.media_season && stateObj.attributes.media_episode) {
+          text += ' S' + stateObj.attributes.media_season + 'E' + stateObj.attributes.media_episode;
+        }
+        return text;
+
+      } else if (stateObj.attributes.app_name) {
+        return stateObj.attributes.app_name;
+
+      } else {
+        return '';
+      }
     },
   });
 })();