v2.0.3-beta

CHANGELOG.md

@@ -1,6 +1,17 @@
 # Changelog
 
-## v2.0.2-beta (2017-12-XX)
+## v2.0.3-beta (2017-12-25)
+
+* Monitoring:
+  * Fix: Missing sync ID error causing logging to crash.
+  * Fix: Incorrect optimized version title column name causing logging to crash.
+* Notifications:
+  * Fix: Report correct beta version for Tautulli update notifications.
+* UI:
+  * Fix: Missing CSS for stream info modal.
+
+
+## v2.0.2-beta (2017-12-24)
 
 * Monitoring:
   * Fix: Websocket connection fails to start with existing streams when upgrading to v2.

data/interfaces/default/css/plexpy.css

@@ -3698,4 +3698,75 @@ a:hover .overlay-refresh-image:hover {
 }
 .no-image {
     background-image: none !important;
-}
+}
+
+#info-modal .stream-info-item {
+    display: flex;
+    flex-direction: row;
+    flex-wrap: nowrap;
+    align-items: baseline;
+    width: 100%;
+    margin-bottom: 5px;
+}
+#info-modal .stream-info-item .sub-heading {
+    height: 100%;
+    width: 75px;
+    color: #aaa;
+    font-size: 10px;
+    text-align: right;
+    text-transform: uppercase;
+    line-height: 14px;
+    -webkit-flex-shrink: 0;
+    flex-shrink: 0;
+}
+#info-modal .stream-info-item .sub-value {
+    color: #fff;
+    font-weight: bold;
+    margin-left: 10px;
+    text-align: left;
+    line-height: 14px;
+    -webkit-flex-grow: 1;
+    flex-grow: 1;
+}
+.stream-info {
+    width: 100%;
+    margin-top: 10px;
+    background-color: #282828;
+    table-layout: fixed;
+}
+.stream-info .heading {
+    color: #F9AA03;
+    text-transform: uppercase;
+    font-size: 15px;
+    font-weight: bold !important;
+}
+.stream-info th:first-child {
+    width: 125px;
+    height: 30px;
+    color: #fff;
+    font-size: 12px;
+    text-align: right;
+    text-transform: uppercase;
+}
+.stream-info th:not(:first-child) {
+    text-align: center;
+    font-weight: normal;
+}
+.stream-info td {
+    height: 25px;
+}
+.stream-info td:first-child {
+    color: #aaa;
+    font-size: 10px;
+    text-align: right;
+    text-transform: uppercase;
+}
+.stream-info td:not(:first-child) {
+    text-align: center;
+}
+.stream-info tr:nth-child(odd) td {
+    background-color: rgba(255,255,255,0.035);
+}
+.stream-info tr:nth-child(even) td {
+    background-color: rgba(255,255,255,0.010);
+}

plexpy/activity_processor.py

@@ -360,9 +360,9 @@ class ActivityProcessor(object):
                           'subtitles': session['subtitles'],
                           'synced_version': session['synced_version'],
                           'synced_version_profile': session['synced_version_profile'],
-                          'synced_version_title': session['synced_version_title'],
                           'optimized_version': session['optimized_version'],
-                          'optimized_version_profile': session['optimized_version_profile']
+                          'optimized_version_profile': session['optimized_version_profile'],
+                          'optimized_version_title': session['optimized_version_title']
                           }
 
                 # logger.debug(u"Tautulli ActivityProcessor :: Writing session_history_media_info transaction...")

plexpy/pmsconnect.py

@@ -1434,6 +1434,7 @@ class PmsConnect(object):
             transcode_decision = 'direct play'
     
         # Determine if a synced version is being played
+        sync_id = None
         if media_type not in ('photo', 'clip') and not session.getElementsByTagName('Session') \
             and helpers.get_xml_attr(session, 'ratingKey').isdigit() and transcode_decision == 'direct play':
             plex_tv = plextv.PlexTV()
@@ -1448,8 +1449,6 @@ class PmsConnect(object):
                     synced_session_data = synced_xml_head[0].getElementsByTagName('Track')[0]
                 elif synced_xml_head[0].getElementsByTagName('Video'):
                     synced_session_data = synced_xml_head[0].getElementsByTagName('Video')[0]
-        else:
-            sync_id = None
 
         # Figure out which version is being played
         if sync_id:

plexpy/version.py

@@ -1,2 +1,2 @@
 PLEXPY_BRANCH = "beta"
-PLEXPY_RELEASE_VERSION = "v2.0.2-beta"
+PLEXPY_RELEASE_VERSION = "v2.0.3-beta"

plexpy/versioncheck.py

@@ -175,10 +175,20 @@ def checkGithub(auto_update=False):
     if plexpy.COMMITS_BEHIND > 0:
         logger.info('New version is available. You are %s commits behind' % plexpy.COMMITS_BEHIND)
 
-        url = 'https://api.github.com/repos/%s/plexpy/releases/latest' % plexpy.CONFIG.GIT_USER
-        release = request.request_json(url, timeout=20, whitelist_status_code=404, validator=lambda x: type(x) == dict)
+        url = 'https://api.github.com/repos/%s/plexpy/releases' % plexpy.CONFIG.GIT_USER
+        releases = request.request_json(url, timeout=20, whitelist_status_code=404, validator=lambda x: type(x) == dict)
+
+        if plexpy.CONFIG.GIT_BRANCH == 'master':
+            release = next((r for r in releases if not r['prerelease']), releases[0])
+        elif plexpy.CONFIG.GIT_BRANCH == 'beta':
+            release = next((r for r in releases if r['prerelease'] and '-beta' in r['tag_name']), releases[0])
+        elif plexpy.CONFIG.GIT_BRANCH == 'nightly':
+            release = next((r for r in releases if r['prerelease'] and '-nightly' in r['tag_name']), releases[0])
+        else:
+            release = releases[0]
+
         plexpy.NOTIFY_QUEUE.put({'notify_action': 'on_plexpyupdate', 'plexpy_download_info': release,
-                                    'plexpy_update_commit': plexpy.LATEST_VERSION, 'plexpy_update_behind': plexpy.COMMITS_BEHIND})
+                                 'plexpy_update_commit': plexpy.LATEST_VERSION, 'plexpy_update_behind': plexpy.COMMITS_BEHIND})
 
         if auto_update:
             logger.info('Running automatic update.')