mirror of
https://github.com/jellyfin/jellyfin-kodi.git
synced 2024-12-25 02:06:09 +00:00
Pylint (#64)
This commit is contained in:
angelblue05
GitHub
parent
38182fcc37
commit
04d4865074
6 changed files with 78 additions and 120 deletions
|
|
@ -122,12 +122,13 @@ class ContextMenu(object):
|
|||
options.append(OPTIONS['Addon'])
|
||||
|
||||
addon = xbmcaddon.Addon('plugin.video.emby')
|
||||
XML_PATH = (addon.getAddonInfo('path'), "default", "1080i")
|
||||
dialog = context.ContextMenu("script-emby-context.xml", *XML_PATH)
|
||||
dialog.set_options(options)
|
||||
dialog.doModal()
|
||||
if dialog.is_selected():
|
||||
self._selected_option = dialog.get_selected()
|
||||
xml_path = (addon.getAddonInfo('path'), "default", "1080i")
|
||||
context_menu = context.ContextMenu("script-emby-context.xml", *xml_path)
|
||||
context_menu.set_options(options)
|
||||
context_menu.doModal()
|
||||
|
||||
if context_menu.is_selected():
|
||||
self._selected_option = context_menu.get_selected()
|
||||
|
||||
return self._selected_option
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import os
|
|||
import xbmcgui
|
||||
import xbmcaddon
|
||||
|
||||
from utils import window, language as lang
|
||||
from utils import window
|
||||
|
||||
##################################################################################################
|
||||
|
||||
|
|
|
|||
|
|
@ -43,14 +43,16 @@ class DownloadUtils(object):
|
|||
self.client_info = clientinfo.ClientInfo()
|
||||
|
||||
|
||||
def _set_session(self, **kwargs):
|
||||
def set_session(self, **kwargs):
|
||||
# Reserved for userclient only
|
||||
info = {}
|
||||
for key in kwargs:
|
||||
info[key] = kwargs[key]
|
||||
|
||||
self.session.update(info)
|
||||
log.info("Set info for server %s: %s", self.session['ServerId'], self.session)
|
||||
window('emby_server.json', value=json.dumps(self.session))
|
||||
|
||||
log.debug("Set info for server %s: %s", self.session['ServerId'], self.session)
|
||||
|
||||
def add_server(self, server, ssl):
|
||||
# Reserved for userclient only
|
||||
|
|
@ -155,20 +157,19 @@ class DownloadUtils(object):
|
|||
)
|
||||
self.downloadUrl(url, postBody={}, action_type="POST")
|
||||
|
||||
|
||||
def start_session(self):
|
||||
# User is identified from this point
|
||||
# Attach authenticated header to the session
|
||||
# Start session
|
||||
s = requests.Session()
|
||||
s.headers = self.get_header()
|
||||
s.verify = self.session['SSL']
|
||||
session = requests.Session()
|
||||
session.headers = self.get_header()
|
||||
session.verify = self.session['SSL']
|
||||
# Retry connections to the server
|
||||
s.mount("http://", requests.adapters.HTTPAdapter(max_retries=1))
|
||||
s.mount("https://", requests.adapters.HTTPAdapter(max_retries=1))
|
||||
self.session_requests = s
|
||||
session.mount("http://", requests.adapters.HTTPAdapter(max_retries=1))
|
||||
session.mount("https://", requests.adapters.HTTPAdapter(max_retries=1))
|
||||
self.session_requests = session
|
||||
|
||||
log.info("Requests session started on: %s" % self.session['Server'])
|
||||
log.info("requests session started on: %s", self.session['Server'])
|
||||
|
||||
def stop_session(self):
|
||||
try:
|
||||
|
|
@ -185,7 +186,7 @@ class DownloadUtils(object):
|
|||
|
||||
if authenticate:
|
||||
|
||||
user = self.get_user(server_id)
|
||||
user = self._get_session_info(server_id)
|
||||
user_id = user['UserId']
|
||||
token = user['Token']
|
||||
|
||||
|
|
@ -211,20 +212,6 @@ class DownloadUtils(object):
|
|||
})
|
||||
return header
|
||||
|
||||
def get_user(self, server_id=None):
|
||||
|
||||
if server_id is None:
|
||||
return {
|
||||
'UserId': self.session['UserId'],
|
||||
'Token': self.session['Token']
|
||||
}
|
||||
else:
|
||||
server = self.servers[server_id]
|
||||
return {
|
||||
'UserId': server['UserId'],
|
||||
'Token': server['Token']
|
||||
}
|
||||
|
||||
def downloadUrl(self, url, postBody=None, action_type="GET", parameters=None,
|
||||
authenticate=True, server_id=None):
|
||||
|
||||
|
|
@ -234,27 +221,19 @@ class DownloadUtils(object):
|
|||
kwargs = {}
|
||||
default_link = ""
|
||||
|
||||
try: # Ensure server info is loaded
|
||||
if not self._ensure_server(server_id):
|
||||
raise AttributeError("unable to load server information: %s" % server_id)
|
||||
try:
|
||||
# Ensure server info is loaded
|
||||
self._ensure_server(server_id)
|
||||
server = self.session if server_id is None else self.servers[server_id]
|
||||
|
||||
if server_id is None:
|
||||
if self.session_requests is not None:
|
||||
if server_id is None and self.session_requests is not None: # Main server
|
||||
session = self.session_requests
|
||||
else:
|
||||
kwargs.update({
|
||||
'verify': self.session['SSL'],
|
||||
'headers': self.get_header(authenticate=authenticate)
|
||||
})
|
||||
# Replace for the real values
|
||||
url = url.replace("{server}", self.session['Server'])
|
||||
url = url.replace("{UserId}", self.session['UserId'])
|
||||
else:
|
||||
server = self.servers[server_id]
|
||||
kwargs.update({
|
||||
'verify': server['SSL'],
|
||||
'headers': self.get_header(server_id, authenticate)
|
||||
})
|
||||
|
||||
# Replace for the real values
|
||||
url = url.replace("{server}", server['Server'])
|
||||
url = url.replace("{UserId}", server['UserId'])
|
||||
|
|
@ -285,7 +264,7 @@ class DownloadUtils(object):
|
|||
log.debug("Response: %s" % r)
|
||||
return r
|
||||
|
||||
except:
|
||||
except Exception:
|
||||
if r.headers.get('content-type') != "text/html":
|
||||
log.info("Unable to convert the response for: %s" % url)
|
||||
|
||||
|
|
@ -301,10 +280,10 @@ class DownloadUtils(object):
|
|||
log.error("Server unreachable at: %s" % url)
|
||||
window('emby_online', value="false")
|
||||
|
||||
except requests.exceptions.ConnectTimeout as e:
|
||||
log.error("Server timeout at: %s" % url)
|
||||
except requests.exceptions.ConnectTimeout as error:
|
||||
log.error("Server timeout at: %s", url)
|
||||
|
||||
except requests.exceptions.HTTPError as e:
|
||||
except requests.exceptions.HTTPError as error:
|
||||
|
||||
if r.status_code == 401:
|
||||
# Unauthorized
|
||||
|
|
@ -331,28 +310,18 @@ class DownloadUtils(object):
|
|||
elif status not in ("401", "Auth"):
|
||||
# Tell userclient token has been revoked.
|
||||
window('emby_serverStatus', value="401")
|
||||
log.error("HTTP Error: %s" % e)
|
||||
log.error("HTTP Error: %s", error)
|
||||
xbmcgui.Dialog().notification(
|
||||
heading="Error connecting",
|
||||
message="Unauthorized.",
|
||||
icon=xbmcgui.NOTIFICATION_ERROR)
|
||||
raise Warning('401')
|
||||
|
||||
elif r.status_code in (301, 302):
|
||||
# Redirects
|
||||
pass
|
||||
elif r.status_code == 400:
|
||||
# Bad requests
|
||||
pass
|
||||
except requests.exceptions.SSLError as error:
|
||||
log.error("invalid SSL certificate for: %s", url)
|
||||
|
||||
except requests.exceptions.SSLError as e:
|
||||
log.error("Invalid SSL certificate for: %s" % url)
|
||||
|
||||
except requests.exceptions.RequestException as e:
|
||||
log.error("Unknown error connecting to: %s" % url)
|
||||
|
||||
except AttributeError as error:
|
||||
log.error(error)
|
||||
except requests.exceptions.RequestException as error:
|
||||
log.error("unknown error connecting to: %s" % url)
|
||||
|
||||
return default_link
|
||||
|
||||
|
|
@ -360,16 +329,13 @@ class DownloadUtils(object):
|
|||
def _ensure_server(self, server_id=None):
|
||||
|
||||
if server_id is None and self.session_requests is None:
|
||||
|
||||
if not self.session:
|
||||
server = self._get_session_info()
|
||||
self.session.update(server)
|
||||
self.session = server
|
||||
|
||||
elif server_id and server_id not in self.servers:
|
||||
|
||||
if server_id not in self.servers:
|
||||
server = self._get_session_info(server_id)
|
||||
if server is None:
|
||||
return False
|
||||
|
||||
self.servers[server_id] = server
|
||||
|
||||
return True
|
||||
|
|
@ -377,34 +343,25 @@ class DownloadUtils(object):
|
|||
@classmethod
|
||||
def _get_session_info(cls, server_id=None):
|
||||
|
||||
info = {}
|
||||
info = {
|
||||
'UserId': "",
|
||||
'Server': "",
|
||||
'Token': "",
|
||||
'SSL': False
|
||||
}
|
||||
|
||||
if server_id is None: # Main server
|
||||
|
||||
user_id = window('emby_currUser')
|
||||
info.update({
|
||||
'UserId': user_id,
|
||||
'Server': window('emby_server%s' % user_id),
|
||||
'Token': window('emby_accessToken%s' % user_id)
|
||||
})
|
||||
verifyssl = False
|
||||
# If user enables ssl verification
|
||||
if settings('sslverify') == "true":
|
||||
verifyssl = True
|
||||
if settings('sslcert') != "None":
|
||||
verifyssl = settings('sslcert')
|
||||
|
||||
info['SSL'] = verifyssl
|
||||
|
||||
server = window('emby_server.json')
|
||||
else: # Other connect servers
|
||||
server = window('emby_server%s.json' % server_id)
|
||||
|
||||
if server:
|
||||
info.update(json.loads(server))
|
||||
|
||||
return info
|
||||
|
||||
@classmethod
|
||||
def _requests(cls, action, session=requests, **kwargs):
|
||||
def _requests(cls, action, session, **kwargs):
|
||||
|
||||
if action == "GET":
|
||||
response = session.get(**kwargs)
|
||||
|
|
|
|||
|
|
@ -112,12 +112,12 @@ class UserClient(threading.Thread):
|
|||
except Warning as error:
|
||||
if self._has_access and "restricted" in error:
|
||||
self._has_access = False
|
||||
log.info("Access is restricted")
|
||||
log.info("access is restricted")
|
||||
else:
|
||||
if not self._has_access:
|
||||
self._has_access = True
|
||||
window('emby_serverStatus', clear=True)
|
||||
log.info("Access is granted")
|
||||
log.info("access is granted")
|
||||
xbmcgui.Dialog().notification(lang(29999), lang(33007))
|
||||
|
||||
@classmethod
|
||||
|
|
@ -200,10 +200,21 @@ class UserClient(threading.Thread):
|
|||
token = self.get_token()
|
||||
|
||||
# Set properties
|
||||
# TODO: Remove old reference once code converted
|
||||
window('emby_currUser', value=userid)
|
||||
window('emby_server%s' % userid, value=server)
|
||||
window('emby_accessToken%s' % userid, value=token)
|
||||
|
||||
server_json = {
|
||||
'UserId': userid,
|
||||
'Server': server,
|
||||
'ServerId': settings('serverId'),
|
||||
'Token': token,
|
||||
'SSL': self.get_ssl()
|
||||
}
|
||||
# Set downloadutils.py values
|
||||
doutils.set_session(**server_json)
|
||||
|
||||
# Test the validity of the current token
|
||||
if not authenticated:
|
||||
try:
|
||||
|
|
@ -213,18 +224,7 @@ class UserClient(threading.Thread):
|
|||
# Token is not longer valid
|
||||
raise
|
||||
|
||||
# Set downloadutils.py values
|
||||
session = {
|
||||
'UserId': userid,
|
||||
'Server': server,
|
||||
'ServerId': settings('serverId'),
|
||||
'Token': token,
|
||||
'SSL': self.get_ssl()
|
||||
}
|
||||
doutils._set_session(**session)
|
||||
|
||||
# verify user access
|
||||
try:
|
||||
try: # verify user access
|
||||
self._set_access()
|
||||
except Warning: # We don't need to raise any exceptions
|
||||
pass
|
||||
|
|
@ -275,7 +275,7 @@ class UserClient(threading.Thread):
|
|||
|
||||
monitor = xbmc.Monitor()
|
||||
|
||||
log.warn("----===## Starting UserClient ##===----")
|
||||
log.warn("----====# Starting UserClient #====----")
|
||||
|
||||
while not self._stop_thread:
|
||||
|
||||
|
|
@ -318,7 +318,7 @@ class UserClient(threading.Thread):
|
|||
break
|
||||
|
||||
self.doutils.stop_session()
|
||||
log.warn("##===---- UserClient Stopped ----===##")
|
||||
log.warn("#====---- UserClient Stopped ----====#")
|
||||
|
||||
def stop_client(self):
|
||||
self._stop_thread = True
|
||||
|
|
|
|||
Loading…
Reference in a new issue