projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[keek] extract uploader and uploader id with _search_regex
[youtube-dl]
/
youtube_dl
/
extractor
/
keek.py
diff --git
a/youtube_dl/extractor/keek.py
b/youtube_dl/extractor/keek.py
index d84774dca27e4da0322bc591d1c691aabae72669..99154112bb4fead1bd1e12fb689d7f9b911f08ba 100644
(file)
--- a/
youtube_dl/extractor/keek.py
+++ b/
youtube_dl/extractor/keek.py
@@
-1,8
+1,6
@@
# coding: utf-8
from __future__ import unicode_literals
# coding: utf-8
from __future__ import unicode_literals
-import re
-
from .common import InfoExtractor
from .common import InfoExtractor
@@
-26,10
+24,6
@@
class KeekIE(InfoExtractor):
video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
- uploader = uploader_id = None
- matches = re.search(r'data-username="(?P<uploader>[^"]+)"[^>]*data-user-id="(?P<uploader_id>[^"]+)"', webpage)
- if matches:
- uploader, uploader_id = matches.groups()
return {
'id': video_id,
return {
'id': video_id,
@@
-38,6
+32,6
@@
class KeekIE(InfoExtractor):
'title': self._og_search_title(webpage),
'description': self._og_search_description(webpage),
'thumbnail': self._og_search_thumbnail(webpage),
'title': self._og_search_title(webpage),
'description': self._og_search_description(webpage),
'thumbnail': self._og_search_thumbnail(webpage),
- 'uploader':
uploader
,
- 'uploader_id':
uploader_id
,
+ 'uploader':
self._search_regex(r'data-username="([^"]+)"', webpage, 'uploader', None)
,
+ 'uploader_id':
self._search_regex(r'data-user-id="([^"]+)"', webpage, 'uploader id', None)
,
}
}