mirror of
https://github.com/yt-dlp/yt-dlp.git
synced 2024-11-20 07:09:16 +00:00
[extractor/reddit] Extract video embeds in text posts (#5677)
Closes #5612 Authored by: bashonly
This commit is contained in:
parent
ba72399723
commit
0e96b408b9
|
@ -1,15 +1,15 @@
|
||||||
import random
|
import random
|
||||||
from urllib.parse import urlparse
|
import urllib.parse
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
ExtractorError,
|
ExtractorError,
|
||||||
int_or_none,
|
|
||||||
float_or_none,
|
float_or_none,
|
||||||
|
int_or_none,
|
||||||
|
traverse_obj,
|
||||||
try_get,
|
try_get,
|
||||||
unescapeHTML,
|
unescapeHTML,
|
||||||
url_or_none,
|
url_or_none,
|
||||||
traverse_obj
|
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
@ -56,6 +56,14 @@ class RedditIE(InfoExtractor):
|
||||||
'comment_count': int,
|
'comment_count': int,
|
||||||
'age_limit': 0,
|
'age_limit': 0,
|
||||||
},
|
},
|
||||||
|
}, {
|
||||||
|
# videos embedded in reddit text post
|
||||||
|
'url': 'https://www.reddit.com/r/KamenRider/comments/wzqkxp/finale_kamen_rider_revice_episode_50_family_to/',
|
||||||
|
'playlist_count': 2,
|
||||||
|
'info_dict': {
|
||||||
|
'id': 'wzqkxp',
|
||||||
|
'title': 'md5:72d3d19402aa11eff5bd32fc96369b37',
|
||||||
|
},
|
||||||
}, {
|
}, {
|
||||||
'url': 'https://www.reddit.com/r/videos/comments/6rrwyj',
|
'url': 'https://www.reddit.com/r/videos/comments/6rrwyj',
|
||||||
'only_matching': True,
|
'only_matching': True,
|
||||||
|
@ -102,10 +110,6 @@ def _real_extract(self, url):
|
||||||
data = data[0]['data']['children'][0]['data']
|
data = data[0]['data']['children'][0]['data']
|
||||||
video_url = data['url']
|
video_url = data['url']
|
||||||
|
|
||||||
# Avoid recursing into the same reddit URL
|
|
||||||
if 'reddit.com/' in video_url and '/%s/' % video_id in video_url:
|
|
||||||
raise ExtractorError('No media found', expected=True)
|
|
||||||
|
|
||||||
over_18 = data.get('over_18')
|
over_18 = data.get('over_18')
|
||||||
if over_18 is True:
|
if over_18 is True:
|
||||||
age_limit = 18
|
age_limit = 18
|
||||||
|
@ -148,6 +152,32 @@ def add_thumbnail(src):
|
||||||
'age_limit': age_limit,
|
'age_limit': age_limit,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
parsed_url = urllib.parse.urlparse(video_url)
|
||||||
|
|
||||||
|
# Check for embeds in text posts, or else raise to avoid recursing into the same reddit URL
|
||||||
|
if 'reddit.com' in parsed_url.netloc and f'/{video_id}/' in parsed_url.path:
|
||||||
|
entries = []
|
||||||
|
for media in traverse_obj(data, ('media_metadata', ...), expected_type=dict):
|
||||||
|
if not media.get('id') or media.get('e') != 'RedditVideo':
|
||||||
|
continue
|
||||||
|
formats = []
|
||||||
|
if media.get('hlsUrl'):
|
||||||
|
formats.extend(self._extract_m3u8_formats(
|
||||||
|
unescapeHTML(media['hlsUrl']), video_id, 'mp4', m3u8_id='hls', fatal=False))
|
||||||
|
if media.get('dashUrl'):
|
||||||
|
formats.extend(self._extract_mpd_formats(
|
||||||
|
unescapeHTML(media['dashUrl']), video_id, mpd_id='dash', fatal=False))
|
||||||
|
if formats:
|
||||||
|
entries.append({
|
||||||
|
'id': media['id'],
|
||||||
|
'display_id': video_id,
|
||||||
|
'formats': formats,
|
||||||
|
**info,
|
||||||
|
})
|
||||||
|
if entries:
|
||||||
|
return self.playlist_result(entries, video_id, info.get('title'))
|
||||||
|
raise ExtractorError('No media found', expected=True)
|
||||||
|
|
||||||
# Check if media is hosted on reddit:
|
# Check if media is hosted on reddit:
|
||||||
reddit_video = traverse_obj(data, (('media', 'secure_media'), 'reddit_video'), get_all=False)
|
reddit_video = traverse_obj(data, (('media', 'secure_media'), 'reddit_video'), get_all=False)
|
||||||
if reddit_video:
|
if reddit_video:
|
||||||
|
@ -189,7 +219,6 @@ def add_thumbnail(src):
|
||||||
'duration': int_or_none(reddit_video.get('duration')),
|
'duration': int_or_none(reddit_video.get('duration')),
|
||||||
}
|
}
|
||||||
|
|
||||||
parsed_url = urlparse(video_url)
|
|
||||||
if parsed_url.netloc == 'v.redd.it':
|
if parsed_url.netloc == 'v.redd.it':
|
||||||
self.raise_no_formats('This video is processing', expected=True, video_id=video_id)
|
self.raise_no_formats('This video is processing', expected=True, video_id=video_id)
|
||||||
return {
|
return {
|
||||||
|
|
Loading…
Reference in a new issue