projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e4d74e2
)
improve coding style
author
Remita Amine
<remitamine@gmail.com>
Wed, 12 Apr 2017 19:38:43 +0000
(20:38 +0100)
committer
Remita Amine
<remitamine@gmail.com>
Wed, 12 Apr 2017 19:38:43 +0000
(20:38 +0100)
youtube_dl/YoutubeDL.py
patch
|
blob
|
history
youtube_dl/compat.py
patch
|
blob
|
history
youtube_dl/downloader/rtmp.py
patch
|
blob
|
history
youtube_dl/extractor/bbc.py
patch
|
blob
|
history
youtube_dl/extractor/common.py
patch
|
blob
|
history
youtube_dl/extractor/rudo.py
patch
|
blob
|
history
youtube_dl/extractor/viewlift.py
patch
|
blob
|
history
youtube_dl/extractor/vlive.py
patch
|
blob
|
history
youtube_dl/postprocessor/ffmpeg.py
patch
|
blob
|
history
youtube_dl/postprocessor/metadatafromtitle.py
patch
|
blob
|
history
diff --git
a/youtube_dl/YoutubeDL.py
b/youtube_dl/YoutubeDL.py
index 54bc8b06d9827408e66232cedc1629fcd175b52a..7953670a732eb29abdd249ecadf63be5fc52e029 100755
(executable)
--- a/
youtube_dl/YoutubeDL.py
+++ b/
youtube_dl/YoutubeDL.py
@@
-855,7
+855,7
@@
class YoutubeDL(object):
return self.process_ie_result(
new_result, download=download, extra_info=extra_info)
return self.process_ie_result(
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
playlist = ie_result.get('title') or ie_result.get('id')
self.to_screen('[download] Downloading playlist: %s' % playlist)
# We process each entry in the playlist
playlist = ie_result.get('title') or ie_result.get('id')
self.to_screen('[download] Downloading playlist: %s' % playlist)
diff --git
a/youtube_dl/compat.py
b/youtube_dl/compat.py
index 0c119e417ce86174a7b21a9639f160a17a3263a3..39527117fa27f049d5bc56390439091e38ca5f49 100644
(file)
--- a/
youtube_dl/compat.py
+++ b/
youtube_dl/compat.py
@@
-2692,7
+2692,7
@@
else:
userhome = pwent.pw_dir
userhome = userhome.rstrip('/')
return (userhome + path[i:]) or '/'
userhome = pwent.pw_dir
userhome = userhome.rstrip('/')
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):
"""Expand ~ and ~user constructs.
def compat_expanduser(path):
"""Expand ~ and ~user constructs.
diff --git
a/youtube_dl/downloader/rtmp.py
b/youtube_dl/downloader/rtmp.py
index 9de6e70bbc66b3e7db591c5713599fee82182663..b823b5171887f2b61c11f81c6ec935e575251f2e 100644
(file)
--- a/
youtube_dl/downloader/rtmp.py
+++ b/
youtube_dl/downloader/rtmp.py
@@
-169,7
+169,7
@@
class RtmpFD(FileDownloader):
self.report_error('[rtmpdump] Could not connect to RTMP server.')
return False
self.report_error('[rtmpdump] Could not connect to RTMP server.')
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))
self.to_screen('[rtmpdump] %s bytes' % prevsize)
time.sleep(5.0) # This seems to be needed
prevsize = os.path.getsize(encodeFilename(tmpfilename))
self.to_screen('[rtmpdump] %s bytes' % prevsize)
time.sleep(5.0) # This seems to be needed
diff --git
a/youtube_dl/extractor/bbc.py
b/youtube_dl/extractor/bbc.py
index 0e05b782b7ddbcbe8a3bb84215ad5128f54c86ac..dd65b8d86a36f3bbb486072260f14ab652a1868e 100644
(file)
--- a/
youtube_dl/extractor/bbc.py
+++ b/
youtube_dl/extractor/bbc.py
@@
-409,7
+409,7
@@
class BBCCoUkIE(InfoExtractor):
description = smp_config['summary']
for item in smp_config['items']:
kind = item['kind']
description = smp_config['summary']
for item in smp_config['items']:
kind = item['kind']
- if kind
!= 'programme' and kind != 'radioProgramme'
:
+ if kind
not in ('programme', 'radioProgramme')
:
continue
programme_id = item.get('vpid')
duration = int_or_none(item.get('duration'))
continue
programme_id = item.get('vpid')
duration = int_or_none(item.get('duration'))
@@
-450,7
+450,7
@@
class BBCCoUkIE(InfoExtractor):
for item in self._extract_items(playlist):
kind = item.get('kind')
for item in self._extract_items(playlist):
kind = item.get('kind')
- if kind
!= 'programme' and kind != 'radioProgramme'
:
+ if kind
not in ('programme', 'radioProgramme')
:
continue
title = playlist.find('./{%s}title' % self._EMP_PLAYLIST_NS).text
description_el = playlist.find('./{%s}summary' % self._EMP_PLAYLIST_NS)
continue
title = playlist.find('./{%s}title' % self._EMP_PLAYLIST_NS).text
description_el = playlist.find('./{%s}summary' % self._EMP_PLAYLIST_NS)
diff --git
a/youtube_dl/extractor/common.py
b/youtube_dl/extractor/common.py
index ae8af61dee8736968c41b631d9d89d8a65850e2a..dcc9d628afdfd2c926c930b10be92ca313cd14a3 100644
(file)
--- a/
youtube_dl/extractor/common.py
+++ b/
youtube_dl/extractor/common.py
@@
-1779,7
+1779,7
@@
class InfoExtractor(object):
if content_type == 'text':
# TODO implement WebVTT downloading
pass
if content_type == 'text':
# TODO implement WebVTT downloading
pass
- elif content_type
== 'video' or content_type == 'audio'
:
+ elif content_type
in ('video', 'audio')
:
base_url = ''
for element in (representation, adaptation_set, period, mpd_doc):
base_url_e = element.find(_add_ns('BaseURL'))
base_url = ''
for element in (representation, adaptation_set, period, mpd_doc):
base_url_e = element.find(_add_ns('BaseURL'))
diff --git
a/youtube_dl/extractor/rudo.py
b/youtube_dl/extractor/rudo.py
index 51644011e5d5587462ef56a0511767437d93b77e..f036f67579c543dac08123a91f65544589e5641c 100644
(file)
--- a/
youtube_dl/extractor/rudo.py
+++ b/
youtube_dl/extractor/rudo.py
@@
-26,7
+26,7
@@
class RudoIE(InfoExtractor):
}
@classmethod
}
@classmethod
- def _extract_url(
self
, webpage):
+ def _extract_url(
cls
, webpage):
mobj = re.search(
r'<iframe[^>]+src=(?P<q1>[\'"])(?P<url>(?:https?:)?//rudo\.video/vod/[0-9a-zA-Z]+)(?P=q1)',
webpage)
mobj = re.search(
r'<iframe[^>]+src=(?P<q1>[\'"])(?P<url>(?:https?:)?//rudo\.video/vod/[0-9a-zA-Z]+)(?P=q1)',
webpage)
diff --git
a/youtube_dl/extractor/viewlift.py
b/youtube_dl/extractor/viewlift.py
index 18735cfb23d907e4fb83882cda10dda7eb6f41ba..1f29c273f814bcefbacc4678fe0079686adb1ea6 100644
(file)
--- a/
youtube_dl/extractor/viewlift.py
+++ b/
youtube_dl/extractor/viewlift.py
@@
-68,7
+68,7
@@
class ViewLiftEmbedIE(ViewLiftBaseIE):
type_ = source.get('type')
ext = determine_ext(file_)
format_id = source.get('label') or ext
type_ = source.get('type')
ext = determine_ext(file_)
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(
file_, video_id, 'mp4', m3u8_id='hls'))
else:
formats.extend(self._extract_m3u8_formats(
file_, video_id, 'mp4', m3u8_id='hls'))
else:
diff --git
a/youtube_dl/extractor/vlive.py
b/youtube_dl/extractor/vlive.py
index b9718901b8339e3d5fee85a15d20514b038b66aa..e58940607a491581bb6e263ca2ffd3dd9741feac 100644
(file)
--- a/
youtube_dl/extractor/vlive.py
+++ b/
youtube_dl/extractor/vlive.py
@@
-70,9
+70,9
@@
class VLiveIE(InfoExtractor):
status, long_video_id, key = params[2], params[5], params[6]
status = remove_start(status, 'PRODUCT_')
status, long_video_id, key = params[2], params[5], params[6]
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:
return self._replay(video_id, webpage, long_video_id, key)
else:
if long_video_id and key:
return self._replay(video_id, webpage, long_video_id, key)
else:
diff --git
a/youtube_dl/postprocessor/ffmpeg.py
b/youtube_dl/postprocessor/ffmpeg.py
index 7c162d92abb43f9cf522eeeb52bb9675a06a24f7..665109558849692608db45fbdae9ade5a39d4f95 100644
(file)
--- a/
youtube_dl/postprocessor/ffmpeg.py
+++ b/
youtube_dl/postprocessor/ffmpeg.py
@@
-552,7
+552,7
@@
class FFmpegSubtitlesConvertorPP(FFmpegPostProcessor):
sub_filenames.append(old_file)
new_file = subtitles_filename(filename, lang, new_ext)
sub_filenames.append(old_file)
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(
'You have requested to convert dfxp (TTML) subtitles into another format, '
'which results in style information loss')
self._downloader.report_warning(
'You have requested to convert dfxp (TTML) subtitles into another format, '
'which results in style information loss')
diff --git
a/youtube_dl/postprocessor/metadatafromtitle.py
b/youtube_dl/postprocessor/metadatafromtitle.py
index 164edd3a820af4d0c3d1af48b9cf81a6b5460e9b..a7d637a3c84f16ba8024b618ea30549fdcf109a6 100644
(file)
--- a/
youtube_dl/postprocessor/metadatafromtitle.py
+++ b/
youtube_dl/postprocessor/metadatafromtitle.py
@@
-26,7
+26,7
@@
class MetadataFromTitlePP(PostProcessor):
regex += r'(?P<' + match.group(1) + '>.+)'
lastpos = match.end()
if lastpos < len(fmt):
regex += r'(?P<' + match.group(1) + '>.+)'
lastpos = match.end()
if lastpos < len(fmt):
- regex += re.escape(fmt[lastpos:
len(fmt)
])
+ regex += re.escape(fmt[lastpos:])
return regex
def run(self, info):
return regex
def run(self, info):