projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[douyutv] Update test
[youtube-dl]
/
youtube_dl
/
extractor
/
common.py
diff --git
a/youtube_dl/extractor/common.py
b/youtube_dl/extractor/common.py
index 2a099480f53d5721ca4c2a13501a87dda62b13ef..fba15d446e9f2c52e3159c1142af499484f13648 100644
(file)
--- a/
youtube_dl/extractor/common.py
+++ b/
youtube_dl/extractor/common.py
@@
-990,6
+990,7
@@
class InfoExtractor(object):
'tbr': int_or_none(e.get('bitrate')),
'width': int_or_none(e.get('width')),
'height': int_or_none(e.get('height')),
'tbr': int_or_none(e.get('bitrate')),
'width': int_or_none(e.get('width')),
'height': int_or_none(e.get('height')),
+ 'view_count': int_or_none(e.get('interactionCount')),
})
for e in json_ld:
})
for e in json_ld:
@@
-1334,7
+1335,7
@@
class InfoExtractor(object):
if '#EXT-X-FAXS-CM:' in m3u8_doc: # Adobe Flash Access
return []
if '#EXT-X-FAXS-CM:' in m3u8_doc: # Adobe Flash Access
return []
- formats = [
self._m3u8_meta_format(m3u8_url, ext, preference, m3u8_id)
]
+ formats = []
format_url = lambda u: (
u
format_url = lambda u: (
u
@@
-1386,6
+1387,7
@@
class InfoExtractor(object):
f = {
'format_id': '-'.join(format_id),
'url': format_url(media_url),
f = {
'format_id': '-'.join(format_id),
'url': format_url(media_url),
+ 'manifest_url': m3u8_url,
'language': media.get('LANGUAGE'),
'ext': ext,
'protocol': entry_protocol,
'language': media.get('LANGUAGE'),
'ext': ext,
'protocol': entry_protocol,
@@
-1397,7
+1399,9
@@
class InfoExtractor(object):
def build_stream_name():
# Despite specification does not mention NAME attribute for
def build_stream_name():
# Despite specification does not mention NAME attribute for
- # EXT-X-STREAM-INF it still sometimes may be present
+ # EXT-X-STREAM-INF tag it still sometimes may be present (see [1]
+ # or vidio test in TestInfoExtractor.test_parse_m3u8_formats)
+ # 1. http://www.vidio.com/watch/165683-dj_ambred-booyah-live-2015
stream_name = last_stream_inf.get('NAME')
if stream_name:
return stream_name
stream_name = last_stream_inf.get('NAME')
if stream_name:
return stream_name
@@
-1436,7
+1440,7
@@
class InfoExtractor(object):
f = {
'format_id': '-'.join(format_id),
'url': manifest_url,
f = {
'format_id': '-'.join(format_id),
'url': manifest_url,
- 'manifest_url': m
anifest
_url,
+ 'manifest_url': m
3u8
_url,
'tbr': tbr,
'ext': ext,
'fps': float_or_none(last_stream_inf.get('FRAME-RATE')),
'tbr': tbr,
'ext': ext,
'fps': float_or_none(last_stream_inf.get('FRAME-RATE')),
@@
-2231,7
+2235,7
@@
class InfoExtractor(object):
def _find_jwplayer_data(self, webpage, video_id=None, transform_source=js_to_json):
mobj = re.search(
def _find_jwplayer_data(self, webpage, video_id=None, transform_source=js_to_json):
mobj = re.search(
- r'(?s)jwplayer\((?P<quote>[\'"])[^\'" ]+(?P=quote)\).*?\.setup\s*\((?P<options>[^)]+)\)',
+ r'(?s)jwplayer\((?P<quote>[\'"])[^\'" ]+(?P=quote)\)
(?!</script>)
.*?\.setup\s*\((?P<options>[^)]+)\)',
webpage)
if mobj:
try:
webpage)
if mobj:
try: