From 8cd5f483480f54ca3dc697ff19b04af656024976 Mon Sep 17 00:00:00 2001 From: Alexander Seiler Date: Sun, 9 Mar 2025 01:00:21 +0100 Subject: [PATCH 1/3] Adapt to code refactor --- resources/lib/srfplaytv.py | 44 +++++++++++++++++++++----------------- 1 file changed, 24 insertions(+), 20 deletions(-) diff --git a/resources/lib/srfplaytv.py b/resources/lib/srfplaytv.py index 75cb56a..45c6256 100644 --- a/resources/lib/srfplaytv.py +++ b/resources/lib/srfplaytv.py @@ -26,6 +26,9 @@ import xbmc import xbmcaddon import xbmcplugin + +# from script_module_srgssr.lib.srgssr import SRGSSR +# from script.module.srgssr.lib.srgssr import SRGSSR import srgssr ADDON_ID = 'plugin.video.srfplaytv' @@ -37,6 +40,7 @@ class SRFPlayTV(srgssr.SRGSSR): +# class SRFPlayTV(SRGSSR): def __init__(self): super(SRFPlayTV, self).__init__( int(sys.argv[1]), bu='srf', addon_id=ADDON_ID) @@ -104,49 +108,49 @@ def run(): 'Search', 'SRF_YouTube' ] - SRFPlayTV().build_main_menu(identifiers) + SRFPlayTV().menu_builder.build_main_menu(identifiers) elif mode == 10: - SRFPlayTV().build_all_shows_menu() + SRFPlayTV().menu_builder.build_all_shows_menu() elif mode == 11: - SRFPlayTV().build_favourite_shows_menu() + SRFPlayTV().menu_builder.build_favourite_shows_menu() elif mode == 12: - SRFPlayTV().build_newest_favourite_menu(page=page) + SRFPlayTV().menu_builder.build_newest_favourite_menu(page=page) elif mode == 13: - SRFPlayTV().build_topics_menu() + SRFPlayTV().menu_builder.build_topics_menu() elif mode == 14: - SRFPlayTV().build_most_searched_shows_menu() + SRFPlayTV().menu_builder.build_most_searched_shows_menu() elif mode == 17: - SRFPlayTV().build_dates_overview_menu() + SRFPlayTV().menu_builder.build_dates_overview_menu() elif mode == 19: SRFPlayTV().manage_favourite_shows() elif mode == 21: - SRFPlayTV().build_episode_menu(name) + SRFPlayTV().menu_builder.build_episode_menu(name) elif mode == 24: - SRFPlayTV().build_date_menu(name) + SRFPlayTV().menu_builder.build_date_menu(name) elif mode == 60: - SRFPlayTV().build_specific_date_menu(name) + SRFPlayTV().menu_builder.build_specific_date_menu(name) elif mode == 25: - SRFPlayTV().pick_date() + SRFPlayTV().menu_builder.pick_date() elif mode == 27: - SRFPlayTV().build_search_menu() + SRFPlayTV().menu_builder.build_search_menu() elif mode == 28: - SRFPlayTV().build_search_media_menu( + SRFPlayTV().menu_builder.build_search_media_menu( mode=mode, name=name, page=page, page_hash=page_hash) elif mode == 70: - SRFPlayTV().build_recent_search_menu() + SRFPlayTV().menu_builder.build_recent_search_menu() elif mode == 30: - SRFPlayTV().build_youtube_channel_overview_menu(33) + SRFPlayTV().youtube_builder.build_youtube_channel_overview_menu(33) elif mode == 33: - SRFPlayTV().build_youtube_channel_menu( + SRFPlayTV().youtube_builder.build_youtube_channel_menu( name, mode, page=page, page_token=page_hash) elif mode == 50: - SRFPlayTV().play_video(name) + SRFPlayTV().player.play_video(name) elif mode == 100: - SRFPlayTV().build_menu_by_urn(name) + SRFPlayTV().menu_builder.build_menu_by_urn(name) elif mode == 200: - SRFPlayTV().build_homepage_menu() + SRFPlayTV().menu_builder.build_homepage_menu() elif mode == 1000: - SRFPlayTV().build_menu_apiv3(name, mode, page, page_hash) + SRFPlayTV().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 01523d452c7b116ddf2993e87b3d2508e8f4c6c2 Mon Sep 17 00:00:00 2001 From: Alexander Seiler Date: Mon, 10 Mar 2025 03:07:28 +0100 Subject: [PATCH 2/3] Remove uncommented code --- resources/lib/srfplaytv.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/resources/lib/srfplaytv.py b/resources/lib/srfplaytv.py index 45c6256..0d6c04a 100644 --- a/resources/lib/srfplaytv.py +++ b/resources/lib/srfplaytv.py @@ -27,8 +27,6 @@ import xbmcaddon import xbmcplugin -# from script_module_srgssr.lib.srgssr import SRGSSR -# from script.module.srgssr.lib.srgssr import SRGSSR import srgssr ADDON_ID = 'plugin.video.srfplaytv' @@ -40,7 +38,6 @@ class SRFPlayTV(srgssr.SRGSSR): -# class SRFPlayTV(SRGSSR): def __init__(self): super(SRFPlayTV, self).__init__( int(sys.argv[1]), bu='srf', addon_id=ADDON_ID) From 4f06e9e72cb329f59f01cc5f4886b1f26f1a91cc Mon Sep 17 00:00:00 2001 From: Alexander Seiler Date: Mon, 10 Mar 2025 03:32:52 +0100 Subject: [PATCH 3/3] Formatting --- addon.py | 2 +- resources/lib/srfplaytv.py | 55 +++++++++++++++++++------------------- 2 files changed, 29 insertions(+), 28 deletions(-) diff --git a/addon.py b/addon.py index 30a1d03..08dbdd3 100644 --- a/addon.py +++ b/addon.py @@ -19,5 +19,5 @@ from resources.lib import srfplaytv -if __name__ == '__main__': +if __name__ == "__main__": srfplaytv.run() diff --git a/resources/lib/srfplaytv.py b/resources/lib/srfplaytv.py index 0d6c04a..4e77f05 100644 --- a/resources/lib/srfplaytv.py +++ b/resources/lib/srfplaytv.py @@ -29,18 +29,17 @@ import srgssr -ADDON_ID = 'plugin.video.srfplaytv' +ADDON_ID = "plugin.video.srfplaytv" REAL_SETTINGS = xbmcaddon.Addon(id=ADDON_ID) -ADDON_NAME = REAL_SETTINGS.getAddonInfo('name') -ADDON_VERSION = REAL_SETTINGS.getAddonInfo('version') -DEBUG = (REAL_SETTINGS.getSetting('Enable_Debugging') == 'true') -CONTENT_TYPE = 'videos' +ADDON_NAME = REAL_SETTINGS.getAddonInfo("name") +ADDON_VERSION = REAL_SETTINGS.getAddonInfo("version") +DEBUG = REAL_SETTINGS.getSetting("Enable_Debugging") == "true" +CONTENT_TYPE = "videos" class SRFPlayTV(srgssr.SRGSSR): def __init__(self): - super(SRFPlayTV, self).__init__( - int(sys.argv[1]), bu='srf', addon_id=ADDON_ID) + super(SRFPlayTV, self).__init__(int(sys.argv[1]), bu="srf", addon_id=ADDON_ID) def log(msg, level=xbmc.LOGDEBUG): @@ -53,8 +52,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(): @@ -79,31 +78,31 @@ 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: ' + str(mode)) - log('URL : ' + str(url)) - log('Name: ' + str(name)) - log('Page Hash: ' + str(page_hash)) - log('Page: ' + str(page)) + log("Mode: " + str(mode)) + log("URL : " + str(url)) + log("Name: " + str(name)) + log("Page Hash: " + str(page_hash)) + log("Page: " + str(page)) if mode is None: identifiers = [ - 'All_Shows', - 'Favourite_Shows', - 'Newest_Favourite_Shows', - 'Homepage', - 'Topics', - 'Most_Searched_TV_Shows', - 'Shows_By_Date', - 'Search', - 'SRF_YouTube' + "All_Shows", + "Favourite_Shows", + "Newest_Favourite_Shows", + "Homepage", + "Topics", + "Most_Searched_TV_Shows", + "Shows_By_Date", + "Search", + "SRF_YouTube", ] SRFPlayTV().menu_builder.build_main_menu(identifiers) elif mode == 10: @@ -132,14 +131,16 @@ def run(): SRFPlayTV().menu_builder.build_search_menu() elif mode == 28: SRFPlayTV().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: SRFPlayTV().menu_builder.build_recent_search_menu() elif mode == 30: SRFPlayTV().youtube_builder.build_youtube_channel_overview_menu(33) elif mode == 33: SRFPlayTV().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: SRFPlayTV().player.play_video(name) elif mode == 100: