projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Fix extraction.
[youtube-dl]
/
youtube_dl
/
extractor
/
redtube.py
diff --git
a/youtube_dl/extractor/redtube.py
b/youtube_dl/extractor/redtube.py
index deb3ad52cac934cf91c74dc91de334e271ec88bd..a1ca791caaa165b520f121c5969b7f0ab6173acc 100644
(file)
--- a/
youtube_dl/extractor/redtube.py
+++ b/
youtube_dl/extractor/redtube.py
@@
-4,6
+4,7
@@
import re
from .common import InfoExtractor
from ..utils import (
from .common import InfoExtractor
from ..utils import (
+ determine_ext,
ExtractorError,
int_or_none,
merge_dicts,
ExtractorError,
int_or_none,
merge_dicts,
@@
-14,7
+15,7
@@
from ..utils import (
class RedTubeIE(InfoExtractor):
class RedTubeIE(InfoExtractor):
- _VALID_URL = r'https?://(?:(?:
www
\.)?redtube\.com/|embed\.redtube\.com/\?.*?\bid=)(?P<id>[0-9]+)'
+ _VALID_URL = r'https?://(?:(?:
\w+
\.)?redtube\.com/|embed\.redtube\.com/\?.*?\bid=)(?P<id>[0-9]+)'
_TESTS = [{
'url': 'http://www.redtube.com/66418',
'md5': 'fc08071233725f26b8f014dba9590005',
_TESTS = [{
'url': 'http://www.redtube.com/66418',
'md5': 'fc08071233725f26b8f014dba9590005',
@@
-30,6
+31,9
@@
class RedTubeIE(InfoExtractor):
}, {
'url': 'http://embed.redtube.com/?bgcolor=000000&id=1443286',
'only_matching': True,
}, {
'url': 'http://embed.redtube.com/?bgcolor=000000&id=1443286',
'only_matching': True,
+ }, {
+ 'url': 'http://it.redtube.com/66418',
+ 'only_matching': True,
}]
@staticmethod
}]
@staticmethod
@@
-77,7
+81,7
@@
class RedTubeIE(InfoExtractor):
})
medias = self._parse_json(
self._search_regex(
})
medias = self._parse_json(
self._search_regex(
- r'mediaDefinition
\s*:\s*(\[.+?
\])', webpage,
+ r'mediaDefinition
["\']?\s*:\s*(\[.+?}\s*
\])', webpage,
'media definitions', default='{}'),
video_id, fatal=False)
if medias and isinstance(medias, list):
'media definitions', default='{}'),
video_id, fatal=False)
if medias and isinstance(medias, list):
@@
-85,6
+89,12
@@
class RedTubeIE(InfoExtractor):
format_url = url_or_none(media.get('videoUrl'))
if not format_url:
continue
format_url = url_or_none(media.get('videoUrl'))
if not format_url:
continue
+ if media.get('format') == 'hls' or determine_ext(format_url) == 'm3u8':
+ formats.extend(self._extract_m3u8_formats(
+ format_url, video_id, 'mp4',
+ entry_protocol='m3u8_native', m3u8_id='hls',
+ fatal=False))
+ continue
format_id = media.get('quality')
formats.append({
'url': format_url,
format_id = media.get('quality')
formats.append({
'url': format_url,