aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2018-04-19 22:36:33 +0700
committerSergey M․ <dstftw@gmail.com>2018-04-19 22:36:33 +0700
commitd317973284f6d9886bda0bf8215ffb4f060af41d (patch)
tree5fd13645f5f6d9fc32076f66c6c7f569976bea9c
parent1792bc3a06dbdb788d12a1e6a4a8d7072be70edb (diff)
[extremetube] Fix metadata extraction
-rw-r--r--youtube_dl/extractor/extremetube.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/youtube_dl/extractor/extremetube.py b/youtube_dl/extractor/extremetube.py
index 445f9438d..acd4090fa 100644
--- 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',
- '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',
- 'uploader': 'unknown',
+ 'uploader': 'anonim',
'view_count': int,
'age_limit': 18,
}
@@ -36,10 +36,10 @@ class ExtremeTubeIE(KeezMoviesIE):
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(
- r'Views:\s*</strong>\s*<span>([\d,\.]+)</span>',
+ r'Views:\s*</[^>]+>\s*<[^>]+>([\d,\.]+)</',
webpage, 'view count', fatal=False))
info.update({