X-Git-Url: https://git.rapsys.eu/youtubedl/blobdiff_plain/233624c1db781ee7dabbaf88453cf18e248dd20d..a7fd25993be110e616bb9bf6d602949b54df1a7d:/youtube_dl/extractor/youporn.py
diff --git a/youtube_dl/extractor/youporn.py b/youtube_dl/extractor/youporn.py
index ea0bce7..d4eccb4 100644
--- a/youtube_dl/extractor/youporn.py
+++ b/youtube_dl/extractor/youporn.py
@@ -68,11 +68,9 @@ class YouPornIE(InfoExtractor):
request.add_header('Cookie', 'age_verified=1')
webpage = self._download_webpage(request, display_id)
- title = self._search_regex(
- [r'(?:video_titles|videoTitle)\s*[:=]\s*(["\'])(?P
(?:(?!\1).)+)\1',
- r']+class=["\']heading\d?["\'][^>]*>(?P[^<]+)<'],
- webpage, 'title', group='title',
- default=None) or self._og_search_title(
+ title = self._html_search_regex(
+ r'(?s)]+class=["\']watchVideoTitle[^>]+>(.+?)
',
+ webpage, 'title', default=None) or self._og_search_title(
webpage, default=None) or self._html_search_meta(
'title', webpage, fatal=True)
@@ -134,7 +132,11 @@ class YouPornIE(InfoExtractor):
formats.append(f)
self._sort_formats(formats)
- description = self._og_search_description(webpage, default=None)
+ description = self._html_search_regex(
+ r'(?s)]+\bid=["\']description["\'][^>]*>(.+?)
',
+ webpage, 'description',
+ default=None) or self._og_search_description(
+ webpage, default=None)
thumbnail = self._search_regex(
r'(?:imageurl\s*=|poster\s*:)\s*(["\'])(?P.+?)\1',
webpage, 'thumbnail', fatal=False, group='thumbnail')