Report the correct version numbers.

This commit is contained in:
Tim 2015-08-16 13:48:39 +02:00
parent cea4992331
commit 8e57df53fd
4 changed files with 16 additions and 8 deletions

View file

@ -1,7 +1,7 @@
<%inherit file="base.html"/> <%inherit file="base.html"/>
<%! <%!
import plexpy import plexpy
from plexpy import notifiers from plexpy import notifiers, common
available_notification_agents = notifiers.available_notification_agents() available_notification_agents = notifiers.available_notification_agents()
%> %>
@ -1023,7 +1023,9 @@ $(document).ready(function() {
headers: {'Content-Type': 'application/xml; charset=utf-8', headers: {'Content-Type': 'application/xml; charset=utf-8',
'X-Plex-Device-Name': 'PlexPy', 'X-Plex-Device-Name': 'PlexPy',
'X-Plex-Product': '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']}', 'X-Plex-Client-Identifier': '${config['pms_uuid']}',
'Authorization': 'Basic ' + btoa($("#pms_username").val() + ':' + $("#pms_password").val()) 'Authorization': 'Basic ' + btoa($("#pms_username").val() + ':' + $("#pms_password").val())
}, },

View file

@ -1,6 +1,6 @@
<% <%
import plexpy import plexpy
from plexpy import version from plexpy import common
%> %>
<!doctype html> <!doctype html>
@ -355,7 +355,9 @@ from plexpy import version
headers: {'Content-Type': 'application/xml; charset=utf-8', headers: {'Content-Type': 'application/xml; charset=utf-8',
'X-Plex-Device-Name': 'PlexPy', 'X-Plex-Device-Name': 'PlexPy',
'X-Plex-Product': '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']}', 'X-Plex-Client-Identifier': '${config['pms_uuid']}',
'Authorization': 'Basic ' + btoa($("#pms_username").val() + ':' + $("#pms_password").val()) 'Authorization': 'Basic ' + btoa($("#pms_username").val() + ':' + $("#pms_password").val())
}, },

View file

@ -19,14 +19,17 @@ Created on Aug 1, 2011
@author: Michael @author: Michael
''' '''
import platform import platform
import operator
import os
import re
from plexpy import version from plexpy import version
# Identify Our Application # 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 # Notification Types
NOTIFY_STARTED = 1 NOTIFY_STARTED = 1

View file

@ -1 +1,2 @@
PLEXPY_VERSION = "master" PLEXPY_VERSION = "master"
PLEXPY_RELEASE_VERSION = "1.1.2"