maryjane
/
gpodder
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fix another bug with hanging downloads 

If the server specifies the content length of
what we are going to download, only read at most
that amount of data from the server and then
close the connection to avoid eternal hanging.
This commit is contained in:
Thomas Perl 2009-06-10 01:57:35 +02:00
parent c567c94096
commit 90c2f31cf0
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gpodder/download.py
View File

@ -228,7 +228,8 @@ class DownloadURLOpener(urllib.FancyURLopener):
current_size = os.path.getsize(filename)
tfp = open(filename, 'ab')
#If the file exists, then only download the remainder
self.addheader('Range', 'bytes=%s-' % (current_size))
if current_size > 0:
self.addheader('Range', 'bytes=%s-' % (current_size))
except:
log('Cannot open file for resuming: %s', filename, sender=self, traceback=True)
tfp = None
@ -267,8 +268,11 @@ class DownloadURLOpener(urllib.FancyURLopener):
if "content-length" in headers:
size = int(headers["Content-Length"]) + current_size
reporthook(blocknum, bs, size)
while 1:
block = fp.read(bs)
while read < size:
if size == -1:
block = fp.read(bs)
else:
block = fp.read(min(size-read, bs))
if block == "":
break
read += len(block)
@ -632,8 +636,11 @@ class DownloadTask(object):
util.delete_file(self.tempname)
self.progress = 0.0
self.speed = 0.0
except urllib.ContentTooShortError, ctse:
self.status = DownloadTask.FAILED
self.error_message = _('Missing content from server')
except IOError, ioe:
log( 'Error "%s" while downloading "%s": %s', ioe.strerror, self.__episode.title, ioe.filename, sender=self)
log( 'Error "%s" while downloading "%s": %s', ioe.strerror, self.__episode.title, ioe.filename, sender=self, traceback=True)
self.status = DownloadTask.FAILED
self.error_message = _('I/O Error: %s: %s') % (ioe.strerror, ioe.filename)
except gPodderDownloadHTTPError, gdhe: