projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1792bc3
)
[extremetube] Fix metadata extraction
author
Sergey M․
<dstftw@gmail.com>
Thu, 19 Apr 2018 15:36:33 +0000
(22:36 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Thu, 19 Apr 2018 15:36:33 +0000
(22:36 +0700)
youtube_dl/extractor/extremetube.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/extremetube.py
b/youtube_dl/extractor/extremetube.py
index 445f9438db182d0ced6d48233306a53e56271f9d..acd4090fa351c56147245983b3b1b7dd0c1e5495 100644
(file)
--- a/
youtube_dl/extractor/extremetube.py
+++ b/
youtube_dl/extractor/extremetube.py
@@
-8,12
+8,12
@@
class ExtremeTubeIE(KeezMoviesIE):
_VALID_URL = r'https?://(?:www\.)?extremetube\.com/(?:[^/]+/)?video/(?P<id>[^/#?&]+)'
_TESTS = [{
'url': 'http://www.extremetube.com/video/music-video-14-british-euro-brit-european-cumshots-swallow-652431',
_VALID_URL = r'https?://(?:www\.)?extremetube\.com/(?:[^/]+/)?video/(?P<id>[^/#?&]+)'
_TESTS = [{
'url': 'http://www.extremetube.com/video/music-video-14-british-euro-brit-european-cumshots-swallow-652431',
- 'md5': '
1fb9228f5e3332ec8c057d6ac36f33e0
',
+ 'md5': '
92feaafa4b58e82f261e5419f39c60cb
',
'info_dict': {
'id': 'music-video-14-british-euro-brit-european-cumshots-swallow-652431',
'ext': 'mp4',
'title': 'Music Video 14 british euro brit european cumshots swallow',
'info_dict': {
'id': 'music-video-14-british-euro-brit-european-cumshots-swallow-652431',
'ext': 'mp4',
'title': 'Music Video 14 british euro brit european cumshots swallow',
- 'uploader': '
unknown
',
+ 'uploader': '
anonim
',
'view_count': int,
'age_limit': 18,
}
'view_count': int,
'age_limit': 18,
}
@@
-36,10
+36,10
@@
class ExtremeTubeIE(KeezMoviesIE):
r'<h1[^>]+title="([^"]+)"[^>]*>', webpage, 'title')
uploader = self._html_search_regex(
r'<h1[^>]+title="([^"]+)"[^>]*>', webpage, 'title')
uploader = self._html_search_regex(
- r'Uploaded by:\s*</
strong>\s*(.+?)\s*</div
>',
+ r'Uploaded by:\s*</
[^>]+>\s*<a[^>]+>(.+?)</a
>',
webpage, 'uploader', fatal=False)
view_count = str_to_int(self._search_regex(
webpage, 'uploader', fatal=False)
view_count = str_to_int(self._search_regex(
- r'Views:\s*</
strong>\s*<span>([\d,\.]+)</span>
',
+ r'Views:\s*</
[^>]+>\s*<[^>]+>([\d,\.]+)</
',
webpage, 'view count', fatal=False))
info.update({
webpage, 'view count', fatal=False))
info.update({