MarcoBuster/youtube-dl
1
1
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2024-12-24 17:25:52 +01:00
Code Issues Releases Wiki Activity

Improve code style

Browse Source
This commit is contained in:
Philipp Hagemeister 2014-12-17 00:06:41 +01:00
parent 876bef5937
commit 7af808a5ef
7 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
youtube_dl/downloader/f4m.py
View File

@ -203,7 +203,7 @@ def write_flv_header(stream, metadata):
stream.write(b'\x00\x00\x00\x00\x00\x00\x00') stream.write(b'\x00\x00\x00\x00\x00\x00\x00')
stream.write(metadata) stream.write(metadata)
# Magic numbers extracted from the output files produced by AdobeHDS.php # Magic numbers extracted from the output files produced by AdobeHDS.php
#(https://github.com/K-S-V/Scripts) # (https://github.com/K-S-V/Scripts)
stream.write(b'\x00\x00\x01\x73') stream.write(b'\x00\x00\x01\x73')

2
youtube_dl/downloader/rtmp.py
View File

@ -185,7 +185,7 @@ class RtmpFD(FileDownloader):
cursize = os.path.getsize(encodeFilename(tmpfilename)) cursize = os.path.getsize(encodeFilename(tmpfilename))
if prevsize == cursize and retval == RD_FAILED: if prevsize == cursize and retval == RD_FAILED:
break break
# Some rtmp streams seem abort after ~ 99.8%. Don't complain for those # Some rtmp streams seem abort after ~ 99.8%. Don't complain for those
if prevsize == cursize and retval == RD_INCOMPLETE and cursize > 1024: if prevsize == cursize and retval == RD_INCOMPLETE and cursize > 1024:
self.to_screen('[rtmpdump] Could not download the whole video. This can happen for some advertisements.') self.to_screen('[rtmpdump] Could not download the whole video. This can happen for some advertisements.')
retval = RD_SUCCESS retval = RD_SUCCESS

1
youtube_dl/extractor/crunchyroll.py
View File

@ -32,7 +32,6 @@ class CrunchyrollIE(SubtitlesInfoExtractor):
_VALID_URL = r'https?://(?:(?P<prefix>www|m)\.)?(?P<url>crunchyroll\.com/(?:[^/]*/[^/?&]*?|media/\?id=)(?P<video_id>[0-9]+))(?:[/?&]|$)' _VALID_URL = r'https?://(?:(?P<prefix>www|m)\.)?(?P<url>crunchyroll\.com/(?:[^/]*/[^/?&]*?|media/\?id=)(?P<video_id>[0-9]+))(?:[/?&]|$)'
_TEST = { _TEST = {
'url': 'http://www.crunchyroll.com/wanna-be-the-strongest-in-the-world/episode-1-an-idol-wrestler-is-born-645513', 'url': 'http://www.crunchyroll.com/wanna-be-the-strongest-in-the-world/episode-1-an-idol-wrestler-is-born-645513',
#'md5': 'b1639fd6ddfaa43788c85f6d1dddd412',
'info_dict': { 'info_dict': {
'id': '645513', 'id': '645513',
'ext': 'flv', 'ext': 'flv',

1
youtube_dl/extractor/cspan.py
View File

@ -27,7 +27,6 @@ class CSpanIE(InfoExtractor):
'url': 'http://www.c-span.org/video/?c4486943/cspan-international-health-care-models', 'url': 'http://www.c-span.org/video/?c4486943/cspan-international-health-care-models',
# For whatever reason, the served video alternates between # For whatever reason, the served video alternates between
# two different ones # two different ones
#'md5': 'dbb0f047376d457f2ab8b3929cbb2d0c',
'info_dict': { 'info_dict': {
'id': '340723', 'id': '340723',
'ext': 'mp4', 'ext': 'mp4',

1
youtube_dl/extractor/tenplay.py
View File

@ -8,7 +8,6 @@ class TenPlayIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?ten(play)?\.com\.au/.+' _VALID_URL = r'https?://(?:www\.)?ten(play)?\.com\.au/.+'
_TEST = { _TEST = {
'url': 'http://tenplay.com.au/ten-insider/extra/season-2013/tenplay-tv-your-way', 'url': 'http://tenplay.com.au/ten-insider/extra/season-2013/tenplay-tv-your-way',
#'md5': 'd68703d9f73dc8fccf3320ab34202590',
'info_dict': { 'info_dict': {
'id': '2695695426001', 'id': '2695695426001',
'ext': 'flv', 'ext': 'flv',

4
youtube_dl/extractor/youtube.py
View File

@ -527,8 +527,8 @@ class YoutubeIE(YoutubeBaseInfoExtractor, SubtitlesInfoExtractor):
return 's[%s%s%s]' % (starts, ends, steps) return 's[%s%s%s]' % (starts, ends, steps)
step = None step = None
start = '(Never used)' # Quelch pyflakes warnings - start will be # Quelch pyflakes warnings - start will be set when step is set
# set as soon as step is set start = '(Never used)'
for i, prev in zip(idxs[1:], idxs[:-1]): for i, prev in zip(idxs[1:], idxs[:-1]):
if step is not None: if step is not None:
if i - prev == step: if i - prev == step:

2
youtube_dl/utils.py
View File

@ -363,7 +363,7 @@ def encodeArgument(s):
if not isinstance(s, compat_str): if not isinstance(s, compat_str):
# Legacy code that uses byte strings # Legacy code that uses byte strings
# Uncomment the following line after fixing all post processors # Uncomment the following line after fixing all post processors
#assert False, 'Internal error: %r should be of type %r, is %r' % (s, compat_str, type(s)) # assert False, 'Internal error: %r should be of type %r, is %r' % (s, compat_str, type(s))
s = s.decode('ascii') s = s.decode('ascii')
return encodeFilename(s, True) return encodeFilename(s, True)