2015-04-03 21:13:01 +11:00
|
|
|
#################################################################################################
|
|
|
|
# UserClient thread
|
|
|
|
#################################################################################################
|
|
|
|
|
|
|
|
import xbmc
|
|
|
|
import xbmcgui
|
|
|
|
import xbmcaddon
|
|
|
|
import xbmcvfs
|
|
|
|
|
|
|
|
import threading
|
|
|
|
import hashlib
|
|
|
|
import json as json
|
|
|
|
|
|
|
|
import KodiMonitor
|
2015-04-07 03:17:32 +10:00
|
|
|
import Utils as utils
|
2015-04-03 21:13:01 +11:00
|
|
|
from ClientInformation import ClientInformation
|
|
|
|
from DownloadUtils import DownloadUtils
|
2015-06-11 18:17:48 +10:00
|
|
|
from Player import Player
|
2015-04-03 21:13:01 +11:00
|
|
|
|
|
|
|
|
|
|
|
class UserClient(threading.Thread):
|
|
|
|
|
2015-04-22 12:31:16 +10:00
|
|
|
# Borg - multiple instances, shared state
|
|
|
|
_shared_state = {}
|
2015-04-03 21:13:01 +11:00
|
|
|
|
|
|
|
clientInfo = ClientInformation()
|
|
|
|
doUtils = DownloadUtils()
|
2015-04-22 12:31:16 +10:00
|
|
|
KodiMonitor = KodiMonitor.Kodi_Monitor()
|
|
|
|
|
2015-04-07 03:17:32 +10:00
|
|
|
addonName = clientInfo.getAddonName()
|
2015-04-22 12:31:16 +10:00
|
|
|
addonId = clientInfo.getAddonId()
|
|
|
|
addon = xbmcaddon.Addon(id=addonId)
|
|
|
|
WINDOW = xbmcgui.Window(10000)
|
2015-04-03 21:13:01 +11:00
|
|
|
|
|
|
|
stopClient = False
|
2015-06-05 20:12:09 +10:00
|
|
|
logLevel = int(addon.getSetting('logLevel'))
|
2015-04-03 21:13:01 +11:00
|
|
|
auth = True
|
|
|
|
retry = 0
|
|
|
|
|
|
|
|
currUser = None
|
|
|
|
currUserId = None
|
|
|
|
currServer = None
|
|
|
|
currToken = None
|
2015-05-12 17:34:03 +10:00
|
|
|
HasAccess = True
|
2015-04-03 21:13:01 +11:00
|
|
|
AdditionalUser = []
|
|
|
|
|
|
|
|
def __init__(self, *args):
|
|
|
|
|
2015-04-22 12:31:16 +10:00
|
|
|
self.__dict__ = self._shared_state
|
2015-04-03 21:13:01 +11:00
|
|
|
threading.Thread.__init__(self, *args)
|
|
|
|
|
2015-04-07 03:17:32 +10:00
|
|
|
def logMsg(self, msg, lvl=1):
|
|
|
|
|
2015-05-03 15:27:43 +10:00
|
|
|
className = self.__class__.__name__
|
|
|
|
utils.logMsg("%s %s" % (self.addonName, className), str(msg), int(lvl))
|
2015-04-03 21:13:01 +11:00
|
|
|
|
|
|
|
def getUsername(self):
|
|
|
|
|
2015-05-03 15:27:43 +10:00
|
|
|
addon = xbmcaddon.Addon(id=self.addonId)
|
|
|
|
username = addon.getSetting('username')
|
2015-04-22 12:31:16 +10:00
|
|
|
|
2015-04-03 21:13:01 +11:00
|
|
|
if (username == ""):
|
|
|
|
self.logMsg("No username saved.", 2)
|
|
|
|
return ""
|
|
|
|
|
|
|
|
return username
|
|
|
|
|
|
|
|
def getLogLevel(self):
|
|
|
|
|
|
|
|
logLevel = int(self.addon.getSetting('logLevel'))
|
|
|
|
return logLevel
|
|
|
|
|
|
|
|
def getUserId(self):
|
|
|
|
|
|
|
|
username = self.getUsername()
|
|
|
|
w_userId = self.WINDOW.getProperty('userId%s' % username)
|
|
|
|
s_userId = self.addon.getSetting('userId%s' % username)
|
|
|
|
|
|
|
|
# Verify the window property
|
|
|
|
if (w_userId != ""):
|
|
|
|
self.logMsg("Returning userId from WINDOW for username: %s UserId: %s" % (username, w_userId), 2)
|
|
|
|
return w_userId
|
|
|
|
# Verify the settings
|
|
|
|
elif (s_userId != ""):
|
|
|
|
self.logMsg("Returning userId from SETTINGS for username: %s userId: %s" % (username, s_userId), 2)
|
|
|
|
return s_userId
|
|
|
|
# No userId found
|
|
|
|
else:
|
|
|
|
self.logMsg("No userId saved for username: %s." % username)
|
|
|
|
return
|
|
|
|
|
|
|
|
def getServer(self, prefix=True):
|
|
|
|
|
|
|
|
# For https support
|
2015-05-03 15:27:43 +10:00
|
|
|
addon = xbmcaddon.Addon(id=self.addonId)
|
2015-04-03 21:13:01 +11:00
|
|
|
HTTPS = addon.getSetting('https')
|
|
|
|
host = addon.getSetting('ipaddress')
|
|
|
|
port = addon.getSetting('port')
|
2015-06-29 12:41:05 +10:00
|
|
|
# Alternate host
|
|
|
|
if addon.getSetting('altip') == "true":
|
|
|
|
host = addon.getSetting('secondipaddress')
|
|
|
|
|
2015-04-03 21:13:01 +11:00
|
|
|
server = host + ":" + port
|
|
|
|
|
|
|
|
if host == "":
|
|
|
|
self.logMsg("No server information saved.", 2)
|
|
|
|
return ""
|
|
|
|
|
|
|
|
# If https is true
|
|
|
|
if prefix and (HTTPS == "true"):
|
|
|
|
server = "https://%s" % server
|
|
|
|
return server
|
|
|
|
# If https is false
|
|
|
|
elif prefix and (HTTPS == "false"):
|
|
|
|
server = "http://%s" % server
|
|
|
|
return server
|
|
|
|
# If only the host:port is required
|
|
|
|
elif (prefix == False):
|
|
|
|
return server
|
|
|
|
|
|
|
|
def getToken(self):
|
|
|
|
|
|
|
|
username = self.getUsername()
|
|
|
|
w_token = self.WINDOW.getProperty('accessToken%s' % username)
|
2015-05-05 10:03:46 +10:00
|
|
|
s_token = self.addon.getSetting('accessToken')
|
2015-04-03 21:13:01 +11:00
|
|
|
|
|
|
|
# Verify the window property
|
|
|
|
if (w_token != ""):
|
|
|
|
self.logMsg("Returning accessToken from WINDOW for username: %s accessToken: %s" % (username, w_token), 2)
|
|
|
|
return w_token
|
|
|
|
# Verify the settings
|
|
|
|
elif (s_token != ""):
|
|
|
|
self.logMsg("Returning accessToken from SETTINGS for username: %s accessToken: %s" % (username, s_token), 2)
|
|
|
|
self.WINDOW.setProperty('accessToken%s' % username, s_token)
|
|
|
|
return s_token
|
|
|
|
else:
|
|
|
|
self.logMsg("No token found.")
|
|
|
|
return ""
|
|
|
|
|
2015-04-25 11:57:04 +10:00
|
|
|
def getSSLverify(self):
|
|
|
|
# Verify host certificate
|
|
|
|
s_sslverify = self.addon.getSetting('sslverify')
|
|
|
|
|
|
|
|
if s_sslverify == "true":
|
|
|
|
return True
|
|
|
|
else:
|
|
|
|
return False
|
2015-04-24 20:17:08 +10:00
|
|
|
|
2015-04-25 11:57:04 +10:00
|
|
|
def getSSL(self):
|
|
|
|
# Client side certificate
|
2015-04-24 20:17:08 +10:00
|
|
|
s_cert = self.addon.getSetting('sslcert')
|
|
|
|
|
|
|
|
if s_cert == "None":
|
|
|
|
return None
|
|
|
|
else:
|
|
|
|
return s_cert
|
|
|
|
|
2015-06-05 21:57:57 +10:00
|
|
|
def setUserPref(self):
|
|
|
|
|
2015-06-11 18:17:48 +10:00
|
|
|
player = Player()
|
2015-06-05 21:57:57 +10:00
|
|
|
server = self.getServer()
|
|
|
|
userId = self.getUserId()
|
|
|
|
addon = self.addon
|
|
|
|
|
2015-06-10 06:09:55 +10:00
|
|
|
url = "{server}/mediabrowser/Users/{UserId}?format=json"
|
2015-06-05 21:57:57 +10:00
|
|
|
result = self.doUtils.downloadUrl(url)
|
|
|
|
|
|
|
|
audio = result[u'Configuration'].get(u'AudioLanguagePreference', "default")
|
|
|
|
subs = result[u'Configuration'].get(u'SubtitleLanguagePreference', "default")
|
|
|
|
addon.setSetting('Audiopref', audio)
|
|
|
|
addon.setSetting('Subspref', subs)
|
|
|
|
|
2015-06-11 18:17:48 +10:00
|
|
|
# Set the setting in Player
|
|
|
|
player.setAudioSubsPref(audio.encode('utf-8'), subs.encode('utf-8'))
|
|
|
|
|
2015-06-05 21:57:57 +10:00
|
|
|
self.logMsg("Audio preference: %s" % audio, 2)
|
|
|
|
self.logMsg("Subtitles preference: %s" % subs, 2)
|
|
|
|
|
|
|
|
return True
|
|
|
|
|
2015-04-03 21:13:01 +11:00
|
|
|
def getPublicUsers(self):
|
|
|
|
|
|
|
|
server = self.getServer()
|
|
|
|
|
|
|
|
# Get public Users
|
|
|
|
url = "%s/mediabrowser/Users/Public?format=json" % server
|
2015-04-22 12:31:16 +10:00
|
|
|
result = self.doUtils.downloadUrl(url, authenticate=False)
|
2015-04-03 21:13:01 +11:00
|
|
|
|
|
|
|
users = []
|
|
|
|
|
2015-04-22 12:31:16 +10:00
|
|
|
if (result != ""):
|
|
|
|
users = result
|
2015-05-03 15:27:43 +10:00
|
|
|
else:
|
|
|
|
# Server connection failed
|
|
|
|
return False
|
2015-04-03 21:13:01 +11:00
|
|
|
|
|
|
|
return users
|
|
|
|
|
2015-05-12 17:34:03 +10:00
|
|
|
def hasAccess(self):
|
|
|
|
|
|
|
|
url = "{server}/mediabrowser/Users"
|
|
|
|
result = self.doUtils.downloadUrl(url)
|
|
|
|
|
2015-05-13 13:24:18 +10:00
|
|
|
if result is False:
|
2015-05-12 17:34:03 +10:00
|
|
|
# Access is restricted
|
|
|
|
self.logMsg("Access is restricted.")
|
|
|
|
self.HasAccess = False
|
|
|
|
return
|
2015-05-14 14:48:35 +10:00
|
|
|
elif self.WINDOW.getProperty('Server_online') != "true":
|
|
|
|
# Server connection failed
|
|
|
|
return
|
2015-05-12 17:34:03 +10:00
|
|
|
|
|
|
|
if self.WINDOW.getProperty("Server_status") == "restricted":
|
|
|
|
self.logMsg("Access is granted.")
|
|
|
|
self.HasAccess = True
|
|
|
|
self.WINDOW.setProperty("Server_status", "")
|
|
|
|
xbmcgui.Dialog().notification("Emby server", "Access is enabled.")
|
|
|
|
return
|
|
|
|
|
2015-05-14 14:48:35 +10:00
|
|
|
def loadCurrUser(self, authenticated=False):
|
2015-04-03 21:13:01 +11:00
|
|
|
|
|
|
|
WINDOW = self.WINDOW
|
2015-04-22 12:31:16 +10:00
|
|
|
doUtils = self.doUtils
|
2015-04-03 21:13:01 +11:00
|
|
|
username = self.getUsername()
|
|
|
|
|
|
|
|
# Only to be used if token exists
|
|
|
|
self.currUserId = self.getUserId()
|
|
|
|
self.currServer = self.getServer()
|
|
|
|
self.currToken = self.getToken()
|
2015-04-25 11:57:04 +10:00
|
|
|
self.ssl = self.getSSLverify()
|
|
|
|
self.sslcert = self.getSSL()
|
2015-04-03 21:13:01 +11:00
|
|
|
|
2015-05-14 14:48:35 +10:00
|
|
|
# Test the validity of current token
|
|
|
|
if authenticated == False:
|
|
|
|
url = "%s/mediabrowser/Users/%s" % (self.currServer, self.currUserId)
|
|
|
|
WINDOW.setProperty("currUser", username)
|
|
|
|
WINDOW.setProperty("accessToken%s" % username, self.currToken)
|
|
|
|
result = doUtils.downloadUrl(url, type="POST")
|
|
|
|
if result == 401:
|
|
|
|
# Token is no longer valid
|
|
|
|
self.resetClient()
|
|
|
|
return False
|
|
|
|
|
2015-04-03 21:13:01 +11:00
|
|
|
# Set to windows property
|
|
|
|
WINDOW.setProperty("currUser", username)
|
|
|
|
WINDOW.setProperty("accessToken%s" % username, self.currToken)
|
|
|
|
WINDOW.setProperty("server%s" % username, self.currServer)
|
|
|
|
WINDOW.setProperty("server_%s" % username, self.getServer(prefix=False))
|
|
|
|
WINDOW.setProperty("userId%s" % username, self.currUserId)
|
|
|
|
|
2015-04-22 12:31:16 +10:00
|
|
|
# Set DownloadUtils values
|
|
|
|
doUtils.setUsername(username)
|
|
|
|
doUtils.setUserId(self.currUserId)
|
|
|
|
doUtils.setServer(self.currServer)
|
|
|
|
doUtils.setToken(self.currToken)
|
2015-04-25 11:57:04 +10:00
|
|
|
doUtils.setSSL(self.ssl, self.sslcert)
|
2015-05-14 14:48:35 +10:00
|
|
|
# parental control - let's verify if access is restricted
|
|
|
|
self.hasAccess()
|
2015-04-22 12:31:16 +10:00
|
|
|
# Start DownloadUtils session
|
|
|
|
doUtils.startSession()
|
|
|
|
|
2015-06-09 20:43:48 +10:00
|
|
|
# Set user preferences in settings
|
|
|
|
self.setUserPref()
|
|
|
|
|
2015-04-03 21:13:01 +11:00
|
|
|
self.currUser = username
|
|
|
|
|
|
|
|
def authenticate(self):
|
|
|
|
|
|
|
|
WINDOW = self.WINDOW
|
|
|
|
addon = self.addon
|
|
|
|
|
|
|
|
username = self.getUsername()
|
|
|
|
server = self.getServer()
|
|
|
|
addondir = xbmc.translatePath(self.addon.getAddonInfo('profile'))
|
|
|
|
hasSettings = xbmcvfs.exists("%ssettings.xml" % addondir)
|
|
|
|
|
|
|
|
# If there's no settings.xml
|
|
|
|
if (hasSettings == 0):
|
|
|
|
self.logMsg("No settings.xml found.")
|
|
|
|
self.auth = False
|
|
|
|
return
|
|
|
|
# If no user information
|
|
|
|
if (server == "") or (username == ""):
|
|
|
|
self.logMsg("Missing server information.")
|
|
|
|
self.auth = False
|
|
|
|
return
|
|
|
|
# If there's a token
|
|
|
|
if (self.getToken() != ""):
|
2015-05-14 14:48:35 +10:00
|
|
|
result = self.loadCurrUser()
|
|
|
|
|
|
|
|
if result == False:
|
|
|
|
pass
|
|
|
|
else:
|
|
|
|
self.logMsg("Current user: %s" % self.currUser, 0)
|
|
|
|
self.logMsg("Current userId: %s" % self.currUserId, 0)
|
|
|
|
self.logMsg("Current accessToken: %s" % self.currToken, 0)
|
|
|
|
return
|
2015-04-03 21:13:01 +11:00
|
|
|
|
|
|
|
users = self.getPublicUsers()
|
|
|
|
password = ""
|
2015-04-27 09:15:40 +10:00
|
|
|
|
2015-04-03 21:13:01 +11:00
|
|
|
# Find user in list
|
|
|
|
for user in users:
|
2015-04-22 12:31:16 +10:00
|
|
|
name = user[u'Name']
|
2015-04-03 21:13:01 +11:00
|
|
|
userHasPassword = False
|
2015-04-22 12:31:16 +10:00
|
|
|
|
|
|
|
if (unicode(username, 'utf-8') in name):
|
2015-04-03 21:13:01 +11:00
|
|
|
# Verify if user has a password
|
|
|
|
if (user.get("HasPassword") == True):
|
|
|
|
userHasPassword = True
|
|
|
|
# If user has password
|
2015-04-17 01:05:19 +10:00
|
|
|
if (userHasPassword):
|
2015-04-03 21:13:01 +11:00
|
|
|
password = xbmcgui.Dialog().input("Enter password for user: %s" % username, option=xbmcgui.ALPHANUM_HIDE_INPUT)
|
|
|
|
# If password dialog is cancelled
|
2015-04-22 12:31:16 +10:00
|
|
|
if (password == ""):
|
2015-04-03 21:13:01 +11:00
|
|
|
self.logMsg("No password entered.", 0)
|
|
|
|
self.WINDOW.setProperty("Server_status", "Stop")
|
|
|
|
self.auth = False
|
2015-04-07 16:27:27 +10:00
|
|
|
return
|
2015-04-03 21:13:01 +11:00
|
|
|
break
|
|
|
|
else:
|
|
|
|
# Manual login, user is hidden
|
|
|
|
password = xbmcgui.Dialog().input("Enter password for user: %s" % username, option=xbmcgui.ALPHANUM_HIDE_INPUT)
|
|
|
|
|
|
|
|
sha1 = hashlib.sha1(password)
|
|
|
|
sha1 = sha1.hexdigest()
|
|
|
|
|
|
|
|
# Authenticate username and password
|
|
|
|
url = "%s/mediabrowser/Users/AuthenticateByName?format=json" % server
|
2015-04-22 12:31:16 +10:00
|
|
|
data = {'username': username, 'password': sha1}
|
|
|
|
self.logMsg(data, 2)
|
2015-04-03 21:13:01 +11:00
|
|
|
|
2015-04-22 12:31:16 +10:00
|
|
|
result = self.doUtils.downloadUrl(url, postBody=data, type="POST", authenticate=False)
|
2015-04-03 21:13:01 +11:00
|
|
|
|
|
|
|
accessToken = None
|
|
|
|
try:
|
2015-04-22 12:31:16 +10:00
|
|
|
self.logMsg("Auth_Reponse: %s" % result, 1)
|
|
|
|
accessToken = result[u'AccessToken']
|
2015-04-03 21:13:01 +11:00
|
|
|
except:
|
|
|
|
pass
|
|
|
|
|
|
|
|
if (result != None and accessToken != None):
|
|
|
|
self.currUser = username
|
2015-05-14 14:48:35 +10:00
|
|
|
xbmcgui.Dialog().notification("Emby server", "Welcome %s!" % self.currUser)
|
2015-04-22 12:31:16 +10:00
|
|
|
userId = result[u'User'][u'Id']
|
2015-05-05 10:03:46 +10:00
|
|
|
addon.setSetting("accessToken", accessToken)
|
2015-04-03 21:13:01 +11:00
|
|
|
addon.setSetting("userId%s" % username, userId)
|
|
|
|
self.logMsg("User Authenticated: %s" % accessToken)
|
2015-05-14 14:48:35 +10:00
|
|
|
self.loadCurrUser(authenticated=True)
|
2015-04-03 21:13:01 +11:00
|
|
|
self.WINDOW.setProperty("Server_status", "")
|
|
|
|
self.retry = 0
|
|
|
|
return
|
|
|
|
else:
|
|
|
|
self.logMsg("User authentication failed.")
|
2015-05-05 10:03:46 +10:00
|
|
|
addon.setSetting("accessToken", "")
|
2015-04-03 21:13:01 +11:00
|
|
|
addon.setSetting("userId%s" % username, "")
|
2015-04-22 12:31:16 +10:00
|
|
|
xbmcgui.Dialog().ok("Error connecting", "Invalid username or password.")
|
2015-04-03 21:13:01 +11:00
|
|
|
|
|
|
|
# Give two attempts at entering password
|
|
|
|
self.retry += 1
|
|
|
|
if self.retry == 2:
|
2015-05-05 10:03:46 +10:00
|
|
|
self.logMsg("Too many retries. You can retry by selecting the option in the addon settings.")
|
2015-04-03 21:13:01 +11:00
|
|
|
self.WINDOW.setProperty("Server_status", "Stop")
|
2015-05-05 10:03:46 +10:00
|
|
|
xbmcgui.Dialog().ok("Error connecting", "Failed to authenticate too many times. You can retry by selecting the option in the addon settings.")
|
2015-04-03 21:13:01 +11:00
|
|
|
|
|
|
|
self.auth = False
|
|
|
|
return
|
|
|
|
|
|
|
|
def resetClient(self):
|
|
|
|
|
2015-05-14 14:48:35 +10:00
|
|
|
username = self.getUsername()
|
|
|
|
self.logMsg("Reset UserClient authentication.", 1)
|
2015-04-22 12:31:16 +10:00
|
|
|
if (self.currToken != None):
|
2015-04-03 21:13:01 +11:00
|
|
|
# In case of 401, removed saved token
|
2015-05-14 14:48:35 +10:00
|
|
|
self.addon.setSetting("accessToken", "")
|
|
|
|
self.WINDOW.setProperty("accessToken%s" % username, "")
|
2015-04-03 21:13:01 +11:00
|
|
|
self.currToken = None
|
|
|
|
self.logMsg("User token has been removed.", 1)
|
|
|
|
|
|
|
|
self.auth = True
|
|
|
|
self.currUser = None
|
|
|
|
return
|
2015-05-14 14:48:35 +10:00
|
|
|
|
2015-04-03 21:13:01 +11:00
|
|
|
|
|
|
|
def run(self):
|
|
|
|
|
2015-04-07 03:17:32 +10:00
|
|
|
self.logMsg("|---- Starting UserClient ----|", 0)
|
|
|
|
|
2015-04-03 21:13:01 +11:00
|
|
|
while not self.KodiMonitor.abortRequested():
|
|
|
|
|
|
|
|
# Get the latest addon settings
|
|
|
|
self.addon = xbmcaddon.Addon(id=self.addonId)
|
2015-06-05 20:12:09 +10:00
|
|
|
# Verify the log level
|
|
|
|
currLogLevel = self.getLogLevel()
|
|
|
|
if self.logLevel != currLogLevel:
|
|
|
|
# Set new log level
|
|
|
|
self.logLevel = currLogLevel
|
|
|
|
self.logMsg("New Log Level: %s" % currLogLevel, 0)
|
|
|
|
self.WINDOW.setProperty('getLogLevel', str(currLogLevel))
|
2015-04-03 21:13:01 +11:00
|
|
|
|
|
|
|
if (self.WINDOW.getProperty("Server_status") != ""):
|
|
|
|
status = self.WINDOW.getProperty("Server_status")
|
2015-05-12 17:34:03 +10:00
|
|
|
|
|
|
|
if status == "restricted":
|
|
|
|
# Parental control is restricting access
|
|
|
|
self.HasAccess = False
|
|
|
|
|
|
|
|
elif status == "401":
|
2015-04-03 21:13:01 +11:00
|
|
|
self.WINDOW.setProperty("Server_status", "Auth")
|
|
|
|
# Revoked token
|
|
|
|
self.resetClient()
|
|
|
|
|
|
|
|
if self.auth and (self.currUser == None):
|
|
|
|
status = self.WINDOW.getProperty("Server_status")
|
|
|
|
|
|
|
|
if (status == "") or (status == "Auth"):
|
|
|
|
self.auth = False
|
|
|
|
self.authenticate()
|
|
|
|
|
|
|
|
if (self.auth == False) and (self.currUser == None):
|
|
|
|
# Only if there's information found to login
|
|
|
|
server = self.getServer()
|
|
|
|
username = self.getUsername()
|
|
|
|
status = self.WINDOW.getProperty("Server_status")
|
|
|
|
|
|
|
|
# If user didn't enter a password when prompted
|
|
|
|
if status == "Stop":
|
|
|
|
pass
|
|
|
|
|
|
|
|
elif (server != "") and (username != ""):
|
|
|
|
self.logMsg("Server found: %s" % server)
|
|
|
|
self.logMsg("Username found: %s" % username)
|
|
|
|
self.auth = True
|
|
|
|
|
|
|
|
# If stopping the client didn't work
|
|
|
|
if self.stopClient == True:
|
|
|
|
break
|
|
|
|
|
2015-04-04 21:20:13 +11:00
|
|
|
if self.KodiMonitor.waitForAbort(1):
|
|
|
|
# Abort was requested while waiting. We should exit
|
|
|
|
break
|
2015-04-04 10:13:36 +11:00
|
|
|
|
2015-04-03 21:13:01 +11:00
|
|
|
self.logMsg("|---- UserClient Stopped ----|", 0)
|
|
|
|
|
|
|
|
def stopClient(self):
|
|
|
|
# As last resort
|
|
|
|
self.stopClient = True
|