codex-storage
/
deluge
mirror of https://github.com/codex-storage/deluge.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix httpdownloader error with existing filename

This commit is contained in:
Calum Lind 2011-07-06 21:35:53 +01:00
parent 8644bc219a
commit 8e8717c867
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
deluge/httpdownloader.py
View File

@ -51,6 +51,8 @@ class HTTPDownloader(client.HTTPDownloader):
:type url: string :type url: string
:param filename: the filename to save the file as :param filename: the filename to save the file as
:type filename: string :type filename: string
:param force_filename: forces use of the supplied filename, regardless of header content
:type force_filename: bool
:param part_callback: a function to be called when a part of data :param part_callback: a function to be called when a part of data
is received, it's signature should be: func(data, current_length, total_length) is received, it's signature should be: func(data, current_length, total_length)
:type part_callback: function :type part_callback: function
@ -84,15 +86,20 @@ class HTTPDownloader(client.HTTPDownloader):
self.decoder = zlib.decompressobj(zlib.MAX_WBITS + 32) self.decoder = zlib.decompressobj(zlib.MAX_WBITS + 32)
if "content-disposition" in headers and not self.force_filename: if "content-disposition" in headers and not self.force_filename:
try: new_file_name = str(headers["content-disposition"][0]).split(";")[1].split("=")[1]
new_file_name = str(headers["content-disposition"][0]).split(";")[1].split("=")[1] new_file_name = sanitise_filename(new_file_name)
new_file_name = sanitise_filename(new_file_name) new_file_name = os.path.join(os.path.split(self.fileName)[0], new_file_name)
new_file_name = os.path.join(os.path.split(self.fileName)[0], new_file_name)
except Exception, e: count = 1
log.exception(e) fileroot = os.path.splitext(new_file_name)[0]
else: fileext = os.path.splitext(new_file_name)[1]
self.fileName = new_file_name while os.path.isfile(new_file_name):
self.value = new_file_name # Increment filename if already exists
new_file_name = "%s-%s%s" % (fileroot, count, fileext)
count += 1
self.fileName = new_file_name
self.value = new_file_name
elif self.code in (http.MOVED_PERMANENTLY, http.FOUND, http.SEE_OTHER, http.TEMPORARY_REDIRECT): elif self.code in (http.MOVED_PERMANENTLY, http.FOUND, http.SEE_OTHER, http.TEMPORARY_REDIRECT):
location = headers["location"][0] location = headers["location"][0]
@ -129,8 +136,6 @@ def sanitise_filename(filename):
:type filename: string :type filename: string
:returns: the sanitised filename :returns: the sanitised filename
:rtype: string :rtype: string
:raises IOError: when the filename exists
""" """
# Remove any quotes # Remove any quotes
@ -147,9 +152,6 @@ def sanitise_filename(filename):
# Dodgy server, log it # Dodgy server, log it
log.warning("Potentially malicious server: trying to write to file '%s'" % filename) log.warning("Potentially malicious server: trying to write to file '%s'" % filename)
if os.path.exists(filename):
raise IOError, "File '%s' already exists!" % filename
return filename return filename
def download_file(url, filename, callback=None, headers=None, force_filename=False, allow_compression=True): def download_file(url, filename, callback=None, headers=None, force_filename=False, allow_compression=True):