projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
37e7a71
)
[redtube] Add support for embed URLs
author
Sergey M․
<dstftw@gmail.com>
Sun, 6 Nov 2016 14:39:29 +0000
(21:39 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Sun, 6 Nov 2016 14:39:29 +0000
(21:39 +0700)
youtube_dl/extractor/redtube.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/redtube.py
b/youtube_dl/extractor/redtube.py
index 721fc3a9e2d2b3431051ea00982f72ae1d98ff65..7d9285ffb5d085c6c3bf12eb38b98e001104dae8 100644
(file)
--- a/
youtube_dl/extractor/redtube.py
+++ b/
youtube_dl/extractor/redtube.py
@@
-10,8
+10,8
@@
from ..utils import (
class RedTubeIE(InfoExtractor):
class RedTubeIE(InfoExtractor):
- _VALID_URL = r'https?://(?:
www\.)?redtube\.com/
(?P<id>[0-9]+)'
- _TEST
=
{
+ _VALID_URL = r'https?://(?:
(?:www\.)?redtube\.com/|embed\.redtube\.com/\?.*?\bid=)
(?P<id>[0-9]+)'
+ _TEST
S = [
{
'url': 'http://www.redtube.com/66418',
'md5': '7b8c22b5e7098a3e1c09709df1126d2d',
'info_dict': {
'url': 'http://www.redtube.com/66418',
'md5': '7b8c22b5e7098a3e1c09709df1126d2d',
'info_dict': {
@@
-23,11
+23,15
@@
class RedTubeIE(InfoExtractor):
'view_count': int,
'age_limit': 18,
}
'view_count': int,
'age_limit': 18,
}
- }
+ }, {
+ 'url': 'http://embed.redtube.com/?bgcolor=000000&id=1443286',
+ 'only_matching': True,
+ }]
def _real_extract(self, url):
video_id = self._match_id(url)
def _real_extract(self, url):
video_id = self._match_id(url)
- webpage = self._download_webpage(url, video_id)
+ webpage = self._download_webpage(
+ 'http://www.redtube.com/%s' % video_id, video_id)
if any(s in webpage for s in ['video-deleted-info', '>This video has been removed']):
raise ExtractorError('Video %s has been removed' % video_id, expected=True)
if any(s in webpage for s in ['video-deleted-info', '>This video has been removed']):
raise ExtractorError('Video %s has been removed' % video_id, expected=True)