From 5206f05fdf77bb65c125ddb133cf46a59608c671 Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Tue, 24 Dec 2024 14:52:51 -0500 Subject: Bring in line with dependency changes Signed-off-by: Andrew Opalach --- src/portal/py/modules/__init__.py | 8 ++++---- src/portal/py/modules/youtube.py | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src/portal/py/modules') diff --git a/src/portal/py/modules/__init__.py b/src/portal/py/modules/__init__.py index c44e571..cc34b82 100644 --- a/src/portal/py/modules/__init__.py +++ b/src/portal/py/modules/__init__.py @@ -14,11 +14,11 @@ ALL_MODULES = { # config.TWITTER_ACCESS_TOKEN, config.TWITTER_ACCESS_TOKEN_SECRET, # config.TWITTER_CONSUMER_TOKEN, config.TWITTER_CONSUMER_TOKEN_SECRET), []), # 'twitter': (TwitterScrapeModule(config.TWITTER_COOKIES_PATH), []), - 'pixiv_web': (PixivWebModule(config.PIXIV_SESSID, config.PIXIV_USERID), []), +# 'pixiv_web': (PixivWebModule(config.PIXIV_SESSID, config.PIXIV_USERID), []), # 'pixiv_app': (PixivAppModule(config.PIXIV_REFRESH_TOKEN), []), 'fanbox': (FanboxModule(config.FANBOX_SESSID, config.FANBOX_CF_CLEARANCE), []), - 'instagram': (InstagramModule( - config.INSTAGRAM_USER_AGENT, config.INSTAGRAM_SETTINGS_PATH, - config.INSTAGRAM_SESSION_ID), []), +# 'instagram': (InstagramModule( +# config.INSTAGRAM_USER_AGENT, config.INSTAGRAM_SETTINGS_PATH, +# config.INSTAGRAM_SESSION_ID), []), # 'patreon': (PatreonModule(config.PATREON_SESSION_ID, config.PATREON_UUID, config.PATREON_USER_ID), []) } diff --git a/src/portal/py/modules/youtube.py b/src/portal/py/modules/youtube.py index 5125f85..582a16c 100644 --- a/src/portal/py/modules/youtube.py +++ b/src/portal/py/modules/youtube.py @@ -26,7 +26,8 @@ ydl_opts = { 'quiet': False, 'logger': YDLLogger(), 'cachedir': False, - 'socket_timeout': 10 + 'socket_timeout': 10, + 'extractor_args': {'youtube': {'skip': ['hls'], 'player_client': ['android_vr']}} # 'cookiefile': '' } @@ -94,7 +95,7 @@ class YoutubeBase(Search): if info.get('direct'): url = info['url'] else: - url = get_playback_url(info, video=True) + url = get_playback_url(info, video=False) if not url: return False unique_id = f'youtube:v:{info['id']}' -- cgit v1.2.3-101-g0448