Jellyfin
/
jellyfin-kodi
mirror of https://github.com/jellyfin/jellyfin-kodi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #442 from oddstr13/beware-of-the-binary 

Pass hexlify bytes in helper.utils.event
This commit is contained in:
mcarlton00 2020-12-10 19:29:43 -05:00 committed by GitHub
parent f943316d25 84fcecb2b3
commit 60920342cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jellyfin_kodi/helper/utils.py
View File

@ -13,7 +13,7 @@ from uuid import uuid4
from distutils.version import LooseVersion from distutils.version import LooseVersion
from dateutil import tz, parser from dateutil import tz, parser
from six import text_type, string_types, iteritems from six import text_type, string_types, iteritems, ensure_text, ensure_binary
from six.moves.urllib.parse import quote_plus from six.moves.urllib.parse import quote_plus
from kodi_six import xbmc, xbmcaddon, xbmcgui, xbmcvfs from kodi_six import xbmc, xbmcaddon, xbmcgui, xbmcvfs
@ -137,13 +137,14 @@ def event(method, data=None, sender=None, hexlify=False):
sender = sender or "plugin.video.jellyfin" sender = sender or "plugin.video.jellyfin"
if hexlify: if hexlify:
data = '\\"[\\"{0}\\"]\\"'.format(binascii.hexlify(json.dumps(data))) data = ensure_text(binascii.hexlify(ensure_binary(json.dumps(data))))
else:
data = '"[%s]"' % json.dumps(data).replace('"', '\\"') data = '"[%s]"' % json.dumps(data).replace('"', '\\"')
xbmc.executebuiltin('NotifyAll(%s, %s, %s)' % (sender, method, data))
LOG.debug("---[ event: %s/%s ] %s", sender, method, data) LOG.debug("---[ event: %s/%s ] %s", sender, method, data)
xbmc.executebuiltin('NotifyAll(%s, %s, %s)' % (sender, method, data))
def dialog(dialog_type, *args, **kwargs): def dialog(dialog_type, *args, **kwargs):