0
0
Fork 0

improve coding style

main
Remita Amine 2017-04-12 20:38:43 +01:00
parent e4d74e2778
commit 40fcba5edb
10 changed files with 12 additions and 12 deletions

View File

@ -855,7 +855,7 @@ class YoutubeDL(object):
return self.process_ie_result( return self.process_ie_result(
new_result, download=download, extra_info=extra_info) new_result, download=download, extra_info=extra_info)
elif result_type == 'playlist' or result_type == 'multi_video': elif result_type in ('playlist', 'multi_video'):
# We process each entry in the playlist # We process each entry in the playlist
playlist = ie_result.get('title') or ie_result.get('id') playlist = ie_result.get('title') or ie_result.get('id')
self.to_screen('[download] Downloading playlist: %s' % playlist) self.to_screen('[download] Downloading playlist: %s' % playlist)

View File

@ -2692,7 +2692,7 @@ else:
userhome = pwent.pw_dir userhome = pwent.pw_dir
userhome = userhome.rstrip('/') userhome = userhome.rstrip('/')
return (userhome + path[i:]) or '/' return (userhome + path[i:]) or '/'
elif compat_os_name == 'nt' or compat_os_name == 'ce': elif compat_os_name in ('nt', 'ce'):
def compat_expanduser(path): def compat_expanduser(path):
"""Expand ~ and ~user constructs. """Expand ~ and ~user constructs.

View File

@ -169,7 +169,7 @@ class RtmpFD(FileDownloader):
self.report_error('[rtmpdump] Could not connect to RTMP server.') self.report_error('[rtmpdump] Could not connect to RTMP server.')
return False return False
while (retval == RD_INCOMPLETE or retval == RD_FAILED) and not test and not live: while retval in (RD_INCOMPLETE, RD_FAILED) and not test and not live:
prevsize = os.path.getsize(encodeFilename(tmpfilename)) prevsize = os.path.getsize(encodeFilename(tmpfilename))
self.to_screen('[rtmpdump] %s bytes' % prevsize) self.to_screen('[rtmpdump] %s bytes' % prevsize)
time.sleep(5.0) # This seems to be needed time.sleep(5.0) # This seems to be needed

View File

@ -409,7 +409,7 @@ class BBCCoUkIE(InfoExtractor):
description = smp_config['summary'] description = smp_config['summary']
for item in smp_config['items']: for item in smp_config['items']:
kind = item['kind'] kind = item['kind']
if kind != 'programme' and kind != 'radioProgramme': if kind not in ('programme', 'radioProgramme'):
continue continue
programme_id = item.get('vpid') programme_id = item.get('vpid')
duration = int_or_none(item.get('duration')) duration = int_or_none(item.get('duration'))
@ -450,7 +450,7 @@ class BBCCoUkIE(InfoExtractor):
for item in self._extract_items(playlist): for item in self._extract_items(playlist):
kind = item.get('kind') kind = item.get('kind')
if kind != 'programme' and kind != 'radioProgramme': if kind not in ('programme', 'radioProgramme'):
continue continue
title = playlist.find('./{%s}title' % self._EMP_PLAYLIST_NS).text title = playlist.find('./{%s}title' % self._EMP_PLAYLIST_NS).text
description_el = playlist.find('./{%s}summary' % self._EMP_PLAYLIST_NS) description_el = playlist.find('./{%s}summary' % self._EMP_PLAYLIST_NS)

View File

@ -1779,7 +1779,7 @@ class InfoExtractor(object):
if content_type == 'text': if content_type == 'text':
# TODO implement WebVTT downloading # TODO implement WebVTT downloading
pass pass
elif content_type == 'video' or content_type == 'audio': elif content_type in ('video', 'audio'):
base_url = '' base_url = ''
for element in (representation, adaptation_set, period, mpd_doc): for element in (representation, adaptation_set, period, mpd_doc):
base_url_e = element.find(_add_ns('BaseURL')) base_url_e = element.find(_add_ns('BaseURL'))

View File

@ -26,7 +26,7 @@ class RudoIE(InfoExtractor):
} }
@classmethod @classmethod
def _extract_url(self, webpage): def _extract_url(cls, webpage):
mobj = re.search( mobj = re.search(
r'<iframe[^>]+src=(?P<q1>[\'"])(?P<url>(?:https?:)?//rudo\.video/vod/[0-9a-zA-Z]+)(?P=q1)', r'<iframe[^>]+src=(?P<q1>[\'"])(?P<url>(?:https?:)?//rudo\.video/vod/[0-9a-zA-Z]+)(?P=q1)',
webpage) webpage)

View File

@ -68,7 +68,7 @@ class ViewLiftEmbedIE(ViewLiftBaseIE):
type_ = source.get('type') type_ = source.get('type')
ext = determine_ext(file_) ext = determine_ext(file_)
format_id = source.get('label') or ext format_id = source.get('label') or ext
if all(v == 'm3u8' or v == 'hls' for v in (type_, ext)): if all(v in ('m3u8', 'hls') for v in (type_, ext)):
formats.extend(self._extract_m3u8_formats( formats.extend(self._extract_m3u8_formats(
file_, video_id, 'mp4', m3u8_id='hls')) file_, video_id, 'mp4', m3u8_id='hls'))
else: else:

View File

@ -70,9 +70,9 @@ class VLiveIE(InfoExtractor):
status, long_video_id, key = params[2], params[5], params[6] status, long_video_id, key = params[2], params[5], params[6]
status = remove_start(status, 'PRODUCT_') status = remove_start(status, 'PRODUCT_')
if status == 'LIVE_ON_AIR' or status == 'BIG_EVENT_ON_AIR': if status in ('LIVE_ON_AIR', 'BIG_EVENT_ON_AIR'):
return self._live(video_id, webpage) return self._live(video_id, webpage)
elif status == 'VOD_ON_AIR' or status == 'BIG_EVENT_INTRO': elif status in ('VOD_ON_AIR', 'BIG_EVENT_INTRO'):
if long_video_id and key: if long_video_id and key:
return self._replay(video_id, webpage, long_video_id, key) return self._replay(video_id, webpage, long_video_id, key)
else: else:

View File

@ -552,7 +552,7 @@ class FFmpegSubtitlesConvertorPP(FFmpegPostProcessor):
sub_filenames.append(old_file) sub_filenames.append(old_file)
new_file = subtitles_filename(filename, lang, new_ext) new_file = subtitles_filename(filename, lang, new_ext)
if ext == 'dfxp' or ext == 'ttml' or ext == 'tt': if ext in ('dfxp', 'ttml', 'tt'):
self._downloader.report_warning( self._downloader.report_warning(
'You have requested to convert dfxp (TTML) subtitles into another format, ' 'You have requested to convert dfxp (TTML) subtitles into another format, '
'which results in style information loss') 'which results in style information loss')

View File

@ -26,7 +26,7 @@ class MetadataFromTitlePP(PostProcessor):
regex += r'(?P<' + match.group(1) + '>.+)' regex += r'(?P<' + match.group(1) + '>.+)'
lastpos = match.end() lastpos = match.end()
if lastpos < len(fmt): if lastpos < len(fmt):
regex += re.escape(fmt[lastpos:len(fmt)]) regex += re.escape(fmt[lastpos:])
return regex return regex
def run(self, info): def run(self, info):