projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'SyxbEaEQ2/rate-limit'
[youtube-dl]
/
youtube_dl
/
extractor
/
fc2.py
diff --git
a/youtube_dl/extractor/fc2.py
b/youtube_dl/extractor/fc2.py
index 18f91efac450d1ec697652570b6366b1709553d0..6f5d23559b78dfb621bbf6d819612d20b96fd597 100644
(file)
--- a/
youtube_dl/extractor/fc2.py
+++ b/
youtube_dl/extractor/fc2.py
@@
-40,7
+40,7
@@
class FC2IE(InfoExtractor):
info_url = (
"http://video.fc2.com/ginfo.php?mimi={1:s}&href={2:s}&v={0:s}&fversion=WIN%2011%2C6%2C602%2C180&from=2&otag=0&upid={0:s}&tk=null&".
info_url = (
"http://video.fc2.com/ginfo.php?mimi={1:s}&href={2:s}&v={0:s}&fversion=WIN%2011%2C6%2C602%2C180&from=2&otag=0&upid={0:s}&tk=null&".
- format(video_id, mimi, compat_urllib_request.quote(refer, safe='').replace('.','%2E')))
+ format(video_id, mimi, compat_urllib_request.quote(refer, safe='').replace('.',
'%2E')))
info_webpage = self._download_webpage(
info_url, video_id, note='Downloading info page')
info_webpage = self._download_webpage(
info_url, video_id, note='Downloading info page')
@@
-50,10
+50,13
@@
class FC2IE(InfoExtractor):
raise ExtractorError('Error code: %s' % info['err_code'][0])
video_url = info['filepath'][0] + '?mid=' + info['mid'][0]
raise ExtractorError('Error code: %s' % info['err_code'][0])
video_url = info['filepath'][0] + '?mid=' + info['mid'][0]
+ title_info = info.get('title')
+ if title_info:
+ title = title_info[0]
return {
'id': video_id,
return {
'id': video_id,
- 'title':
info['title'][0]
,
+ 'title':
title
,
'url': video_url,
'ext': 'flv',
'thumbnail': thumbnail,
'url': video_url,
'ext': 'flv',
'thumbnail': thumbnail,