projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[netzkino] Add new extractor (Fixes #4669)
[youtube-dl]
/
youtube_dl
/
extractor
/
fc2.py
diff --git
a/youtube_dl/extractor/fc2.py
b/youtube_dl/extractor/fc2.py
index 18f91efac450d1ec697652570b6366b1709553d0..81ceace53289709b93d7c647f6627197320381ef 100644
(file)
--- a/
youtube_dl/extractor/fc2.py
+++ b/
youtube_dl/extractor/fc2.py
@@
-1,19
+1,20
@@
#! -*- coding: utf-8 -*-
from __future__ import unicode_literals
#! -*- coding: utf-8 -*-
from __future__ import unicode_literals
-import re
import hashlib
from .common import InfoExtractor
import hashlib
from .common import InfoExtractor
-from ..utils import (
- ExtractorError,
+from ..compat import (
compat_urllib_request,
compat_urlparse,
)
compat_urllib_request,
compat_urlparse,
)
+from ..utils import (
+ ExtractorError,
+)
class FC2IE(InfoExtractor):
class FC2IE(InfoExtractor):
- _VALID_URL = r'^http://video\.fc2\.com/(
(?P<lang>[^/]+)
/)?content/(?P<id>[^/]+)'
+ _VALID_URL = r'^http://video\.fc2\.com/(
?:[^/]+
/)?content/(?P<id>[^/]+)'
IE_NAME = 'fc2'
_TEST = {
'url': 'http://video.fc2.com/en/content/20121103kUan1KHs',
IE_NAME = 'fc2'
_TEST = {
'url': 'http://video.fc2.com/en/content/20121103kUan1KHs',
@@
-26,9
+27,7
@@
class FC2IE(InfoExtractor):
}
def _real_extract(self, url):
}
def _real_extract(self, url):
- mobj = re.match(self._VALID_URL, url)
- video_id = mobj.group('id')
-
+ video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
self._downloader.cookiejar.clear_session_cookies() # must clear
webpage = self._download_webpage(url, video_id)
self._downloader.cookiejar.clear_session_cookies() # must clear
@@
-40,7
+39,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
+49,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,