spawnrys/flanabot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix scraping codec and extension with audio_only

Browse Source
This commit is contained in:
AlberLC
2023-07-10 17:22:43 +02:00
parent 7b03f6db63
commit 7adfa819df
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
flanabot/bots/scraper_bot.py
View File

@@ -174,6 +174,13 @@ class ScraperBot(MultiBot, ABC):
medias = OrderedSet() medias = OrderedSet()
exceptions: list[Exception] = [] exceptions: list[Exception] = []
if audio_only:
preferred_video_codec = None
preferred_extension = None
else:
preferred_video_codec = 'h264'
preferred_extension = 'mp4'
ids = [] ids = []
media_urls = [] media_urls = []
for text_part in message.text.split(): for text_part in message.text.split():
@@ -196,7 +203,7 @@ class ScraperBot(MultiBot, ABC):
tweet_ids, instagram_ids, reddit_ids, tiktok_users_and_ids, tiktok_download_urls = ids tweet_ids, instagram_ids, reddit_ids, tiktok_users_and_ids, tiktok_download_urls = ids
try: try:
reddit_medias = await reddit.get_medias(reddit_ids, 'h264', 'mp4', force, audio_only, timeout_for_media) reddit_medias = await reddit.get_medias(reddit_ids, preferred_video_codec, preferred_extension, force, audio_only, timeout_for_media)
except RedditMediaNotFoundError as e: except RedditMediaNotFoundError as e:
exceptions.append(e) exceptions.append(e)
reddit_medias = () reddit_medias = ()
@@ -219,8 +226,8 @@ class ScraperBot(MultiBot, ABC):
gather_future = asyncio.gather( gather_future = asyncio.gather(
twitter.get_medias(tweet_ids, audio_only), twitter.get_medias(tweet_ids, audio_only),
tiktok.get_medias(tiktok_users_and_ids, tiktok_download_urls, 'h264', 'mp4', force, audio_only, timeout_for_media), tiktok.get_medias(tiktok_users_and_ids, tiktok_download_urls, preferred_video_codec, preferred_extension, force, audio_only, timeout_for_media),
yt_dlp_wrapper.get_medias(media_urls, 'h264', 'mp4', force, audio_only, timeout_for_media), yt_dlp_wrapper.get_medias(media_urls, preferred_video_codec, preferred_extension, force, audio_only, timeout_for_media),
return_exceptions=True return_exceptions=True
) )
@@ -245,7 +252,7 @@ class ScraperBot(MultiBot, ABC):
try: try:
instagram_results += await instagram.get_medias_v2(instagram_ids, audio_only) instagram_results += await instagram.get_medias_v2(instagram_ids, audio_only)
except InstagramMediaNotFoundError as e: except InstagramMediaNotFoundError as e:
instagram_results += await yt_dlp_wrapper.get_medias(instagram.make_urls(instagram_ids), 'h264', 'mp4', force, audio_only, timeout_for_media) instagram_results += await yt_dlp_wrapper.get_medias(instagram.make_urls(instagram_ids), preferred_video_codec, preferred_extension, force, audio_only, timeout_for_media)
if not instagram_results: if not instagram_results:
exceptions.append(e) exceptions.append(e)