diff --git a/resources/lib/DownloadUtils.py b/resources/lib/DownloadUtils.py index 3bdf84b9..671c983e 100644 --- a/resources/lib/DownloadUtils.py +++ b/resources/lib/DownloadUtils.py @@ -258,6 +258,7 @@ class DownloadUtils(): # UTF-8 - JSON object r = r.json() self.logMsg("====== 200 Success ======", 2) + self.logMsg("Response: %s" % r, 2) return r except: if r.headers['content-type'] == "text/html": diff --git a/resources/lib/Player.py b/resources/lib/Player.py index d566cd69..801918dc 100644 --- a/resources/lib/Player.py +++ b/resources/lib/Player.py @@ -18,7 +18,7 @@ from LibrarySync import LibrarySync from PlaybackUtils import PlaybackUtils from ReadEmbyDB import ReadEmbyDB from API import API -from NextUpInfo import NextUpInfo + librarySync = LibrarySync() # service class for playback monitoring diff --git a/resources/lib/UserClient.py b/resources/lib/UserClient.py index 0ce3c4bf..20e1d2a6 100644 --- a/resources/lib/UserClient.py +++ b/resources/lib/UserClient.py @@ -32,7 +32,7 @@ class UserClient(threading.Thread): WINDOW = xbmcgui.Window(10000) stopClient = False - logLevel = 0 + logLevel = int(addon.getSetting('logLevel')) auth = True retry = 0 @@ -359,6 +359,13 @@ class UserClient(threading.Thread): # Get the latest addon settings self.addon = xbmcaddon.Addon(id=self.addonId) + # 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)) if (self.WINDOW.getProperty("Server_status") != ""): status = self.WINDOW.getProperty("Server_status") diff --git a/resources/lib/Utils.py b/resources/lib/Utils.py index a466c237..505693fe 100644 --- a/resources/lib/Utils.py +++ b/resources/lib/Utils.py @@ -26,9 +26,11 @@ language = addonSettings.getLocalizedString def logMsg(title, msg, level = 1): - logLevel = int(addonSettings.getSetting("logLevel")) + WINDOW = xbmcgui.Window(10000) - WINDOW.setProperty('logLevel', str(logLevel)) + # Get the logLevel set in UserClient + logLevel = int(WINDOW.getProperty('getLogLevel')) + if(logLevel >= level): if(logLevel == 2): # inspect.stack() is expensive try: diff --git a/resources/lib/WebSocketClient.py b/resources/lib/WebSocketClient.py index fb0bcbff..e41df2e6 100644 --- a/resources/lib/WebSocketClient.py +++ b/resources/lib/WebSocketClient.py @@ -322,14 +322,14 @@ class WebSocketThread(threading.Thread): def run(self): WINDOW = xbmcgui.Window(10000) - logLevel = int(WINDOW.getProperty('logLevel')) + logLevel = int(WINDOW.getProperty('getLogLevel')) username = WINDOW.getProperty('currUser') server = WINDOW.getProperty('server%s' % username) token = WINDOW.getProperty('accessToken%s' % username) deviceId = ClientInformation().getMachineId() - if (logLevel == 2): - websocket.enableTrace(True) + '''if (logLevel == 2): + websocket.enableTrace(True) ''' # Get the appropriate prefix for websocket if "https" in server: diff --git a/service.py b/service.py index 73145f50..43dc5f72 100644 --- a/service.py +++ b/service.py @@ -34,6 +34,7 @@ class Service(): KodiMonitor = KodiMonitor.Kodi_Monitor() addonName = clientInfo.getAddonName() WINDOW = xbmcgui.Window(10000) + logLevel = UserClient().getLogLevel() warn_auth = True welcome_msg = True @@ -41,22 +42,25 @@ class Service(): def __init__(self, *args ): addonName = self.addonName + WINDOW = self.WINDOW + WINDOW.setProperty('getLogLevel', str(self.logLevel)) self.logMsg("Starting Monitor", 0) self.logMsg("======== START %s ========" % addonName, 0) self.logMsg("KODI Version: %s" % xbmc.getInfoLabel("System.BuildVersion"), 0) self.logMsg("%s Version: %s" % (addonName, self.clientInfo.getVersion()), 0) self.logMsg("Platform: %s" % (self.clientInfo.getPlatform()), 0) + self.logMsg("Log Level: %s" % self.logLevel, 0) #reset all window props on startup for user profile switches self.WINDOW.clearProperty("startup") - embyProperty = self.WINDOW.getProperty("Emby.nodes.total") + embyProperty = WINDOW.getProperty("Emby.nodes.total") propNames = ["index","path","title","content","inprogress.content","inprogress.title","inprogress.content","inprogress.path","nextepisodes.title","nextepisodes.content","nextepisodes.path","unwatched.title","unwatched.content","unwatched.path","recent.title","recent.content","recent.path","recentepisodes.title","recentepisodes.content","recentepisodes.path","inprogressepisodes.title","inprogressepisodes.content","inprogressepisodes.path"] if embyProperty: totalNodes = int(embyProperty) for i in range(totalNodes): for prop in propNames: - self.WINDOW.clearProperty("Emby.nodes.%s.%s" %(str(i),prop)) + WINDOW.clearProperty("Emby.nodes.%s.%s" %(str(i),prop)) def logMsg(self, msg, lvl=1):