From 100ac570d7c8c7d43e887c197be1fc5a59821718 Mon Sep 17 00:00:00 2001 From: MoojMidge <56883549+MoojMidge@users.noreply.github.com> Date: Sun, 14 Jan 2024 15:50:02 +1100 Subject: [PATCH] Add basic checks for valid My Subscription request data - TODO: Rewrite YouTube.get_my_subscriptions with better error and thread handling --- .../youtube_plugin/youtube/client/youtube.py | 4 ++-- .../youtube/helper/yt_specials.py | 23 +++++++------------ 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/resources/lib/youtube_plugin/youtube/client/youtube.py b/resources/lib/youtube_plugin/youtube/client/youtube.py index 2bc7662c6..ccb49226f 100644 --- a/resources/lib/youtube_plugin/youtube/client/youtube.py +++ b/resources/lib/youtube_plugin/youtube/client/youtube.py @@ -1298,7 +1298,7 @@ def _perform(_page_token, _offset, _result): # if new uploads is cached cache_items_key = 'my-subscriptions-items' - cached = cache.get_item(cache_items_key, cache.ONE_HOUR) + cached = cache.get_item(cache_items_key, cache.ONE_HOUR) or [] if cached: _result['items'] = cached @@ -1398,7 +1398,7 @@ def fetch_xml(_url, _responses): # sorting by publish date def _sort_by_date_time(item): return datetime_parser.since_epoch( - datetime_parser.strptime(item['published'][0:19]) + datetime_parser.strptime(item['published']) ) _result['items'].sort(reverse=True, key=_sort_by_date_time) diff --git a/resources/lib/youtube_plugin/youtube/helper/yt_specials.py b/resources/lib/youtube_plugin/youtube/helper/yt_specials.py index 5468973be..1f5cc53b3 100644 --- a/resources/lib/youtube_plugin/youtube/helper/yt_specials.py +++ b/resources/lib/youtube_plugin/youtube/helper/yt_specials.py @@ -171,7 +171,7 @@ def _extract_urls(video_id): ) as progress_dialog: resource_manager = provider.get_resource_manager(context) - video_data = resource_manager.get_videos((video_id, )) + video_data = resource_manager.get_videos((video_id,)) yt_item = video_data[video_id] if not yt_item or 'snippet' not in yt_item: context.get_ui().on_ok( @@ -286,21 +286,12 @@ def _process_saved_playlists_tv(provider, context): offset=context.get_param('offset', 0) ) + if not json_data: + return False return tv.saved_playlists_to_items(provider, context, json_data) -def _process_new_uploaded_videos_tv(provider, context): - context.set_content(content.VIDEO_CONTENT) - - json_data = provider.get_client(context).get_my_subscriptions( - page_token=context.get_param('next_page_token', ''), - offset=context.get_param('offset', 0) - ) - - return tv.my_subscriptions_to_items(provider, context, json_data) - - -def _process_new_uploaded_videos_tv_filtered(provider, context): +def _process_new_uploaded_videos_tv(provider, context, filtered=False): context.set_content(content.VIDEO_CONTENT) json_data = provider.get_client(context).get_my_subscriptions( @@ -308,10 +299,12 @@ def _process_new_uploaded_videos_tv_filtered(provider, context): offset=context.get_param('offset', 0) ) + if not json_data: + return False return tv.my_subscriptions_to_items(provider, context, json_data, - do_filter=True) + do_filter=filtered) def process(category, provider, context): @@ -333,7 +326,7 @@ def process(category, provider, context): if category == 'new_uploaded_videos_tv': return _process_new_uploaded_videos_tv(provider, context) if category == 'new_uploaded_videos_tv_filtered': - return _process_new_uploaded_videos_tv_filtered(provider, context) + return _process_new_uploaded_videos_tv(provider, context, filtered=True) if category == 'disliked_videos': return _process_disliked_videos(provider, context) if category == 'live':