Add option to mask info

resources/language/resource.language.en_gb/strings.po

@@ -793,3 +793,7 @@ msgstr ""
 msgctxt "#33163"
 msgid "Support this project"
 msgstr ""
+
+msgctxt "#33164"
+msgid "Mask sensitive information in log (does not apply to kodi logging)"
+msgstr ""

resources/lib/entrypoint/service.py

@@ -151,7 +151,8 @@ class Service(xbmc.Monitor):
 
                 return
 
-            if get_objects(zipfile, label + '.zip'): # no patch applied previously
+            if get_objects(zipfile, label + '.zip'):
+
                 LOG.info("No previous patch found.")
                 dialog("ok", heading="{emby}", line1=_(33135))
                 xbmc.executebuiltin('RestartApp')

resources/lib/helper/loghandler.py

@@ -7,7 +7,7 @@ import logging
 import xbmc
 
 import database
-from . import window
+from . import window, settings
 
 ##################################################################################################
 
@@ -42,17 +42,20 @@ class LogHandler(logging.StreamHandler):
             if server.get('ManualAddress'):
                 self.sensitive['Server'].append(server['ManualAddress'].split('://')[1])
 
+        self.mask_info = settings('maskInfo.bool')
 
     def emit(self, record):
 
         if self._get_log_level(record.levelno):
             string = self.format(record)
 
-            for server in self.sensitive['Server']:
-                string = string.replace(server or "{server}", "{emby-server}")
+            if self.mask_info:
+                for server in self.sensitive['Server']:
+                    string = string.replace(server or "{server}", "{emby-server}")
+
+                for token in self.sensitive['Token']:
+                    string = string.replace(token or "{token}", "{emby-token}")
 
-            for token in self.sensitive['Token']:
-                string = string.replace(token or "{token}", "{emby-token}")
             try:
                 xbmc.log(string, level=xbmc.LOGNOTICE)
             except UnicodeEncodeError:

resources/settings.xml

@@ -83,6 +83,7 @@
 	
 	<category label="30022"><!-- Advanced -->
 		<setting label="30004" id="logLevel" type="enum" values="Disabled|Info|Debug" default="1" />
+		<setting label="33164" id="maskInfo" type="bool" default="true" />
 		<setting label="30529" id="startupDelay" type="number" default="0" option="int" />
 		<setting label="30239" type="action" action="RunPlugin(plugin://plugin.video.emby?mode=reset)" option="close" />
 		<setting label="30535" type="action" action="RunPlugin(plugin://plugin.video.emby?mode=deviceid)" option="close" />