projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
fdf0166
)
fix some not important codesnips
author
Celthi
<txtlu0@gmail.com>
Fri, 11 Dec 2015 11:18:14 +0000
(19:18 +0800)
committer
Celthi
<txtlu0@gmail.com>
Fri, 11 Dec 2015 11:18:14 +0000
(19:18 +0800)
youtube_dl/extractor/youku.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/youku.py
b/youtube_dl/extractor/youku.py
index 155286fc5ce5e86817373fefa43b414b08587941..0e955db8ad236297f9a08182bd3c45af0482b7a0 100644
(file)
--- a/
youtube_dl/extractor/youku.py
+++ b/
youtube_dl/extractor/youku.py
@@
-1,15
+1,11
@@
# coding: utf-8
from __future__ import unicode_literals
# coding: utf-8
from __future__ import unicode_literals
-import json
import base64
from .common import InfoExtractor
from ..compat import (
compat_urllib_parse,
import base64
from .common import InfoExtractor
from ..compat import (
compat_urllib_parse,
- compat_cookiejar,
- compat_cookies,
- compat_urllib_request,
compat_ord,
)
from ..utils import (
compat_ord,
)
from ..utils import (
@@
-89,7
+85,7
@@
class YoukuIE(InfoExtractor):
).decode('ascii').split('_')
# get oip
).decode('ascii').split('_')
# get oip
- oip = data
2
['security']['ip']
+ oip = data
1
['security']['ip']
# get fileid
string_ls = list(
# get fileid
string_ls = list(
@@
-136,7
+132,8
@@
class YoukuIE(InfoExtractor):
format = stream.get('stream_type')
video_urls = []
for dt in stream['segs']:
format = stream.get('stream_type')
video_urls = []
for dt in stream['segs']:
- n = str(int(dt['size']))
+ #n = str(int(dt['size']))
+ n = str(stream['segs'].index(dt))
param = {
'K': dt['key'],
'hd': self.get_hd(format),
param = {
'K': dt['key'],
'hd': self.get_hd(format),
@@
-177,6
+174,8
@@
class YoukuIE(InfoExtractor):
ext_dict = {
'flv': 'flv',
'mp4': 'mp4',
ext_dict = {
'flv': 'flv',
'mp4': 'mp4',
+ 'mp4hd': 'mp4',
+ 'mp4hd2': 'mp4',
'hd2': 'flv',
'hd3': 'flv',
'3gp': 'flv',
'hd2': 'flv',
'hd3': 'flv',
'3gp': 'flv',
@@
-214,7
+213,6
@@
class YoukuIE(InfoExtractor):
req.add_header('Ytdl-request-proxy', cn_verification_proxy)
raw_data = self._download_json(req, video_id, note=note)
req.add_header('Ytdl-request-proxy', cn_verification_proxy)
raw_data = self._download_json(req, video_id, note=note)
- jsonDumpIn = json.dumps(raw_data,indent = 1)
return raw_data['data']
return raw_data['data']
@@
-260,7
+258,7
@@
class YoukuIE(InfoExtractor):
'formats': [],
# some formats are not available for all parts, we have to detect
# which one has all
'formats': [],
# some formats are not available for all parts, we have to detect
# which one has all
- } for i in range(max(len(v) for v in data1['stream']))]
+ } for i in range(max(len(v
.get('segs')
) for v in data1['stream']))]
for stream in data1['stream']:
fm = stream.get('stream_type')
video_urls = video_urls_dict[fm]
for stream in data1['stream']:
fm = stream.get('stream_type')
video_urls = video_urls_dict[fm]