From 233400f3d92dd3ac8ef4664f9679eb09c9132d98 Mon Sep 17 00:00:00 2001 From: Niklas Sombert Date: Wed, 9 Oct 2019 20:04:51 +0200 Subject: [PATCH] [hhu] Don't place closing braces/brackets/parentheses on their own lines --- youtube_dl/extractor/hhu.py | 59 ++++++++++++------------------------- 1 file changed, 19 insertions(+), 40 deletions(-) diff --git a/youtube_dl/extractor/hhu.py b/youtube_dl/extractor/hhu.py index ca4a36e18..a23ae7d96 100644 --- a/youtube_dl/extractor/hhu.py +++ b/youtube_dl/extractor/hhu.py @@ -26,15 +26,12 @@ class HHUIE(InfoExtractor): 'UKD', 'eLearning', 'Abstimmsysteme', 'Portale', 'Studierendenportal', 'Lehrfilme', 'Lehrfilm', 'Operationsfilme', 'Vorlesungsaufzeichnung', 'Multimedia', - 'ZIM', 'HHU', 'Ute', 'Clames', # yes, that's incorrect - ], + 'ZIM', 'HHU', 'Ute', 'Clames', ], # yes, that's incorrect 'uploader': 'clames', 'uploader_id': 'clames', 'license': 'CC BY 3.0 DE', 'upload_date': '20150126', - 'thumbnail': 'https://mediathek.hhu.de/thumbs/2dd05982-ea45-4108-9620-0c36e6ed8df5/thumb_000.jpg', - } - } + 'thumbnail': 'https://mediathek.hhu.de/thumbs/2dd05982-ea45-4108-9620-0c36e6ed8df5/thumb_000.jpg', }} def _real_extract(self, url): video_id = self._match_id(url) @@ -44,30 +41,25 @@ class HHUIE(InfoExtractor): # Some videos need a login, maybe TODO. try: config_js = self._search_regex( - r'playerInstance\.setup\(([^;]+)\);', webpage, 'config_js' - ) + r'playerInstance\.setup\(([^;]+)\);', webpage, 'config_js') # remove 'link: encodeURI(""),' if 'link: encodeURI' in config_js: encode_begin = config_js.find('link: encodeURI') encode_end = config_js.find(')', encode_begin) config_js = ( - config_js[:encode_begin] + config_js[encode_end + 2:] - ) + config_js[:encode_begin] + config_js[encode_end + 2:]) del encode_begin, encode_end config = json.loads(js_to_json(config_js)) if len(config['playlist']) > 1: self.report_warning( - 'more than one video, just taking the first one' - ) + 'more than one video, just taking the first one') video = config['playlist'][0] formats = [ { 'url': urljoin('https://mediathek.hhu.de/', source['file']), 'format_note': source.get('label'), - 'format_id': source['file'].split("/")[-1], - } - for source in video['sources'] - ] + 'format_id': source['file'].split("/")[-1], } + for source in video['sources']] formats.reverse() # config sorts from highest to lowest quality title = video.get('title') thumbnail = video.get('image') @@ -78,8 +70,7 @@ class HHUIE(InfoExtractor): # This will likely work but better warn. file_id = self._html_search_regex( r"{ file: '\/movies\/(.+?)\/v_100\.mp4', label: '", - webpage, 'file_id' - ) + webpage, 'file_id') formats = [ ({'url': format_url.format(file_id)}) for format_url in ( @@ -88,54 +79,43 @@ class HHUIE(InfoExtractor): 'https://mediathek.hhu.de/movies/{}/v_50.webm', 'https://mediathek.hhu.de/movies/{}/v_50.mp4', 'https://mediathek.hhu.de/movies/{}/v_100.webm', - 'https://mediathek.hhu.de/movies/{}/v_100.mp4', - ) - ] + 'https://mediathek.hhu.de/movies/{}/v_100.mp4',)] title = thumbnail = None if not title: title = self._html_search_regex( r'

\s+(.+?)\s+<\/h1>', - webpage, 'title' - ) + webpage, 'title') if not title: title = self._og_search_title(webpage, fatal=False) description = self._html_search_regex( r'

\s+(.+?)\s+<\/p>', - webpage, 'description', fatal=False - ) + webpage, 'description', fatal=False) if not description: description = self._og_search_description(webpage, default='') if not thumbnail: thumbnail = self._og_search_property( - 'image:secure_url', webpage, 'thumbnail', fatal=False - ) + 'image:secure_url', webpage, 'thumbnail', fatal=False) uploader = self._html_search_regex( r'(.+?)<\/a>', - webpage, 'uploader', fatal=False - ) + webpage, 'uploader', fatal=False) uploader_id = self._html_search_regex( r'.+?<\/a>', - webpage, 'uploader_id', fatal=False - ) + webpage, 'uploader_id', fatal=False) # CC licenses get a image with an appropriate alt text license_img = get_element_by_id('mt_watch_license', webpage) if license_img: license = self._search_regex( - r'alt="(.+)"', license_img, 'license_img', fatal=False - ) + r'alt="(.+)"', license_img, 'license_img', fatal=False) if not license_img or not license: # other licenses are just text license = self._html_search_regex( r'

(.+)<\/div>', - webpage, 'license_text', fatal=False - ) + webpage, 'license_text', fatal=False) upload_date = _date(self._html_search_regex( r'(.+?)<\/span>', - webpage, 'upload_date', fatal=False - )) + webpage, 'upload_date', fatal=False)) category = self._html_search_regex( - r'(.+)', webpage, 'category', fatal=False - ) + r'(.+)', webpage, 'category', fatal=False) tags_html = get_element_by_id('mt_watch_info_tag_list', webpage) tags = _tags(tags_html) @@ -150,8 +130,7 @@ class HHUIE(InfoExtractor): 'uploader_id': uploader_id, 'upload_date': upload_date, 'thumbnail': thumbnail, - 'formats': formats, - } + 'formats': formats, } def _date(str_containing_date):