admin/jellycon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

user auth headers from downloadutils

Browse Source
This commit is contained in:
faush01
2014-10-07 20:46:15 +11:00
parent c7767766a4
commit 5d1479972d
2 changed files with 25 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
default.py
View File

@@ -116,18 +116,7 @@ def printDebug( msg, level = 1):
xbmc.log("MBCon " + str(level) + " -> (" + stackline + ") : " + str(msg))
else:
xbmc.log("MBCon " + str(level) + " -> " + str(msg))
def getAuthHeader():
txt_mac = downloadUtils.getMachineId()
version = ClientInformation().getVersion()
userid = xbmcgui.Window( 10000 ).getProperty("userid")
deviceName = __settings__.getSetting('deviceName')
deviceName = deviceName.replace("\"", "_")
authString = "MediaBrowser UserId=\"" + userid + "\",Client=\"XBMC\",Device=\"" + deviceName + "\",DeviceId=\"" + txt_mac + "\",Version=\"" + version + "\""
headers = {'Accept-encoding': 'gzip', 'Authorization' : authString}
xbmc.log("MBCon Authentication Header : " + str(headers))
return headers
def getPlatform( ):
if xbmc.getCondVisibility('system.platform.osx'):
@@ -290,26 +279,29 @@ def getCollections(detailsString):
return collections
def markWatched (url):
resp = requests.delete(url, data='', headers=getAuthHeader()) # mark unwatched first to reset any play position
resp = requests.post(url, data='', headers=getAuthHeader())
authHeaders = downloadUtils.getAuthHeader()
resp = requests.post(url, data='', headers=authHeaders)
WINDOW = xbmcgui.Window( 10000 )
WINDOW.setProperty("force_data_reload", "true")
xbmc.executebuiltin("Container.Refresh")
def markUnwatched (url):
resp = requests.delete(url, data='', headers=getAuthHeader())
authHeaders = downloadUtils.getAuthHeader()
resp = requests.delete(url, data='', headers=authHeaders)
WINDOW = xbmcgui.Window( 10000 )
WINDOW.setProperty("force_data_reload", "true")
xbmc.executebuiltin("Container.Refresh")
def markFavorite (url):
resp = requests.post(url, data='', headers=getAuthHeader())
authHeaders = downloadUtils.getAuthHeader()
resp = requests.post(url, data='', headers=authHeaders)
WINDOW = xbmcgui.Window( 10000 )
WINDOW.setProperty("force_data_reload", "true")
xbmc.executebuiltin("Container.Refresh")
def unmarkFavorite (url):
resp = requests.delete(url, data='', headers=getAuthHeader())
authHeaders = downloadUtils.getAuthHeader()
resp = requests.delete(url, data='', headers=authHeaders)
WINDOW = xbmcgui.Window( 10000 )
WINDOW.setProperty("force_data_reload", "true")
xbmc.executebuiltin("Container.Refresh")
@@ -353,12 +345,9 @@ def delete (url):
printDebug('Deleting via URL: ' + url)
progress = xbmcgui.DialogProgress()
progress.create(__language__(30052), __language__(30053))
resp = requests.delete(url, data='', headers=getAuthHeader())
authHeaders = downloadUtils.getAuthHeader()
resp = requests.delete(url, data='', headers=authHeaders)
deleteSleep=0
while deleteSleep<10:
xbmc.sleep(1000)
deleteSleep=deleteSleep+1
progress.update(deleteSleep*10,__language__(30053))
progress.close()
xbmc.executebuiltin("Container.Refresh")

18
resources/lib/WebSocketClient.py
View File

@@ -12,6 +12,7 @@ import urllib
import socket
import websocket
from ClientInformation import ClientInformation
from DownloadUtils import DownloadUtils
_MODE_BASICPLAY=12
@@ -214,16 +215,25 @@ class WebSocketThread(threading.Thread):
if(self.logLevel >= 1):
websocket.enableTrace(True)
wsPort = self.getWebSocketPort(mb3Host, mb3Port);
#wsPort = self.getWebSocketPort(mb3Host, mb3Port);
wsPort = mb3Port
self.logMsg("WebSocketPortNumber = " + str(wsPort))
if(wsPort == -1):
self.logMsg("Could not retrieve WebSocket port, can not run WebScoket Client")
return
#if(wsPort == -1):
# self.logMsg("Could not retrieve WebSocket port, can not run WebScoket Client")
# return
#downloadUtils = DownloadUtils()
#authHeaders = downloadUtils.getAuthHeader()
#flatHeaders = []
#for header in authHeaders:
# flatHeaders.append(header + ": " + authHeaders[header])
#self.logMsg("Flat Header : " + str(flatHeaders))
# Make a call to /System/Info. WebSocketPortNumber is the port hosting the web socket.
webSocketUrl = "ws://" + mb3Host + ":" + str(wsPort) + "/mediabrowser"
self.logMsg("WebSocket URL : " + webSocketUrl)
self.client = websocket.WebSocketApp(webSocketUrl,
#header = flatHeaders,
on_message = self.on_message,
on_error = self.on_error,
on_close = self.on_close)