projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6e99d57
)
[bigflix] Improve formats extraction
author
Sergey M․
<dstftw@gmail.com>
Sun, 10 Jan 2016 04:49:27 +0000
(10:49 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Sun, 10 Jan 2016 04:49:27 +0000
(10:49 +0600)
youtube_dl/extractor/bigflix.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/bigflix.py
b/youtube_dl/extractor/bigflix.py
index b7e49843648ad45901ce88efdd774539201f62d0..24720de86521b0e316aba284b274d3e1247d1665 100644
(file)
--- a/
youtube_dl/extractor/bigflix.py
+++ b/
youtube_dl/extractor/bigflix.py
@@
-20,7
+20,7
@@
class BigflixIE(InfoExtractor):
'description': 'md5:3d2ba5815f14911d5cc6a501ae0cf65d',
}
}, {
'description': 'md5:3d2ba5815f14911d5cc6a501ae0cf65d',
}
}, {
- #
multiple
formats
+ #
2
formats
'url': 'http://www.bigflix.com/Tamil-movies/Drama-movies/Madarasapatinam/16070',
'info_dict': {
'id': '16070',
'url': 'http://www.bigflix.com/Tamil-movies/Drama-movies/Madarasapatinam/16070',
'info_dict': {
'id': '16070',
@@
-32,6
+32,10
@@
class BigflixIE(InfoExtractor):
'params': {
'skip_download': True,
}
'params': {
'skip_download': True,
}
+ }, {
+ # multiple formats
+ 'url': 'http://www.bigflix.com/Malayalam-movies/Drama-movies/Indian-Rupee/15967',
+ 'only_matching': True,
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):
@@
-45,20
+49,31
@@
class BigflixIE(InfoExtractor):
def decode_url(quoted_b64_url):
return base64.b64decode(compat_urllib_parse_unquote(
def decode_url(quoted_b64_url):
return base64.b64decode(compat_urllib_parse_unquote(
- quoted_b64_url)).encode('ascii').decode('utf-8')
+ quoted_b64_url).encode('ascii')).decode('utf-8')
+
+ formats = []
+ for height, encoded_url in re.findall(
+ r'ContentURL_(\d{3,4})[pP][^=]+=([^&]+)', webpage):
+ video_url = decode_url(encoded_url)
+ f = {
+ 'url': video_url,
+ 'format_id': '%sp' % height,
+ 'height': int(height),
+ }
+ if video_url.startswith('rtmp'):
+ f['ext'] = 'flv'
+ formats.append(f)
- formats = [{
- 'url': decode_url(encoded_url),
- 'format_id': '%sp' % height,
- 'height': int(height),
- } for height, encoded_url in re.findall(
- r'ContentURL_(\d{3,4})[pP][^=]+=([^&]+)', webpage)]
+ file_url = self._search_regex(
+ r'file=([^&]+)', webpage, 'video url', default=None)
+ if file_url:
+ video_url = decode_url(file_url)
+ if all(f['url'] != video_url for f in formats):
+ formats.append({
+ 'url': decode_url(file_url),
+ })
- if not formats:
- formats.append({
- 'url': decode_url(self._search_regex(
- r'file=([^&]+)', webpage, 'video url')),
- })
+ self._sort_formats(formats)
description = self._html_search_meta('description', webpage)
description = self._html_search_meta('description', webpage)