projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Add support for invidiou.sh (#20309)
[youtube-dl]
/
youtube_dl
/
extractor
/
reddit.py
diff --git
a/youtube_dl/extractor/reddit.py
b/youtube_dl/extractor/reddit.py
index 01c85ee016306aa30b44c7521e736e6094b14f9c..7b0aa6232a0dea6ff09481560dc95f9a667e56e8 100644
(file)
--- a/
youtube_dl/extractor/reddit.py
+++ b/
youtube_dl/extractor/reddit.py
@@
-1,5
+1,7
@@
from __future__ import unicode_literals
from __future__ import unicode_literals
+import re
+
from .common import InfoExtractor
from ..utils import (
ExtractorError,
from .common import InfoExtractor
from ..utils import (
ExtractorError,
@@
-13,7
+15,7
@@
class RedditIE(InfoExtractor):
_TEST = {
# from https://www.reddit.com/r/videos/comments/6rrwyj/that_small_heart_attack/
'url': 'https://v.redd.it/zv89llsvexdz',
_TEST = {
# from https://www.reddit.com/r/videos/comments/6rrwyj/that_small_heart_attack/
'url': 'https://v.redd.it/zv89llsvexdz',
- 'md5': '
655d06ace653ea3b87bccfb1b27ec99d
',
+ 'md5': '
0a070c53eba7ec4534d95a5a1259e253
',
'info_dict': {
'id': 'zv89llsvexdz',
'ext': 'mp4',
'info_dict': {
'id': 'zv89llsvexdz',
'ext': 'mp4',
@@
-35,6
+37,8
@@
class RedditIE(InfoExtractor):
'https://v.redd.it/%s/DASHPlaylist.mpd' % video_id, video_id,
mpd_id='dash', fatal=False))
'https://v.redd.it/%s/DASHPlaylist.mpd' % video_id, video_id,
mpd_id='dash', fatal=False))
+ self._sort_formats(formats)
+
return {
'id': video_id,
'title': video_id,
return {
'id': video_id,
'title': video_id,
@@
-43,7
+47,7
@@
class RedditIE(InfoExtractor):
class RedditRIE(InfoExtractor):
class RedditRIE(InfoExtractor):
- _VALID_URL = r'
https?://(?:www\.)?reddit\.com/r/[^/]+/comments/(?P<id>[^/]+
)'
+ _VALID_URL = r'
(?P<url>https?://(?:[^/]+\.)?reddit\.com/r/[^/]+/comments/(?P<id>[^/?#&]+)
)'
_TESTS = [{
'url': 'https://www.reddit.com/r/videos/comments/6rrwyj/that_small_heart_attack/',
'info_dict': {
_TESTS = [{
'url': 'https://www.reddit.com/r/videos/comments/6rrwyj/that_small_heart_attack/',
'info_dict': {
@@
-70,6
+74,10
@@
class RedditRIE(InfoExtractor):
# imgur
'url': 'https://www.reddit.com/r/MadeMeSmile/comments/6t7wi5/wait_for_it/',
'only_matching': True,
# imgur
'url': 'https://www.reddit.com/r/MadeMeSmile/comments/6t7wi5/wait_for_it/',
'only_matching': True,
+ }, {
+ # imgur @ old reddit
+ 'url': 'https://old.reddit.com/r/MadeMeSmile/comments/6t7wi5/wait_for_it/',
+ 'only_matching': True,
}, {
# streamable
'url': 'https://www.reddit.com/r/videos/comments/6t7sg9/comedians_hilarious_joke_about_the_guam_flag/',
}, {
# streamable
'url': 'https://www.reddit.com/r/videos/comments/6t7sg9/comedians_hilarious_joke_about_the_guam_flag/',
@@
-78,13
+86,20
@@
class RedditRIE(InfoExtractor):
# youtube
'url': 'https://www.reddit.com/r/videos/comments/6t75wq/southern_man_tries_to_speak_without_an_accent/',
'only_matching': True,
# youtube
'url': 'https://www.reddit.com/r/videos/comments/6t75wq/southern_man_tries_to_speak_without_an_accent/',
'only_matching': True,
+ }, {
+ # reddit video @ nm reddit
+ 'url': 'https://nm.reddit.com/r/Cricket/comments/8idvby/lousy_cameraman_finds_himself_in_cairns_line_of/',
+ 'only_matching': True,
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):
+ mobj = re.match(self._VALID_URL, url)
+ url, video_id = mobj.group('url', 'id')
+
video_id = self._match_id(url)
data = self._download_json(
video_id = self._match_id(url)
data = self._download_json(
- url + '.json', video_id)[0]['data']['children'][0]['data']
+ url + '
/
.json', video_id)[0]['data']['children'][0]['data']
video_url = data['url']
video_url = data['url']