add simple logging

addon.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon  id="plugin.video.embycon" 
         name="EmbyCon" 
-        version="1.0.5" 
+        version="1.0.6"
         provider-name="null_pointer">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>

default.py

@@ -20,24 +20,22 @@
 '''
 
 import os
-import logging
 
 import xbmcplugin
 import xbmcgui
 import xbmcaddon
+import xbmc
+from resources.lib.simple_logging import SimpleLogging
+
+log = SimpleLogging("EmbyCon." + __name__)
 
 addonSettings = xbmcaddon.Addon(id='plugin.video.embycon')
 addonPath = addonSettings.getAddonInfo('path')
 BASE_RESOURCE_PATH = xbmc.translatePath( os.path.join( addonPath, 'resources', 'lib' ) )
 sys.path.append(BASE_RESOURCE_PATH)
 
-import loghandler
 import functions
 
-log_level = addonSettings.getSetting('logLevel')  
-loghandler.config(int(log_level))
-log = logging.getLogger("EmbyCon.default")
-
 log.info("About to enter mainEntryPoint()")
 
 functions.mainEntryPoint()

resources/lib/clientinfo.py

@@ -1,10 +1,11 @@
 from uuid import uuid4 as uuid4
-import logging
 import xbmcaddon
 import xbmc
 import xbmcgui
 
-log = logging.getLogger("EmbyCon." + __name__)
+from simple_logging import SimpleLogging
+
+log = SimpleLogging("EmbyCon." + __name__)
 
 class ClientInformation():
 

resources/lib/datamanager.py

@@ -2,7 +2,6 @@ import hashlib
 import os
 import threading
 import json as json
-import logging
 
 import xbmcplugin
 import xbmcgui
@@ -10,8 +9,9 @@ import xbmcaddon
 import xbmc
 
 from downloadutils import DownloadUtils
+from simple_logging import SimpleLogging
 
-log = logging.getLogger("EmbyCon." + __name__)
+log = SimpleLogging("EmbyCon." + __name__)
 
 class DataManager():
 

resources/lib/downloadutils.py

@@ -9,10 +9,10 @@ import StringIO
 import gzip
 import sys
 import json as json
-import logging
 from clientinfo import ClientInformation
+from simple_logging import SimpleLogging
 
-log = logging.getLogger("EmbyCon." + __name__)
+log = SimpleLogging("EmbyCon." + __name__)
 
 class DownloadUtils():
 

resources/lib/functions.py

@@ -19,7 +19,6 @@
     
 '''
 
-import logging
 import urllib
 import re
 import sys
@@ -45,7 +44,7 @@ from datamanager import DataManager
 from views import DefaultViews, loadSkinDefaults
 from server_detect import checkServer
 from resume_dialog import ResumeDialog
-
+from simple_logging import SimpleLogging
 
 __settings__ = xbmcaddon.Addon(id='plugin.video.embycon')
 __addon__ = xbmcaddon.Addon(id='plugin.video.embycon')
@@ -54,7 +53,7 @@ __addondir__ = xbmc.translatePath( __addon__.getAddonInfo('profile'))
 __cwd__ = __settings__.getAddonInfo('path')
 PLUGINPATH = xbmc.translatePath(os.path.join( __cwd__))
 
-log = logging.getLogger("EmbyCon." + __name__)
+log = SimpleLogging("EmbyCon." + __name__)
 
 downloadUtils = DownloadUtils()
 dataManager = DataManager()

resources/lib/resume_dialog.py

@@ -4,9 +4,10 @@ import sys
 import xbmc
 import xbmcgui
 import xbmcaddon
-import logging
 
-log = logging.getLogger("EmbyCon." + __name__)
+from simple_logging import SimpleLogging
+
+log = SimpleLogging("EmbyCon." + __name__)
 
 class ResumeDialog(xbmcgui.WindowXMLDialog):
 

resources/lib/server_detect.py

@@ -1,6 +1,5 @@
 
 
-import logging
 import socket
 import json as json
 from urlparse import urlparse
@@ -10,8 +9,10 @@ import xbmcgui
 import xbmc
 
 from downloadutils import DownloadUtils
+from simple_logging import SimpleLogging
+
+log = SimpleLogging("EmbyCon." + __name__)
 
-log = logging.getLogger("EmbyCon." + __name__)
 __settings__ = xbmcaddon.Addon(id='plugin.video.embycon')
 __language__ = __settings__.getLocalizedString
 downloadUtils = DownloadUtils()

resources/lib/simple_logging.py

@@ -0,0 +1,32 @@
+
+import xbmc
+import xbmcaddon
+
+class SimpleLogging():
+
+    level = 0;
+    name = ""
+
+    def __init__(self, name):
+        settings = xbmcaddon.Addon(id='plugin.video.embycon')
+        log_level = settings.getSetting('logLevel')
+        self.level = int(log_level)
+        self.name = name
+
+    def __str__(self):
+        return "LogLevel: " + str(self.level)
+
+    def error(self, msg):
+        if(self.level >= 0):
+            xbmc.log(self.format(msg))
+
+    def info(self, msg):
+        if(self.level >= 1):
+            xbmc.log(self.format(msg))
+
+    def debug(self, msg):
+        if(self.level >= 2):
+            xbmc.log(self.format(msg))
+
+    def format(self, msg):
+        return self.name + " -> " + msg

resources/lib/utils.py

@@ -12,11 +12,11 @@ from datetime import datetime
 from downloadutils import DownloadUtils
 import urllib
 import sys
-import logging
+from simple_logging import SimpleLogging
 
 #define our global download utils
 downloadUtils = DownloadUtils()
-log = logging.getLogger("EmbyCon." + __name__)
+log = SimpleLogging("EmbyCon." + __name__)
 
 ###########################################################################
 class PlayUtils():

resources/lib/views.py

@@ -7,10 +7,10 @@ import xbmcgui
 import xbmcaddon
 import json as json
 import urllib
-import logging
 from downloadutils import DownloadUtils
+from simple_logging import SimpleLogging
 
-log = logging.getLogger("EmbyCon." + __name__)
+log = SimpleLogging("EmbyCon." + __name__)
 
 def loadSkinDefaults():
 

resources/lib/websocketclient.py

@@ -11,12 +11,12 @@ import threading
 import urllib
 import socket
 import websocket
-import logging
 
 from clientinfo import ClientInformation
 from downloadutils import DownloadUtils
+from simple_logging import SimpleLogging
 
-log = logging.getLogger("EmbyCon." + __name__)
+log = SimpleLogging("EmbyCon." + __name__)
 
 class WebSocketThread(threading.Thread):