Merge pull request #5221 from heitbaum/xm

Addons: update xbmc.translatePath (deprecated) to xbmcvfs.translatePath
This commit is contained in:
Christian Hewitt 2021-03-08 16:37:40 +04:00 committed by GitHub
commit 45be8060c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 21 additions and 14 deletions

View File

@ -1,14 +1,16 @@
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) # Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
import os import os
import sys import sys
import xbmcaddon import xbmcaddon
import xbmcvfs
__settings__ = xbmcaddon.Addon(id = 'driver.dvb.hdhomerun') __settings__ = xbmcaddon.Addon(id = 'driver.dvb.hdhomerun')
__cwd__ = __settings__.getAddonInfo('path') __cwd__ = __settings__.getAddonInfo('path')
__resources_lib__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'lib')) __resources_lib__ = xbmcvfs.translatePath(os.path.join(__cwd__, 'resources', 'lib'))
__settings_xml__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'settings.xml')) __settings_xml__ = xbmcvfs.translatePath(os.path.join(__cwd__, 'resources', 'settings.xml'))
if len(sys.argv) == 2 and sys.argv[1] == 'refresh_tuners': if len(sys.argv) == 2 and sys.argv[1] == 'refresh_tuners':
sys.path.append(__resources_lib__) sys.path.append(__resources_lib__)

View File

@ -1,15 +1,17 @@
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) # Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
import os import os
import sys import sys
import xbmcaddon import xbmcaddon
import xbmcvfs
__scriptname__ = "IMON MCE Remote driver" __scriptname__ = "IMON MCE Remote driver"
__author__ = "LibreELEC" __author__ = "LibreELEC"
__url__ = "https://libreelec.tv" __url__ = "https://libreelec.tv"
__settings__ = xbmcaddon.Addon(id='driver.remote.imon-mce') __settings__ = xbmcaddon.Addon(id='driver.remote.imon-mce')
__cwd__ = __settings__.getAddonInfo('path') __cwd__ = __settings__.getAddonInfo('path')
__path__ = xbmc.translatePath( os.path.join( __cwd__, 'bin', "imon-mce.service") ) __path__ = xbmcvfs.translatePath( os.path.join( __cwd__, 'bin', "imon-mce.service") )
os.system(__path__) os.system(__path__)

View File

@ -1,19 +1,21 @@
# SPDX-License-Identifier: GPL-2.0-or-later # SPDX-License-Identifier: GPL-2.0-or-later
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) # Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
import os import os
import sys import sys
import subprocess import subprocess
import xbmcaddon import xbmcaddon
import xbmcvfs
__settings__ = xbmcaddon.Addon(id = 'driver.dvb.sundtek-mediatv') __settings__ = xbmcaddon.Addon(id = 'driver.dvb.sundtek-mediatv')
__cwd__ = __settings__.getAddonInfo('path') __cwd__ = __settings__.getAddonInfo('path')
__resources_lib__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'lib')) __resources_lib__ = xbmcvfs.translatePath(os.path.join(__cwd__, 'resources', 'lib'))
__settings_xml__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'settings.xml')) __settings_xml__ = xbmcvfs.translatePath(os.path.join(__cwd__, 'resources', 'settings.xml'))
__mediaclient__ = xbmc.translatePath(os.path.join(__cwd__, 'bin', 'mediaclient')) __mediaclient__ = xbmcvfs.translatePath(os.path.join(__cwd__, 'bin', 'mediaclient'))
__mediaclient_e__ = __mediaclient__ + ' -e' __mediaclient_e__ = __mediaclient__ + ' -e'
__update_sh__ = xbmc.translatePath(os.path.join(__cwd__, 'bin', 'sundtek-update-driver.sh')) __update_sh__ = xbmcvfs.translatePath(os.path.join(__cwd__, 'bin', 'sundtek-update-driver.sh'))
if len(sys.argv) == 2: if len(sys.argv) == 2:
if sys.argv[1] == 'refresh_tuners': if sys.argv[1] == 'refresh_tuners':

View File

@ -1,6 +1,7 @@
import os import os
import socket import socket
import xbmc import xbmc
import xbmcvfs
import xbmcaddon import xbmcaddon
import xbmcgui import xbmcgui
@ -18,7 +19,7 @@ DEFAULTS = dict(
) )
ADDON = xbmcaddon.Addon() ADDON = xbmcaddon.Addon()
ADDON_HOME = xbmc.translatePath(ADDON.getAddonInfo('profile')) ADDON_HOME = xbmcvfs.translatePath(ADDON.getAddonInfo('profile'))
ADDON_ICON = ADDON.getAddonInfo('icon') ADDON_ICON = ADDON.getAddonInfo('icon')
ADDON_NAME = ADDON.getAddonInfo('name') ADDON_NAME = ADDON.getAddonInfo('name')
ADDON_PATH = ADDON.getAddonInfo('path') ADDON_PATH = ADDON.getAddonInfo('path')

View File

@ -17,12 +17,12 @@ class MyMonitor(xbmc.Monitor):
# addon # addon
__addon__ = xbmcaddon.Addon(id='service.net-snmp') __addon__ = xbmcaddon.Addon(id='service.net-snmp')
__addonpath__ = xbmc.translatePath(__addon__.getAddonInfo('path')) __addonpath__ = xbmcvfs.translatePath(__addon__.getAddonInfo('path'))
__addonhome__ = xbmc.translatePath(__addon__.getAddonInfo('profile')) __addonhome__ = xbmcvfs.translatePath(__addon__.getAddonInfo('profile'))
if not xbmcvfs.exists(xbmc.translatePath(__addonhome__ + 'share/snmp/')): if not xbmcvfs.exists(xbmcvfs.translatePath(__addonhome__ + 'share/snmp/')):
xbmcvfs.mkdirs(xbmc.translatePath(__addonhome__ + 'share/snmp/')) xbmcvfs.mkdirs(xbmcvfs.translatePath(__addonhome__ + 'share/snmp/'))
config = xbmc.translatePath(__addonhome__ + 'share/snmp/snmpd.conf') config = xbmcvfs.translatePath(__addonhome__ + 'share/snmp/snmpd.conf')
persistent = xbmc.translatePath(__addonhome__ + 'snmpd.conf') persistent = xbmcvfs.translatePath(__addonhome__ + 'snmpd.conf')
def writeconfig(): def writeconfig():