From a76dedba7ad8734324580090738677ffcf9a0f1c Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sat, 6 Mar 2021 05:00:59 +0000 Subject: [PATCH 1/5] librespot: update xbmc.translatePath (deprecated) to xbmcvfs.translatePath --- .../addons/service/librespot/source/resources/lib/ls_addon.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/addons/service/librespot/source/resources/lib/ls_addon.py b/packages/addons/service/librespot/source/resources/lib/ls_addon.py index 32838fb3a6..b260075541 100644 --- a/packages/addons/service/librespot/source/resources/lib/ls_addon.py +++ b/packages/addons/service/librespot/source/resources/lib/ls_addon.py @@ -1,6 +1,7 @@ import os import socket import xbmc +import xbmcvfs import xbmcaddon import xbmcgui @@ -18,7 +19,7 @@ DEFAULTS = dict( ) ADDON = xbmcaddon.Addon() -ADDON_HOME = xbmc.translatePath(ADDON.getAddonInfo('profile')) +ADDON_HOME = xbmcvfs.translatePath(ADDON.getAddonInfo('profile')) ADDON_ICON = ADDON.getAddonInfo('icon') ADDON_NAME = ADDON.getAddonInfo('name') ADDON_PATH = ADDON.getAddonInfo('path') From f11af7b00dcdfb42d1167c7b28d45849049fffbb Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sat, 6 Mar 2021 05:05:04 +0000 Subject: [PATCH 2/5] imon-mce: update xbmc.translatePath (deprecated) to xbmcvfs.translatePath --- packages/addons/driver/imon-mce/source/default.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/addons/driver/imon-mce/source/default.py b/packages/addons/driver/imon-mce/source/default.py index 7954985136..a8754a457a 100644 --- a/packages/addons/driver/imon-mce/source/default.py +++ b/packages/addons/driver/imon-mce/source/default.py @@ -1,15 +1,17 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) import os import sys import xbmcaddon +import xbmcvfs __scriptname__ = "IMON MCE Remote driver" __author__ = "LibreELEC" __url__ = "https://libreelec.tv" __settings__ = xbmcaddon.Addon(id='driver.remote.imon-mce') __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__) From 51a86b869d76501f83c0d122bc668be793d94519 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sat, 6 Mar 2021 05:06:45 +0000 Subject: [PATCH 3/5] hdhomerun: update xbmc.translatePath (deprecated) to xbmcvfs.translatePath --- .../addons/driver/hdhomerun/source/resources/actions.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/addons/driver/hdhomerun/source/resources/actions.py b/packages/addons/driver/hdhomerun/source/resources/actions.py index ca6d98c455..3c7283c291 100644 --- a/packages/addons/driver/hdhomerun/source/resources/actions.py +++ b/packages/addons/driver/hdhomerun/source/resources/actions.py @@ -1,14 +1,16 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) import os import sys import xbmcaddon +import xbmcvfs __settings__ = xbmcaddon.Addon(id = 'driver.dvb.hdhomerun') __cwd__ = __settings__.getAddonInfo('path') -__resources_lib__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'lib')) -__settings_xml__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'settings.xml')) +__resources_lib__ = xbmcvfs.translatePath(os.path.join(__cwd__, 'resources', 'lib')) +__settings_xml__ = xbmcvfs.translatePath(os.path.join(__cwd__, 'resources', 'settings.xml')) if len(sys.argv) == 2 and sys.argv[1] == 'refresh_tuners': sys.path.append(__resources_lib__) From f2cddd7a5c73c3629a45987d7fd6d59fb1530c6a Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sat, 6 Mar 2021 05:08:51 +0000 Subject: [PATCH 4/5] sundtek-mediatv: update xbmc.translatePath (deprecated) to xbmcvfs.translatePath --- .../driver/sundtek-mediatv/source/resources/actions.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/addons/driver/sundtek-mediatv/source/resources/actions.py b/packages/addons/driver/sundtek-mediatv/source/resources/actions.py index c2073c3c5a..9a41427130 100644 --- a/packages/addons/driver/sundtek-mediatv/source/resources/actions.py +++ b/packages/addons/driver/sundtek-mediatv/source/resources/actions.py @@ -1,19 +1,21 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv) +# Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) import os import sys import subprocess import xbmcaddon +import xbmcvfs __settings__ = xbmcaddon.Addon(id = 'driver.dvb.sundtek-mediatv') __cwd__ = __settings__.getAddonInfo('path') -__resources_lib__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'lib')) -__settings_xml__ = xbmc.translatePath(os.path.join(__cwd__, 'resources', 'settings.xml')) +__resources_lib__ = xbmcvfs.translatePath(os.path.join(__cwd__, 'resources', 'lib')) +__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' -__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 sys.argv[1] == 'refresh_tuners': From 581c28b161dce1cebf1768b5316a07e2fefff537 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Sat, 6 Mar 2021 05:10:38 +0000 Subject: [PATCH 5/5] net-snmp: update xbmc.translatePath (deprecated) to xbmcvfs.translatePath --- packages/addons/service/net-snmp/source/default.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/addons/service/net-snmp/source/default.py b/packages/addons/service/net-snmp/source/default.py index e291fb73a6..9fe3bee8bf 100644 --- a/packages/addons/service/net-snmp/source/default.py +++ b/packages/addons/service/net-snmp/source/default.py @@ -17,12 +17,12 @@ class MyMonitor(xbmc.Monitor): # addon __addon__ = xbmcaddon.Addon(id='service.net-snmp') -__addonpath__ = xbmc.translatePath(__addon__.getAddonInfo('path')) -__addonhome__ = xbmc.translatePath(__addon__.getAddonInfo('profile')) -if not xbmcvfs.exists(xbmc.translatePath(__addonhome__ + 'share/snmp/')): - xbmcvfs.mkdirs(xbmc.translatePath(__addonhome__ + 'share/snmp/')) -config = xbmc.translatePath(__addonhome__ + 'share/snmp/snmpd.conf') -persistent = xbmc.translatePath(__addonhome__ + 'snmpd.conf') +__addonpath__ = xbmcvfs.translatePath(__addon__.getAddonInfo('path')) +__addonhome__ = xbmcvfs.translatePath(__addon__.getAddonInfo('profile')) +if not xbmcvfs.exists(xbmcvfs.translatePath(__addonhome__ + 'share/snmp/')): + xbmcvfs.mkdirs(xbmcvfs.translatePath(__addonhome__ + 'share/snmp/')) +config = xbmcvfs.translatePath(__addonhome__ + 'share/snmp/snmpd.conf') +persistent = xbmcvfs.translatePath(__addonhome__ + 'snmpd.conf') def writeconfig():