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 6f5d23559b78dfb621bbf6d819612d20b96fd597..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