diff options
| author | Yen Chi Hsuan <yan12125@gmail.com> | 2016-01-31 20:00:07 +0800 |
|---|---|---|
| committer | Yen Chi Hsuan <yan12125@gmail.com> | 2016-01-31 20:12:43 +0800 |
| commit | b99d88c6a1d91f57e1804bd512fed1bdbf31a384 (patch) | |
| tree | e3e01cfe6d6e1d494b83fcac8457d713a055f5a5 /youtube_dl/extractor/youporn.py | |
| parent | 189d72d5fd16176a8990a9447c0165478a384676 (diff) | |
| download | youtube-dl-b99d88c6a1d91f57e1804bd512fed1bdbf31a384.tar.gz youtube-dl-b99d88c6a1d91f57e1804bd512fed1bdbf31a384.tar.xz youtube-dl-b99d88c6a1d91f57e1804bd512fed1bdbf31a384.zip | |
[youporn] Fix uploader and description
Diffstat (limited to 'youtube_dl/extractor/youporn.py')
| -rw-r--r-- | youtube_dl/extractor/youporn.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/youtube_dl/extractor/youporn.py b/youtube_dl/extractor/youporn.py index dd724085a..b29baafc4 100644 --- a/youtube_dl/extractor/youporn.py +++ b/youtube_dl/extractor/youporn.py @@ -114,15 +114,13 @@ class YouPornIE(InfoExtractor): formats.append(f) self._sort_formats(formats) - description = self._html_search_regex( - r'(?s)<div[^>]+class=["\']video-description["\'][^>]*>(.+?)</div>', - webpage, 'description', default=None) + description = self._og_search_description(webpage, default=None) thumbnail = self._search_regex( r'(?:imageurl\s*=|poster\s*:)\s*(["\'])(?P<thumbnail>.+?)\1', webpage, 'thumbnail', fatal=False, group='thumbnail') uploader = self._html_search_regex( - r'(?s)<div[^>]+class=["\']videoInfoBy["\'][^>]*>\s*By:\s*</div>(.+?)</(?:a|div)>', + r'(?s)<div[^>]+class=["\']videoInfoBy(?:\s+[^"\']+)?["\'][^>]*>\s*By:\s*</div>(.+?)</(?:a|div)>', webpage, 'uploader', fatal=False) upload_date = unified_strdate(self._html_search_regex( r'(?s)<div[^>]+class=["\']videoInfoTime["\'][^>]*>(.+?)</div>', |