From 5aaa26a9dc24ab5780d53155484558652dbb81ed Mon Sep 17 00:00:00 2001 From: Elliot Algase Date: Sun, 14 Jul 2019 00:13:50 -0400 Subject: [PATCH] [asiancrush] improve coding conventions --- youtube_dl/extractor/asiancrush.py | 33 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/youtube_dl/extractor/asiancrush.py b/youtube_dl/extractor/asiancrush.py index de9bf2bde..8118c5d46 100644 --- a/youtube_dl/extractor/asiancrush.py +++ b/youtube_dl/extractor/asiancrush.py @@ -10,8 +10,7 @@ from ..utils import extract_attributes class AsianCrushIE(InfoExtractor): IE_NAME = 'asiancrush' - _DOMAINS = r'(?:asiancrush\.com|yuyutv\.com|midnightpulp\.com)' - _VALID_URL = r'https?://(?:www\.)?(?P%s)/video/(?:[^/]+/)?0+(?P\d+)v\b' % _DOMAINS + _VALID_URL = r'https?://(?:www\.)?(?P(?:asiancrush\.com|yuyutv\.com|midnightpulp\.com))/video/(?:[^/]+/)?0+(?P\d+)v\b' _TESTS = [{ 'url': 'https://www.asiancrush.com/video/012869v/women-who-flirt/', 'md5': 'c3b740e48d0ba002a42c0b72857beae6', @@ -93,7 +92,8 @@ class AsianCrushIE(InfoExtractor): r'/p(?:artner_id)?/(\d+)', player, 'partner id', default='513551') - description = self._html_search_regex(r'
(.+?)
', webpage, 'description', fatal=False, flags=re.DOTALL) + description = self._html_search_regex( + r'
(.+?)
', webpage, 'description', fatal=False, flags=re.DOTALL) return { '_type': 'url_transparent', @@ -106,9 +106,7 @@ class AsianCrushIE(InfoExtractor): class AsianCrushPlaylistIE(InfoExtractor): - _VIDEO_IE = AsianCrushIE - _DOMAINS = r'(?:asiancrush\.com|yuyutv\.com|midnightpulp\.com)' - _VALID_URL = r'https?://(?:www\.)?(?P%s)/series/0+(?P\d+)s\b' % _DOMAINS + _VALID_URL = r'https?://(?:www\.)?(?P(?:asiancrush\.com|yuyutv\.com|midnightpulp\.com))/series/0+(?P\d+)s\b' _TESTS = [{ 'url': 'https://www.asiancrush.com/series/012481s/scholar-walks-night/', 'info_dict': { @@ -143,22 +141,23 @@ class AsianCrushPlaylistIE(InfoExtractor): entries = [] for mobj in re.finditer( - r']+href=(["\'])(?P%s.*?)\1[^>]*>' % self._VIDEO_IE._VALID_URL, + r']+href=(["\'])(?P%s.*?)\1[^>]*>' % AsianCrushIE._VALID_URL, webpage): attrs = extract_attributes(mobj.group(0)) if attrs.get('class') == 'clearfix': entries.append(self.url_result( - mobj.group('url'), ie=self._VIDEO_IE.ie_key())) + mobj.group('url'), ie=AsianCrushIE.ie_key())) - title = re.sub(r'\s*\|\s*.+?$', '', - self._html_search_regex( - r'(?s)]\bid=["\']movieTitle[^>]+>(.+?)', webpage, - 'title', default=None) or self._og_search_title( - webpage, default=None) or self._html_search_meta( - 'twitter:title', webpage, 'title', - default=None) or self._search_regex( - r'([^<]+)', webpage, 'title', fatal=False) - ) + title = re.sub( + r'\s*\|\s*.+?$', '', + self._html_search_regex( + r'(?s)]\bid=["\']movieTitle[^>]+>(.+?)', webpage, + 'title', default=None) or self._og_search_title( + webpage, default=None) or self._html_search_meta( + 'twitter:title', webpage, 'title', + default=None) or self._search_regex( + r'([^<]+)', webpage, 'title', fatal=False) + ) description = self._og_search_description( webpage, default=None) or self._html_search_meta(