1
0
mirror of https://github.com/l1ving/youtube-dl synced 2020-11-18 19:53:54 -08:00

[YouPorn] Make title regex more specific.

Safe to drop _search_regex? _og_search_title also finds the correct title.
This commit is contained in:
Odd Stråbø 2019-01-05 00:58:27 +01:00 committed by GitHub
parent de0359c0af
commit 89df890214
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -68,13 +68,13 @@ class YouPornIE(InfoExtractor):
request.add_header('Cookie', 'age_verified=1') request.add_header('Cookie', 'age_verified=1')
webpage = self._download_webpage(request, display_id) webpage = self._download_webpage(request, display_id)
title = self._search_regex( title = self._search_regex([
[r'(?:video_titles|videoTitle)\s*[:=]\s*(["\'])(?P<title>(?:(?!\1).)+)\1', r'[=:]\s*(["\'])video[\._-]titles?\1[^>]*>\s*<\s*h1[^>]+class=["\']heading\d?["\'][^>]*>(?P<title>[^<]+)<',
r'<h1[^>]+class=["\']heading\d?["\'][^>]*>(?P<title>[^<]+)<'], r'(?:video_titles|videoTitle)\s*[:=]\s*(["\'])(?P<title>(?:(?!\1).)+)\1',
webpage, 'title', group='title', #r'<h1[^>]+class=["\']heading\d?["\'][^>]*>(?P<title>[^<]+)<',
default=None) or self._og_search_title( ], webpage, 'title', group='title', default=None) \
webpage, default=None) or self._html_search_meta( or self._og_search_title(webpage, default=None) \
'title', webpage, fatal=True) or self._html_search_meta('title', webpage, fatal=True)
links = [] links = []