R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removed runtime checks for sleep intervals and corresponding Exception subclass.

Browse Source
This commit is contained in:
singh-pratyush96 2016-07-25 11:25:17 +05:30
parent ada2d3f3b2
commit 8b750c8354
3 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
youtube_dl/YoutubeDL.py
View File

@ -76,7 +76,6 @@ from .utils import (
std_headers, std_headers,
subtitles_filename, subtitles_filename,
UnavailableVideoError, UnavailableVideoError,
InvalidSleepTimeError,
url_basename, url_basename,
version_tuple, version_tuple,
write_json_file, write_json_file,
@ -1780,8 +1779,6 @@ class YoutubeDL(object):
except MaxDownloadsReached: except MaxDownloadsReached:
self.to_screen('[info] Maximum number of downloaded files reached.') self.to_screen('[info] Maximum number of downloaded files reached.')
raise raise
except InvalidSleepTimeError:
self.report_error('Invalid argument for sleep')
else: else:
if self.params.get('dump_single_json', False): if self.params.get('dump_single_json', False):
self.to_stdout(json.dumps(res)) self.to_stdout(json.dumps(res))

21
youtube_dl/downloader/common.py
View File

@ -13,7 +13,6 @@ from ..utils import (
decodeArgument, decodeArgument,
format_bytes, format_bytes,
timeconvert, timeconvert,
InvalidSleepTimeError
) )
@ -347,21 +346,15 @@ class FileDownloader(object):
sleep_interval = self.params.get('sleep_interval') sleep_interval = self.params.get('sleep_interval')
if sleep_interval: if sleep_interval:
min_sleep_interval = sleep_interval min_sleep_interval = sleep_interval
max_sleep_interval = self.params.get('max_sleep_interval') max_sleep_interval = self.params.get('max_sleep_interval') or min_sleep_interval
try: sleep_time = random.uniform(
if max_sleep_interval: min_sleep_interval,
sleep_time = random.uniform( max_sleep_interval
float(min_sleep_interval), )
float(max_sleep_interval)
)
else:
sleep_time = float(min_sleep_interval)
self.to_screen('[download] Sleeping %s seconds...' % sleep_time) self.to_screen('[download] Sleeping %s seconds...' % sleep_time)
time.sleep(sleep_time) time.sleep(sleep_time)
except (ValueError, IOError) as err:
raise InvalidSleepTimeError()
return self.real_download(filename, info_dict) return self.real_download(filename, info_dict)

9
youtube_dl/utils.py
View File

@ -752,15 +752,6 @@ class UnavailableVideoError(Exception):
pass pass
class InvalidSleepTimeError(Exception):
"""Invalid sleep time provided exception
This exception will be thrown when user provides invalid
time for sleep in --sleep-interval or --max-sleep-interval.
"""
pass
class ContentTooShortError(Exception): class ContentTooShortError(Exception):
"""Content Too Short exception. """Content Too Short exception.