projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SpankBang] Use python2.6 compatible string formatting spec
[youtube-dl]
/
youtube_dl
/
extractor
/
vodlocker.py
diff --git
a/youtube_dl/extractor/vodlocker.py
b/youtube_dl/extractor/vodlocker.py
index 68c59364bc7f48e453b85e70ecc750b4418f0a75..1c0966a793511a2ec3a9d147bd75ff22e8fb7209 100644
(file)
--- a/
youtube_dl/extractor/vodlocker.py
+++ b/
youtube_dl/extractor/vodlocker.py
@@
-2,15
+2,16
@@
from __future__ import unicode_literals
import re
from __future__ import unicode_literals
import re
+
from .common import InfoExtractor
from .common import InfoExtractor
-from ..
utils
import (
+from ..
compat
import (
compat_urllib_parse,
compat_urllib_request,
)
class VodlockerIE(InfoExtractor):
compat_urllib_parse,
compat_urllib_request,
)
class VodlockerIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?vodlocker.com/(?P<id>[0-9a-zA-Z]+)(?:\..*?)?'
+ _VALID_URL = r'https?://(?:www\.)?vodlocker
\
.com/(?P<id>[0-9a-zA-Z]+)(?:\..*?)?'
_TESTS = [{
'url': 'http://vodlocker.com/e8wvyzz4sl42',
_TESTS = [{
'url': 'http://vodlocker.com/e8wvyzz4sl42',
@@
-24,8
+25,7
@@
class VodlockerIE(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)
fields = dict(re.findall(r'''(?x)<input\s+
webpage = self._download_webpage(url, video_id)
fields = dict(re.findall(r'''(?x)<input\s+
@@
-44,7
+44,7
@@
class VodlockerIE(InfoExtractor):
req, video_id, 'Downloading video page')
title = self._search_regex(
req, video_id, 'Downloading video page')
title = self._search_regex(
- r'id="file_title".*?>\s*(.*?)\s*<
span
', webpage, 'title')
+ r'id="file_title".*?>\s*(.*?)\s*<
(?:br|span)
', webpage, 'title')
thumbnail = self._search_regex(
r'image:\s*"(http[^\"]+)",', webpage, 'thumbnail')
url = self._search_regex(
thumbnail = self._search_regex(
r'image:\s*"(http[^\"]+)",', webpage, 'thumbnail')
url = self._search_regex(