Skip to content

Commit 5207379

Browse files
ukdtomukdtom
committed
Last merge errors
1 parent 86c6747 commit 5207379

File tree

3 files changed

+1
-188
lines changed

3 files changed

+1
-188
lines changed

‎Contents/Code/plextvhelper.py

-92
Original file line numberDiff line numberDiff line change
@@ -1,94 +1,3 @@
1-
<<<<<<< HEAD
2-
######################################################################################################################
3-
# Plex.tv helper unit
4-
#
5-
# Author: dane22, a Plex Community member
6-
#
7-
######################################################################################################################
8-
import sys
9-
10-
from consts import VERSION, PREFIX, NAME
11-
12-
class plexTV(object):
13-
# Defaults used by the rest of the class
14-
def __init__(self):
15-
# Endpoints @ Plex server
16-
self.mainUrl = 'https://plex.tv'
17-
self.loginUrl = self.mainUrl + '/users/sign_in'
18-
self.serverUrl = self.mainUrl + '/pms/servers'
19-
self.resourceURL = self.mainUrl + '/pms/resources.xml'
20-
# Mandentory headers
21-
id = self.get_thisPMSIdentity()
22-
self.myHeader = {}
23-
self.myHeader['X-Plex-Client-Identifier'] = NAME + '-' + id
24-
self.myHeader['Accept'] = 'application/json'
25-
self.myHeader['X-Plex-Product'] = NAME
26-
self.myHeader['X-Plex-Version'] = VERSION
27-
self.myHeader['X-Plex-Platform'] = Platform.OS
28-
29-
# Login to Plex.tv
30-
def login(self, user, pwd):
31-
Log.Info('Start to auth towards plex.tv')
32-
authString = String.Base64Encode('%s:%s' % (user, pwd))
33-
self.myHeader['Authorization'] = 'Basic ' + authString
34-
try:
35-
token = JSON.ObjectFromURL(self.loginUrl + '.json', headers=self.myHeader, method='POST')['user']['authToken']
36-
Log.Info('Authenticated towards plex.tv with success')
37-
return token
38-
except Ex.HTTPError, e:
39-
Log.Exception('Login error: ' + str(e))
40-
return None
41-
except Exception, e:
42-
Log.Exception('Login error: ' + str(e))
43-
return None
44-
45-
46-
''' Is user the owner of the server?
47-
user identified by token
48-
server identified by clientIdentifier
49-
if server found, and user is the owner, return 0
50-
if server is not found, return 1
51-
if user is not the owner, return 2
52-
if unknow error, return -1
53-
'''
54-
def isServerOwner(self, token):
55-
Log.Debug('Checking server for ownership')
56-
try:
57-
# Ident of this server
58-
PMSId = XML.ElementFromURL('http://127.0.0.1:32400/identity').get('machineIdentifier')
59-
# Grap Resource list from plex.tv
60-
self.myHeader['X-Plex-Token'] = token
61-
elements = XML.ElementFromURL(self.resourceURL, headers=self.myHeader).xpath('//Device[@clientIdentifier="' + PMSId + '"]/@owned')
62-
if len(elements) < 1:
63-
Log.Debug('Server %s was not found @ plex.tv' %(PMSId))
64-
return 1
65-
else:
66-
if elements[0] == '1':
67-
Log.Debug('Authenticated ok towards %s' %(PMSId))
68-
return 0
69-
else:
70-
Log.Debug('Server %s was found @ plex.tv, but user is not the owner' %(PMSId))
71-
return 2
72-
except Ex.HTTPError, e:
73-
Log.Exception('Unknown exception was: %s' %(e))
74-
return -1
75-
76-
''' will return the machineIdentity of this server '''
77-
def get_thisPMSIdentity(self):
78-
return XML.ElementFromURL('http://127.0.0.1:32400/identity').get('machineIdentifier')
79-
80-
''' Will return true, if PMS is authenticated towards plex.tv '''
81-
def auth2myPlex(self):
82-
return 'ok' == XML.ElementFromURL('http://127.0.0.1:32400').get('myPlexSigninState')
83-
84-
85-
86-
87-
88-
89-
90-
91-
=======
921
######################################################################################################################
932
# Plex.tv helper unit
943
#
@@ -255,4 +164,3 @@ def getUserList(self):
255164
return usrList
256165
except Exception, e:
257166
Log.Exception('Fatal error happened in getUserList ' + str(e))
258-
>>>>>>> tommy-work3-pmsV3-partial

‎VERSION

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
<<<<<<< HEAD
2-
2.4.1
3-
=======
4-
3.0.0
5-
>>>>>>> tommy-work3-pmsV3-partial
1+
3.0.0

‎http/login.html

-91
Original file line numberDiff line numberDiff line change
@@ -18,96 +18,6 @@
1818
<link rel="stylesheet" type="text/css" href="external/css/bootstrap-theme.min.css">
1919
<link rel="stylesheet" type="text/css" href="external/css/font-awesome.min.css">
2020

21-
<<<<<<< HEAD
22-
if ($('input[name="repeatpwd"]').val() != $('input[name="pwd"]').val()) {
23-
$('#LoginMessage').addClass('bg-danger');
24-
$('#LoginMessage').html('Passwords did not match');
25-
$('#LoginMessage').show();
26-
$('.modal').modal('hide');
27-
return false;
28-
}
29-
}
30-
$.ajax({
31-
url: '/login',
32-
cache: false,
33-
type: 'POST',
34-
global: false,
35-
data: {
36-
user: $('input[name="user"]').val(),
37-
pwd: $('input[name="pwd"]').val()
38-
},
39-
success: function(data) {
40-
$.ajax({
41-
url: '/webtools2',
42-
data: {
43-
'module': 'git',
44-
'function': 'getReleaseInfo',
45-
'url': 'https://github.com/dagalufh/WebTools.bundle',
46-
'version': 'latest'
47-
},
48-
type: 'GET',
49-
datatype: 'JSON',
50-
cache: false,
51-
success: function(data) {
52-
data = JSON.parse(data);
53-
infoarray = [];
54-
debugger;
55-
56-
if (typeof(data.published_at) == 'undefined') {
57-
//infoarray.push('No releases available.');
58-
document.location.href = '/';
59-
} else {
60-
61-
//console.log('version compare: ' + compare(webtools.version, data.name.substring(1)) + ' A: ' + webtools.version + '> B: ' + data.tag_name);
62-
switch (compare(webtools.version, data.tag_name)) {
63-
case 0:
64-
console.log("You are on latest.");
65-
document.location.href = '/';
66-
//infoarray.push('You are on the latest and greatest!');
67-
//$('#myModalFoot').html('<button type="button" class="btn btn-default" onclick="webtools.install_WT();">Re-Install WebTools</button> <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>');
68-
break;
69-
case -1:
70-
document.location.href = '/';
71-
infoarray.push('Currently Installed Version: ' + webtools.version);
72-
infoarray.push('Latest Update: ' + data.published_at);
73-
infoarray.push('Version Name: ' + data.name);
74-
infoarray.push('Author: <a target="_NEW" href="' + data.author.html_url + '">' + data.author.login + '</a>');
75-
infoarray.push('Release Notes: ' + data.body);
76-
infoarray.push('Download url: <a target="_NEW" href="' + data.zipball_url + '">' + data.zipball_url + '</a>');
77-
infoarray.push('You\'ve fallen behind. Time to update to the greatest!');
78-
$('#myModalFoot').html('<button type="button" class="btn btn-default" onclick="document.location.href='/'">Continue with Login</button>');
79-
$('#myModalBody').html(infoarray.join('<br>'));
80-
break;
81-
case 1:
82-
console.log("You are in the future.");
83-
document.location.href = '/';
84-
//infoarray.push('You are ahead of time. Your version is newer than the one on Github.');
85-
//$('#myModalFoot').html('<button type="button" class="btn btn-default" onclick="webtools.install_WT();">Re-Install WebTools</button> <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>');
86-
break;
87-
}
88-
}
89-
90-
},
91-
error: function() {
92-
//console.log("Error while fetching updates.");
93-
//$('#updateinfo').html('An error occured while trying to fetch information from Github. Try again in a little while.');
94-
// After successfull send them back to the regular page.
95-
document.location.href = '/';
96-
}
97-
});
98-
99-
100-
},
101-
error: function(data) {
102-
$('#LoginMessage').addClass('bg-danger');
103-
$('#LoginMessage').html('Incorrect credentials entered. Try again.');
104-
$('#LoginMessage').show();
105-
$('.modal').modal('hide');
106-
}
107-
});
108-
}
109-
</script>
110-
=======
11121
<!--EXTERNAL SCRIPT INIT-->
11222
<script src="external/scripts/jquery-3.1.1.min.js"></script>
11323
<script src="external/scripts/bootstrap.min.js"></script>
@@ -120,7 +30,6 @@
12030
<!-- No Auth = always WhiteBlue -->
12131
<script src="static/login/login.js"></script>
12232
</head>
123-
>>>>>>> tommy-work3-pmsV3-partial
12433

12534
<body>
12635
<!-- Strings to translate -->

0 commit comments

Comments
 (0)