mirror of
https://github.com/jellyfin/jellyfin-kodi.git
synced 2025-05-09 02:45:07 +00:00
angelblue05
parent
1e089ba1d4
commit
fb006bb5f8
4 changed files with 126 additions and 190 deletions
|
|
@ -71,7 +71,7 @@ class DownloadUtils():
|
|||
url = "{server}/mediabrowser/Sessions?DeviceId=%s&format=json" % deviceId
|
||||
result = self.downloadUrl(url)
|
||||
# sessionId result
|
||||
self.logMsg("Session result: %s" % result, 2)
|
||||
self.logMsg("Session result: %s" % result, 1)
|
||||
self.sessionId = result[0][u'Id']
|
||||
|
||||
# Settings for capabilities
|
||||
|
|
@ -152,51 +152,52 @@ class DownloadUtils():
|
|||
timeout = self.timeout
|
||||
default_link = ""
|
||||
|
||||
try:
|
||||
# If user is authenticated
|
||||
if (authenticate):
|
||||
# Get requests session
|
||||
s = self.s
|
||||
# Replace for the real values and append api_key
|
||||
url = url.replace("{server}", self.server, 1)
|
||||
url = url.replace("{UserId}", self.userId, 1)
|
||||
url = "%s&api_key=%s" % (url, self.token)
|
||||
|
||||
self.logMsg("URL: %s" % url, 2)
|
||||
# Prepare request
|
||||
if type == "GET":
|
||||
r = s.get(url, params=postBody, timeout=timeout)
|
||||
elif type == "POST":
|
||||
r = s.post(url, params=postBody, timeout=timeout)
|
||||
elif type == "DELETE":
|
||||
r = s.delete(url, params=postBody, timeout=timeout)
|
||||
|
||||
# If user is authenticated
|
||||
if (authenticate):
|
||||
# Get requests session
|
||||
s = self.s
|
||||
# Replace for the real values and append api_key
|
||||
url = url.replace("{server}", self.server, 1)
|
||||
url = url.replace("{UserId}", self.userId, 1)
|
||||
url = "%s&api_key=%s" % (url, self.token)
|
||||
|
||||
self.logMsg("URL: %s" % url, 2)
|
||||
# Prepare request
|
||||
if type == "GET":
|
||||
r = s.get(url, params=postBody, timeout=timeout)
|
||||
elif type == "POST":
|
||||
r = s.post(url, params=postBody, timeout=timeout)
|
||||
elif type == "DELETE":
|
||||
r = s.delete(url, params=postBody, timeout=timeout)
|
||||
# If user is not authenticated
|
||||
elif not authenticate:
|
||||
|
||||
self.logMsg("URL: %s" % url, 1)
|
||||
header = self.getHeader(authenticate=False)
|
||||
verifyssl = False
|
||||
|
||||
# If user is not authenticated
|
||||
elif not authenticate:
|
||||
|
||||
self.logMsg("URL: %s" % url, 2)
|
||||
header = self.getHeader(authenticate=False)
|
||||
verifyssl = False
|
||||
|
||||
# If user enables ssl verification
|
||||
try:
|
||||
verifyssl = self.sslverify
|
||||
except AttributeError:
|
||||
pass
|
||||
|
||||
# Prepare request
|
||||
if type == "GET":
|
||||
r = requests.get(url, params=postBody, headers=header, timeout=timeout, verify=verifyssl)
|
||||
elif type == "POST":
|
||||
r = requests.post(url, params=postBody, headers=header, timeout=timeout, verify=verifyssl)
|
||||
# If user enables ssl verification
|
||||
try:
|
||||
verifyssl = self.sslverify
|
||||
except AttributeError:
|
||||
pass
|
||||
|
||||
# Prepare request
|
||||
if type == "GET":
|
||||
r = requests.get(url, params=postBody, headers=header, timeout=timeout, verify=verifyssl)
|
||||
elif type == "POST":
|
||||
r = requests.post(url, params=postBody, headers=header, timeout=timeout, verify=verifyssl)
|
||||
|
||||
# Process the response
|
||||
# Process the response
|
||||
try:
|
||||
r.raise_for_status()
|
||||
|
||||
if r.status_code == 204:
|
||||
# No body in the response
|
||||
# No response in body
|
||||
self.logMsg("====== 204 Success ======", 2)
|
||||
return default_link
|
||||
|
||||
# Response code 200
|
||||
elif r.status_code == requests.codes.ok:
|
||||
try:
|
||||
# UTF-8 - JSON object
|
||||
|
|
@ -205,35 +206,21 @@ class DownloadUtils():
|
|||
return r
|
||||
except:
|
||||
self.logMsg("Unable to convert the response for: %s" % url, 1)
|
||||
else:
|
||||
r.raise_for_status()
|
||||
|
||||
return default_link
|
||||
|
||||
# TO REVIEW EXCEPTIONS
|
||||
except requests.exceptions.ConnectionError as e:
|
||||
# Addon is already aware of status
|
||||
if WINDOW.getProperty("Server_online") == "true":
|
||||
self.logMsg("Server unreachable at: %s" % url, 0)
|
||||
self.logMsg(e, 2)
|
||||
WINDOW.setProperty("Server_online", "false")
|
||||
pass
|
||||
self.logMsg("Server unreachable at: %s" % url, 0)
|
||||
self.logMsg(e, 1)
|
||||
|
||||
except requests.exceptions.ConnectTimeout as e:
|
||||
self.logMsg("Server timeout at: %s" % url, 0)
|
||||
self.logMsg(e, 2)
|
||||
self.logMsg(e, 1)
|
||||
|
||||
except requests.exceptions.HTTPError as e:
|
||||
|
||||
if (r.status_code == 301) or (r.status_code == 302):
|
||||
# Redirects
|
||||
pass
|
||||
|
||||
elif (r.status_code == 400):
|
||||
# Bad requests
|
||||
pass
|
||||
|
||||
elif (r.status_code == 401):
|
||||
if r.status_code == 401:
|
||||
# Unauthorized
|
||||
status = WINDOW.getProperty("Server_status")
|
||||
if (status == "401") or (status == "Auth"):
|
||||
|
|
@ -243,16 +230,19 @@ class DownloadUtils():
|
|||
WINDOW.setProperty("Server_status", "401")
|
||||
self.logMsg("HTTP Error: %s" % e, 0)
|
||||
|
||||
elif (r.status_code == 500):
|
||||
# Out of memory
|
||||
elif (r.status_code == 301) or (r.status_code == 302):
|
||||
# Redirects
|
||||
pass
|
||||
elif r.status_code == 400:
|
||||
# Bad requests
|
||||
pass
|
||||
|
||||
except requests.exceptions.SSLError as e:
|
||||
self.logMsg("Invalid SSL certificate for: %s" % url, 0)
|
||||
self.logMsg(e, 2)
|
||||
self.logMsg(e, 1)
|
||||
|
||||
except requests.exceptions.RequestException as e:
|
||||
self.logMsg("Unknown error connecting to: %s" % url, 0)
|
||||
self.logMsg(e, 2)
|
||||
self.logMsg(e, 1)
|
||||
|
||||
return default_link
|
||||
|
|
|
|||
|
|
@ -46,7 +46,6 @@ class UserClient(threading.Thread):
|
|||
|
||||
self.__dict__ = self._shared_state
|
||||
self.className = self.__class__.__name__
|
||||
self.__language__ = self.addon.getLocalizedString
|
||||
|
||||
threading.Thread.__init__(self, *args)
|
||||
|
||||
|
|
@ -162,9 +161,6 @@ class UserClient(threading.Thread):
|
|||
|
||||
if (result != ""):
|
||||
users = result
|
||||
else:
|
||||
# Server connection failed
|
||||
return False
|
||||
|
||||
return users
|
||||
|
||||
|
|
@ -229,7 +225,10 @@ class UserClient(threading.Thread):
|
|||
|
||||
users = self.getPublicUsers()
|
||||
password = ""
|
||||
|
||||
|
||||
'''if users == "":
|
||||
self.WINDOW.setProperty("Server_status", "Stop")
|
||||
return'''
|
||||
# Find user in list
|
||||
for user in users:
|
||||
name = user[u'Name']
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@ from DownloadUtils import DownloadUtils
|
|||
from PlaybackUtils import PlaybackUtils
|
||||
from LibrarySync import LibrarySync
|
||||
from WriteKodiDB import WriteKodiDB
|
||||
from UserClient import UserClient
|
||||
import Utils as utils
|
||||
|
||||
pendingUserDataList = []
|
||||
|
|
@ -31,8 +30,6 @@ class WebSocketThread(threading.Thread):
|
|||
logLevel = 0
|
||||
client = None
|
||||
keepRunning = True
|
||||
|
||||
uc = UserClient()
|
||||
|
||||
def __init__(self, *args):
|
||||
|
||||
|
|
@ -249,7 +246,7 @@ class WebSocketThread(threading.Thread):
|
|||
LibrarySync().updatePlayCount(itemId)
|
||||
|
||||
def on_error(self, ws, error):
|
||||
self.logMsg("Error : " + str(error), 2)
|
||||
self.logMsg("Error : " + str(error))
|
||||
#raise
|
||||
|
||||
def on_close(self, ws):
|
||||
|
|
@ -301,7 +298,7 @@ class WebSocketThread(threading.Thread):
|
|||
username = WINDOW.getProperty('currUser')
|
||||
server = WINDOW.getProperty('server%s' % username)
|
||||
host = WINDOW.getProperty('server_%s' % username)
|
||||
|
||||
|
||||
if(self.logLevel >= 1):
|
||||
websocket.enableTrace(True)
|
||||
'''
|
||||
|
|
@ -326,19 +323,12 @@ class WebSocketThread(threading.Thread):
|
|||
self.client.on_open = self.on_open
|
||||
|
||||
while not self.KodiMonitor.abortRequested():
|
||||
|
||||
self.logMsg("Client Starting")
|
||||
self.client.run_forever()
|
||||
|
||||
if (self.keepRunning):
|
||||
# Server is not online, suppress future warning
|
||||
if WINDOW.getProperty("Server_online") == "true":
|
||||
self.logMsg("Server is unreachable.", 1)
|
||||
WINDOW.setProperty("Server_online", "false")
|
||||
xbmcgui.Dialog().notification("Error connecting", "Server is unreachable.")
|
||||
|
||||
if(self.keepRunning):
|
||||
self.logMsg("Client Needs To Restart")
|
||||
if self.KodiMonitor.waitForAbort(5):
|
||||
break
|
||||
|
||||
self.logMsg("Thread Exited")
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue