From 8e57df53fd306c83a65eff66e897a4dff9d858e5 Mon Sep 17 00:00:00 2001 From: Tim Date: Sun, 16 Aug 2015 13:48:39 +0200 Subject: [PATCH] Report the correct version numbers. --- data/interfaces/default/settings.html | 6 ++++-- data/interfaces/default/welcome.html | 6 ++++-- plexpy/common.py | 11 +++++++---- plexpy/version.py | 1 + 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index 7023c2d8..8654f99a 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -1,7 +1,7 @@ <%inherit file="base.html"/> <%! import plexpy -from plexpy import notifiers +from plexpy import notifiers, common available_notification_agents = notifiers.available_notification_agents() %> @@ -1023,7 +1023,9 @@ $(document).ready(function() { headers: {'Content-Type': 'application/xml; charset=utf-8', 'X-Plex-Device-Name': 'PlexPy', 'X-Plex-Product': 'PlexPy', - 'X-Plex-Version': 'v0.1 dev', + 'X-Plex-Version': '${common.VERSION_NUMBER}', + 'X-Plex-Platform': '${common.PLATFORM}', + 'X-Plex-Platform-Version': '${common.PLATFORM_VERSION}', 'X-Plex-Client-Identifier': '${config['pms_uuid']}', 'Authorization': 'Basic ' + btoa($("#pms_username").val() + ':' + $("#pms_password").val()) }, diff --git a/data/interfaces/default/welcome.html b/data/interfaces/default/welcome.html index 27958ace..bbbeabb3 100644 --- a/data/interfaces/default/welcome.html +++ b/data/interfaces/default/welcome.html @@ -1,6 +1,6 @@ <% import plexpy -from plexpy import version +from plexpy import common %> @@ -355,7 +355,9 @@ from plexpy import version headers: {'Content-Type': 'application/xml; charset=utf-8', 'X-Plex-Device-Name': 'PlexPy', 'X-Plex-Product': 'PlexPy', - 'X-Plex-Version': 'v0.1 dev', + 'X-Plex-Version': '${common.VERSION_NUMBER}', + 'X-Plex-Platform': '${common.PLATFORM}', + 'X-Plex-Platform-Version': '${common.PLATFORM_VERSION}', 'X-Plex-Client-Identifier': '${config['pms_uuid']}', 'Authorization': 'Basic ' + btoa($("#pms_username").val() + ':' + $("#pms_password").val()) }, diff --git a/plexpy/common.py b/plexpy/common.py index c0f270d7..d3f740a2 100644 --- a/plexpy/common.py +++ b/plexpy/common.py @@ -19,14 +19,17 @@ Created on Aug 1, 2011 @author: Michael ''' import platform -import operator -import os -import re from plexpy import version # Identify Our Application -USER_AGENT = 'PlexPy/-' + version.PLEXPY_VERSION + ' (' + platform.system() + ' ' + platform.release() + ')' +USER_AGENT = 'PlexPy/-' + version.PLEXPY_VERSION + ' v' + version.PLEXPY_RELEASE_VERSION + ' (' + platform.system() + \ + ' ' + platform.release() + ')' + +PLATFORM = platform.system() +PLATFORM_VERSION = platform.release() +BRANCH = version.PLEXPY_VERSION +VERSION_NUMBER = version.PLEXPY_RELEASE_VERSION # Notification Types NOTIFY_STARTED = 1 diff --git a/plexpy/version.py b/plexpy/version.py index 9ea604be..839bf7aa 100644 --- a/plexpy/version.py +++ b/plexpy/version.py @@ -1 +1,2 @@ PLEXPY_VERSION = "master" +PLEXPY_RELEASE_VERSION = "1.1.2"