codex-storage/deluge
1
0
Fork 0
mirror of https://github.com/codex-storage/deluge.git synced 2025-01-12 04:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

HTTPDownloader now "raises" a PageRedirect error when it encounters a temporary redirect or permanent move.

Browse Source 
This allows the callee to download the file from the new location.
This commit is contained in:
John Garland 2009-07-01 08:45:09 +00:00
parent a66910e50b
commit d592c0370c
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
deluge/httpdownloader.py
View File

@ -32,7 +32,9 @@
# statement from all source files in the program, then also delete it here. # statement from all source files in the program, then also delete it here.
# #
from twisted.web import client from twisted.web import client, http
from twisted.web.error import PageRedirect
from twisted.python.failure import Failure
from twisted.internet import reactor from twisted.internet import reactor
class HTTPDownloader(client.HTTPDownloader): class HTTPDownloader(client.HTTPDownloader):
@ -50,17 +52,25 @@ class HTTPDownloader(client.HTTPDownloader):
self.current_length = 0 self.current_length = 0
client.HTTPDownloader.__init__(self, url, filename) client.HTTPDownloader.__init__(self, url, filename)
def gotStatus(self, version, status, message):
self.code = int(status)
client.HTTPDownloader.gotStatus(self, version, status, message)
def gotHeaders(self, headers): def gotHeaders(self, headers):
if self.status == "200": if self.code == http.OK:
if "content-length" in headers: if "content-length" in headers:
self.total_length = int(headers["content-length"][0]) self.total_length = int(headers["content-length"][0])
else: else:
self.total_length = 0 self.total_length = 0
elif self.code in (http.TEMPORARY_REDIRECT, http.MOVED_PERMANENTLY):
location = headers["location"][0]
error = PageRedirect(self.code, location=location)
self.noPage(Failure(error))
return client.HTTPDownloader.gotHeaders(self, headers) return client.HTTPDownloader.gotHeaders(self, headers)
def pagePart(self, data): def pagePart(self, data):
if self.status == "200": if self.code == http.OK:
self.current_length += len(data) self.current_length += len(data)
if self.__part_callback: if self.__part_callback:
self.__part_callback(data, self.current_length, self.total_length) self.__part_callback(data, self.current_length, self.total_length)