Skip to content

Fix all occurences of xbmc.translatePath #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
goggle merged 2 commits into from
Mar 21, 2024
Merged

Fix all occurences of xbmc.translatePath #29

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bb8e07
Fix translatePath removal
DenTheBarde Mar 17, 2024
48201f1
Fix all occurrences of xbmc.translatePath
DenTheBarde Mar 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions lib/srgssr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ def __init__(self, plugin_handle, bu='srf', addon_id=ADDON_ID):

def get_youtube_icon(self):
path = os.path.join(
xbmc.translatePath(self.media_uri), 'icon_youtube.png')
# https://github.com/xbmc/xbmc/pull/19301
xbmcvfs.translatePath(self.media_uri), 'icon_youtube.png')
if os.path.exists(path):
return path
return self.icon
Expand Down Expand Up @@ -1351,7 +1352,7 @@ def read_favourite_show_ids(self):
containing these ids.
An empty list will be returned in case of failure.
"""
path = xbmc.translatePath(
path = xbmcvfs.translatePath(
self.real_settings.getAddonInfo('profile'))
file_path = os.path.join(path, FAVOURITE_SHOWS_FILENAME)
try:
Expand All @@ -1375,7 +1376,7 @@ def write_favourite_show_ids(self, show_ids):
show_ids -- a list of show ids (as strings)
"""
show_ids_dict_list = [{'id': show_id} for show_id in show_ids]
path = xbmc.translatePath(
path = xbmcvfs.translatePath(
self.real_settings.getAddonInfo('profile'))
file_path = os.path.join(path, FAVOURITE_SHOWS_FILENAME)
if not os.path.exists(path):
Expand All @@ -1384,7 +1385,7 @@ def write_favourite_show_ids(self, show_ids):
json.dump(show_ids_dict_list, f)

def read_searches(self, filename):
path = xbmc.translatePath(self.real_settings.getAddonInfo('profile'))
path = xbmcvfs.translatePath(self.real_settings.getAddonInfo('profile'))
file_path = os.path.join(path, filename)
try:
with open(file_path, 'r') as f:
Expand All @@ -1407,7 +1408,7 @@ def write_search(self, filename, name, max_entries=10):
searches.pop()
searches.insert(0, name)
write_dict_list = [{'search': entry} for entry in searches]
path = xbmc.translatePath(self.real_settings.getAddonInfo('profile'))
path = xbmcvfs.translatePath(self.real_settings.getAddonInfo('profile'))
file_path = os.path.join(path, filename)
if not os.path.exists(path):
os.makedirs(path)
Expand Down Expand Up @@ -1451,7 +1452,7 @@ def _read_youtube_channels(self, fname):
Keyword arguments:
fname -- the path to the file to be read
"""
data_file = os.path.join(xbmc.translatePath(self.data_uri), fname)
data_file = os.path.join(xbmcvfs.translatePath(self.data_uri), fname)
with open(data_file, 'r', encoding='utf-8') as f:
ch_content = json.load(f)
cids = [elem['channel'] for elem in ch_content.get('channels', [])]
Expand Down