JeroenED/plugin.video.viervijfzes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Cleanup imports in kodiutils, and fix translatePath for Matrix.

Browse Source
This commit is contained in:
Michaël Arnauts 2020-11-17 09:33:59 +01:00
parent b41bf2543f
commit 4fd5fda393
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
resources/lib/kodiutils.py
View File

@ -10,6 +10,7 @@ import xbmc
import xbmcaddon import xbmcaddon
import xbmcgui import xbmcgui
import xbmcplugin import xbmcplugin
import xbmcvfs
ADDON = xbmcaddon.Addon() ADDON = xbmcaddon.Addon()
@ -113,6 +114,9 @@ def addon_path():
def addon_profile(): def addon_profile():
"""Cache and return add-on profile""" """Cache and return add-on profile"""
try: # Kodi 19
return to_unicode(xbmcvfs.translatePath(ADDON.getAddonInfo('profile')))
except AttributeError: # Kodi 18
return to_unicode(xbmc.translatePath(ADDON.getAddonInfo('profile'))) return to_unicode(xbmc.translatePath(ADDON.getAddonInfo('profile')))
@ -244,42 +248,38 @@ def get_search_string(heading='', message=''):
def ok_dialog(heading='', message=''): def ok_dialog(heading='', message=''):
"""Show Kodi's OK dialog""" """Show Kodi's OK dialog"""
from xbmcgui import Dialog
if not heading: if not heading:
heading = addon_name() heading = addon_name()
if kodi_version_major() < 19: if kodi_version_major() < 19:
# pylint: disable=unexpected-keyword-arg,no-value-for-parameter # pylint: disable=unexpected-keyword-arg,no-value-for-parameter
return Dialog().ok(heading=heading, line1=message) return xbmcgui.Dialog().ok(heading=heading, line1=message)
return Dialog().ok(heading=heading, message=message) return xbmcgui.Dialog().ok(heading=heading, message=message)
def yesno_dialog(heading='', message='', nolabel=None, yeslabel=None, autoclose=0): def yesno_dialog(heading='', message='', nolabel=None, yeslabel=None, autoclose=0):
"""Show Kodi's Yes/No dialog""" """Show Kodi's Yes/No dialog"""
from xbmcgui import Dialog
if not heading: if not heading:
heading = addon_name() heading = addon_name()
if kodi_version_major() < 19: if kodi_version_major() < 19:
# pylint: disable=unexpected-keyword-arg,no-value-for-parameter # pylint: disable=unexpected-keyword-arg,no-value-for-parameter
return Dialog().yesno(heading=heading, line1=message, nolabel=nolabel, yeslabel=yeslabel, autoclose=autoclose) return xbmcgui.Dialog().yesno(heading=heading, line1=message, nolabel=nolabel, yeslabel=yeslabel, autoclose=autoclose)
return Dialog().yesno(heading=heading, message=message, nolabel=nolabel, yeslabel=yeslabel, autoclose=autoclose) return xbmcgui.Dialog().yesno(heading=heading, message=message, nolabel=nolabel, yeslabel=yeslabel, autoclose=autoclose)
def notification(heading='', message='', icon='info', time=4000): def notification(heading='', message='', icon='info', time=4000):
"""Show a Kodi notification""" """Show a Kodi notification"""
from xbmcgui import Dialog
if not heading: if not heading:
heading = addon_name() heading = addon_name()
if not icon: if not icon:
icon = addon_icon() icon = addon_icon()
Dialog().notification(heading=heading, message=message, icon=icon, time=time) xbmcgui.Dialog().notification(heading=heading, message=message, icon=icon, time=time)
def multiselect(heading='', options=None, autoclose=0, preselect=None, use_details=False): def multiselect(heading='', options=None, autoclose=0, preselect=None, use_details=False):
"""Show a Kodi multi-select dialog""" """Show a Kodi multi-select dialog"""
from xbmcgui import Dialog
if not heading: if not heading:
heading = addon_name() heading = addon_name()
return Dialog().multiselect(heading=heading, options=options, autoclose=autoclose, preselect=preselect, return xbmcgui.Dialog().multiselect(heading=heading, options=options, autoclose=autoclose, preselect=preselect,
useDetails=use_details) useDetails=use_details)
@ -531,11 +531,9 @@ def jsonrpc(*args, **kwargs):
def listdir(path): def listdir(path):
"""Return all files in a directory (using xbmcvfs)""" """Return all files in a directory (using xbmcvfs)"""
from xbmcvfs import listdir as vfslistdir return xbmcvfs.listdir(path)
return vfslistdir(path)
def delete(path): def delete(path):
"""Remove a file (using xbmcvfs)""" """Remove a file (using xbmcvfs)"""
from xbmcvfs import delete as vfsdelete return xbmcvfs.delete(path)
return vfsdelete(path)