Jellyfin/jellyfin-kodi
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-kodi.git synced 2024-12-25 10:16:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add option to mask info

Browse source
This commit is contained in:
angelblue05 2018-09-13 23:55:39 -05:00
parent 7672410601
commit 3984d4e0a0
4 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/language/resource.language.en_gb/strings.po
View file

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

3
resources/lib/entrypoint/service.py
View file

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

13
resources/lib/helper/loghandler.py
View file

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

1
resources/settings.xml
View file

@ -83,6 +83,7 @@
<category label="30022"><!-- Advanced --> <category label="30022"><!-- Advanced -->
<setting label="30004" id="logLevel" type="enum" values="Disabled|Info|Debug" default="1" /> <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="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="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" /> <setting label="30535" type="action" action="RunPlugin(plugin://plugin.video.emby?mode=deviceid)" option="close" />