From c7d258de122cf8991b1952dd2fa106c737e15a7f Mon Sep 17 00:00:00 2001 From: Alexander Seiler Date: Sun, 9 Mar 2025 01:27:03 +0100 Subject: [PATCH 1/2] Adapt to code refactor --- resources/lib/rsiplaytv.py | 44 +++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 24 deletions(-) diff --git a/resources/lib/rsiplaytv.py b/resources/lib/rsiplaytv.py index 395cb03..083851e 100644 --- a/resources/lib/rsiplaytv.py +++ b/resources/lib/rsiplaytv.py @@ -103,53 +103,49 @@ def run(): 'Search', 'RSI_YouTube', ] - RSIPlayTV().build_main_menu(identifiers) + RSIPlayTV().menu_builder.build_main_menu(identifiers) elif mode == 10: - RSIPlayTV().build_all_shows_menu() + RSIPlayTV().menu_builder.build_all_shows_menu() elif mode == 11: - RSIPlayTV().build_favourite_shows_menu() + RSIPlayTV().menu_builder.build_favourite_shows_menu() elif mode == 12: - RSIPlayTV().build_newest_favourite_menu(page=page) + RSIPlayTV().menu_builder.build_newest_favourite_menu(page=page) elif mode == 13: - RSIPlayTV().build_topics_menu() + RSIPlayTV().menu_builder.build_topics_menu() elif mode == 14: - RSIPlayTV().build_most_searched_shows_menu() + RSIPlayTV().menu_builder.build_most_searched_shows_menu() elif mode == 17: - RSIPlayTV().build_dates_overview_menu() + RSIPlayTV().menu_builder.build_dates_overview_menu() elif mode == 19: RSIPlayTV().manage_favourite_shows() - elif mode == 20: - RSIPlayTV().build_show_menu(name, page_hash=page_hash) elif mode == 21: - RSIPlayTV().build_episode_menu(name) + RSIPlayTV().menu_builder.build_episode_menu(name) elif mode == 24: - RSIPlayTV().build_date_menu(name) + RSIPlayTV().menu_builder.build_date_menu(name) elif mode == 60: - RSIPlayTV().build_specific_date_menu(name) + RSIPlayTV().menu_builder.build_specific_date_menu(name) elif mode == 25: - RSIPlayTV().pick_date() + RSIPlayTV().menu_builder.pick_date() elif mode == 27: - RSIPlayTV().build_search_menu() + RSIPlayTV().menu_builder.build_search_menu() elif mode == 28: - RSIPlayTV().build_search_media_menu( + RSIPlayTV().menu_builder.build_search_media_menu( mode=mode, name=name, page=page, page_hash=page_hash) elif mode == 70: - RSIPlayTV().build_recent_search_menu() + RSIPlayTV().menu_builder.build_recent_search_menu() elif mode == 30: - RSIPlayTV().build_youtube_channel_overview_menu(33) + RSIPlayTV().youtube_builder.build_youtube_channel_overview_menu(33) elif mode == 33: - RSIPlayTV().build_youtube_channel_menu( + RSIPlayTV().youtube_builder.build_youtube_channel_menu( name, mode, page=page, page_token=page_hash) elif mode == 50: - RSIPlayTV().play_video(name) - elif mode == 51: - RSIPlayTV().play_livestream(name) + RSIPlayTV().player.play_video(name) elif mode == 100: - RSIPlayTV().build_menu_by_urn(name) + RSIPlayTV().menu_builder.build_menu_by_urn(name) elif mode == 200: - RSIPlayTV().build_homepage_menu() + RSIPlayTV().menu_builder.build_homepage_menu() elif mode == 1000: - RSIPlayTV().build_menu_apiv3(name, mode, page, page_hash) + RSIPlayTV().menu_builder.build_menu_apiv3(name, mode, page, page_hash) xbmcplugin.setContent(int(sys.argv[1]), CONTENT_TYPE) xbmcplugin.addSortMethod(int(sys.argv[1]), xbmcplugin.SORT_METHOD_UNSORTED) From 74ba69f612fef8438d1d78e6b2de3919c25ada70 Mon Sep 17 00:00:00 2001 From: Alexander Seiler Date: Mon, 10 Mar 2025 03:33:28 +0100 Subject: [PATCH 2/2] Formatting --- addon.py | 2 +- resources/lib/rsiplaytv.py | 53 ++++++++++++++++++++------------------ 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/addon.py b/addon.py index db4a33e..eb16a58 100644 --- a/addon.py +++ b/addon.py @@ -19,5 +19,5 @@ from resources.lib import rsiplaytv -if __name__ == '__main__': +if __name__ == "__main__": rsiplaytv.run() diff --git a/resources/lib/rsiplaytv.py b/resources/lib/rsiplaytv.py index 083851e..44793a7 100644 --- a/resources/lib/rsiplaytv.py +++ b/resources/lib/rsiplaytv.py @@ -28,20 +28,19 @@ import xbmcplugin import srgssr -ADDON_ID = 'plugin.video.rsiplaytv' +ADDON_ID = "plugin.video.rsiplaytv" REAL_SETTINGS = xbmcaddon.Addon(id=ADDON_ID) -ADDON_NAME = REAL_SETTINGS.getAddonInfo('name') -ADDON_VERSION = REAL_SETTINGS.getAddonInfo('version') -DEBUG = REAL_SETTINGS.getSettingBool('Enable_Debugging') -CONTENT_TYPE = 'videos' +ADDON_NAME = REAL_SETTINGS.getAddonInfo("name") +ADDON_VERSION = REAL_SETTINGS.getAddonInfo("version") +DEBUG = REAL_SETTINGS.getSettingBool("Enable_Debugging") +CONTENT_TYPE = "videos" -YOUTUBE_CHANNELS_FILENAME = 'youtube_channels.json' +YOUTUBE_CHANNELS_FILENAME = "youtube_channels.json" class RSIPlayTV(srgssr.SRGSSR): def __init__(self): - super(RSIPlayTV, self).__init__( - int(sys.argv[1]), bu='rsi', addon_id=ADDON_ID) + super(RSIPlayTV, self).__init__(int(sys.argv[1]), bu="rsi", addon_id=ADDON_ID) def log(msg, level=xbmc.LOGDEBUG): @@ -54,8 +53,8 @@ def log(msg, level=xbmc.LOGDEBUG): """ if DEBUG: if level == xbmc.LOGERROR: - msg += ' ,' + traceback.format_exc() - xbmc.log(ADDON_ID + '-' + ADDON_VERSION + '-' + msg, level) + msg += " ," + traceback.format_exc() + xbmc.log(ADDON_ID + "-" + ADDON_VERSION + "-" + msg, level) def get_params(): @@ -80,28 +79,30 @@ def run(): except Exception: mode = None try: - page_hash = unquote_plus(params['page_hash']) + page_hash = unquote_plus(params["page_hash"]) except Exception: page_hash = None try: - page = unquote_plus(params['page']) + page = unquote_plus(params["page"]) except Exception: page = None - log('Mode: %s, URL: %s, Name: %s, Page Hash: %s, Page: %s' % ( - str(mode), str(url), str(name), str(page_hash), str(page))) + log( + "Mode: %s, URL: %s, Name: %s, Page Hash: %s, Page: %s" + % (str(mode), str(url), str(name), str(page_hash), str(page)) + ) if mode is None: identifiers = [ - 'All_Shows', - 'Favourite_Shows', - 'Newest_Favourite_Shows', - 'Homepage', - 'Topics', - 'Most_Searched_TV_Shows', - 'Shows_By_Date', - 'Search', - 'RSI_YouTube', + "All_Shows", + "Favourite_Shows", + "Newest_Favourite_Shows", + "Homepage", + "Topics", + "Most_Searched_TV_Shows", + "Shows_By_Date", + "Search", + "RSI_YouTube", ] RSIPlayTV().menu_builder.build_main_menu(identifiers) elif mode == 10: @@ -130,14 +131,16 @@ def run(): RSIPlayTV().menu_builder.build_search_menu() elif mode == 28: RSIPlayTV().menu_builder.build_search_media_menu( - mode=mode, name=name, page=page, page_hash=page_hash) + mode=mode, name=name, page=page, page_hash=page_hash + ) elif mode == 70: RSIPlayTV().menu_builder.build_recent_search_menu() elif mode == 30: RSIPlayTV().youtube_builder.build_youtube_channel_overview_menu(33) elif mode == 33: RSIPlayTV().youtube_builder.build_youtube_channel_menu( - name, mode, page=page, page_token=page_hash) + name, mode, page=page, page_token=page_hash + ) elif mode == 50: RSIPlayTV().player.play_video(name) elif mode == 100: