voussoir/voussoirkit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add base exception class DownloadyException.

Browse source
This commit is contained in:
Ethan Dalool 2020-09-25 16:09:42 -07:00
parent 0613fd10e4
commit d37dbe40f8
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
voussoirkit/downloady.py
View file

@ -32,7 +32,13 @@ if os.name == 'nt':
SPECIAL_FILENAMES.append('con') SPECIAL_FILENAMES.append('con')
SPECIAL_FILENAMES = [os.path.normcase(x) for x in SPECIAL_FILENAMES] SPECIAL_FILENAMES = [os.path.normcase(x) for x in SPECIAL_FILENAMES]
class NotEnoughBytes(Exception): class DownloadyException(Exception):
pass
class NotEnoughBytes(DownloadyException):
pass
class ServerNoRange(DownloadyException):
pass pass
def download_file( def download_file(
@ -204,6 +210,9 @@ def prepare_plan(
# Chapter 4: Server range support # Chapter 4: Server range support
# Always include a range on the first request to figure out whether the # Always include a range on the first request to figure out whether the
# server supports it. Use 0- to get correct remote_total_bytes # server supports it. Use 0- to get correct remote_total_bytes
if user_provided_range and not do_head:
raise DownloadyException('Cannot determine range support without the head request')
temp_headers = headers temp_headers = headers
temp_headers.update({'range': 'bytes=0-'}) temp_headers.update({'range': 'bytes=0-'})
@ -219,10 +228,7 @@ def prepare_plan(
server_respects_range = False server_respects_range = False
if user_provided_range and not server_respects_range: if user_provided_range and not server_respects_range:
if not do_head: raise ServerNoRange('Server did not respect your range header')
raise Exception('Cannot determine range support without the head request')
else:
raise Exception('Server did not respect your range header')
# Chapter 5: Plan definitions # Chapter 5: Plan definitions
plan_base = { plan_base = {
@ -289,7 +295,7 @@ def prepare_plan(
return plan_fulldownload return plan_fulldownload
raise Exception('No plan was chosen?') raise DownloadyException('No plan was chosen?')
class Progress1: class Progress1: