projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of github.com:rg3/youtube-dl into weibo
[youtube-dl]
/
youtube_dl
/
extractor
/
reddit.py
diff --git
a/youtube_dl/extractor/reddit.py
b/youtube_dl/extractor/reddit.py
index 01c85ee016306aa30b44c7521e736e6094b14f9c..f36bc648c28b31623b50b531ee053cfdae354320 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,
@@
-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?://(?:www\.)?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': {
@@
-81,10
+85,13
@@
class RedditRIE(InfoExtractor):
}]
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']