From 2d739f64cf620244673795248f47e85ee38360b0 Mon Sep 17 00:00:00 2001
From: Tim <timvdwest@gmail.com>
Date: Sun, 6 Sep 2015 13:49:09 +0200
Subject: [PATCH] Fix some issues where some channel streams are being reported
 as episodes. Fix images for activity pane when channels/clips are being
 played.

---
 data/interfaces/default/current_activity.html | 13 +++++++++++--
 plexpy/pmsconnect.py                          | 12 ++++++++++--
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/data/interfaces/default/current_activity.html b/data/interfaces/default/current_activity.html
index 1225d6fe..d166683d 100644
--- a/data/interfaces/default/current_activity.html
+++ b/data/interfaces/default/current_activity.html
@@ -80,8 +80,17 @@ DOCUMENTATION :: END
                 <div class="dashboard-activity-cover-face-bg" style="background-image: url(pms_image_proxy?img=${a['thumb']}&width=300&height=300);"></div>
                 <div class="dashboard-activity-cover-face" style="background-image: url(pms_image_proxy?img=${a['thumb']}&width=300&height=300);"></div>
                 % elif a['type'] == 'clip':
-                <div class="dashboard-activity-clip-face-bg" style="background-image: url(${a['thumb']});"></div>
-                <div class="dashboard-activity-clip-face" style="background-image: url(${a['thumb']});"></div>
+                    % if a['art'][:4] == 'http':
+                    <div class="dashboard-activity-poster-face" style="background-image: url(${a['art']});"></div>
+                    % elif a['thumb'][:4] == 'http':
+                    <div class="dashboard-activity-poster-face" style="background-image: url(${a['thumb']});"></div>
+                    % else:
+                        % if a['art']:
+                        <div class="dashboard-activity-poster-face" style="background-image: url(pms_image_proxy?img=${a['art']}&width=500&height=280);"></div>
+                        % else:
+                        <div class="dashboard-activity-poster-face" style="background-image: url(pms_image_proxy?img=${a['thumb']}&width=500&height=280);"></div>
+                        % endif
+                    % endif
                 % else:
                 <div class="dashboard-activity-cover-face" style="background-image: url(pms_image_proxy?img=${a['thumb']}&width=300&height=300&fallback=cover);"></div>
                 % endif
diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py
index d766e56e..d25e783e 100644
--- a/plexpy/pmsconnect.py
+++ b/plexpy/pmsconnect.py
@@ -748,9 +748,13 @@ class PmsConnect(object):
                                   'duration': duration,
                                   'progress': progress,
                                   'progress_percent': str(helpers.get_percent(progress, duration)),
-                                  'type': helpers.get_xml_attr(session, 'type'),
                                   'indexes': use_indexes
                                   }
+                if helpers.get_xml_attr(session, 'ratingKey').isdigit():
+                    session_output['type'] = helpers.get_xml_attr(session, 'type')
+                else:
+                    session_output['type'] = 'clip'
+
             elif helpers.get_xml_attr(session, 'type') == 'movie':
                 session_output = {'session_key': helpers.get_xml_attr(session, 'sessionKey'),
                                   'media_index': helpers.get_xml_attr(session, 'index'),
@@ -797,9 +801,13 @@ class PmsConnect(object):
                                   'duration': duration,
                                   'progress': progress,
                                   'progress_percent': str(helpers.get_percent(progress, duration)),
-                                  'type': helpers.get_xml_attr(session, 'type'),
                                   'indexes': use_indexes
                                   }
+                if helpers.get_xml_attr(session, 'ratingKey').isdigit():
+                    session_output['type'] = helpers.get_xml_attr(session, 'type')
+                else:
+                    session_output['type'] = 'clip'
+
             elif helpers.get_xml_attr(session, 'type') == 'clip':
                 session_output = {'session_key': helpers.get_xml_attr(session, 'sessionKey'),
                                   'media_index': helpers.get_xml_attr(session, 'index'),