Added modification time tracking to the MirrorManager cache.

[quix0rs-apt-p2p.git] / apt_dht / HTTPDownloader.py

diff --git a/apt_dht/HTTPDownloader.py b/apt_dht/HTTPDownloader.py
index 7e5a06cb6880a10bcb8ce0a20c43ef56e1862ab9..91ce7c14c598cb70af1cb545547225674754ea32 100644 (file)
--- a/apt_dht/HTTPDownloader.py
+++ b/apt_dht/HTTPDownloader.py
@@ -2,6 +2,7 @@
 from twisted.internet import reactor, defer, protocol
 from twisted.internet.protocol import ClientFactory
 from twisted import version as twisted_version
+from twisted.python import log
 from twisted.web2.client.interfaces import IHTTPClientManager
 from twisted.web2.client.http import ProtocolError, ClientRequest, HTTPClientProtocol
 from twisted.web2 import stream as stream_mod, http_headers
@@ -75,15 +76,16 @@ class HTTPClientManager(ClientFactory):
         req = self.request_queue.pop(0)
         self.response_queue.append(req)
         req.deferResponse = self.proto.submitRequest(req, False)
-        req.deferResponse.addCallback(self.requestComplete)
-        req.deferResponse.addErrback(self.requestError)
+        req.deferResponse.addCallbacks(self.requestComplete, self.requestError)
 
     def requestComplete(self, resp):
         req = self.response_queue.pop(0)
+        log.msg('%s of %s completed with code %d' % (req.method, req.uri, resp.code))
         req.deferRequest.callback(resp)
 
     def requestError(self, error):
         req = self.response_queue.pop(0)
+        log.msg('Download of %s generated error %r' % (req.uri, error))
         req.deferRequest.errback(error)
 
     def clientBusy(self, proto):
@@ -116,8 +118,10 @@ class HTTPClientManager(ClientFactory):
                           (version.short(), twisted_version.short(), web2_version.short()))
         return headers
     
-    def get(self, path, method="GET"):
+    def get(self, path, method="GET", modtime=None):
         headers = self.setCommonHeaders()
+        if modtime:
+            headers.setHeader('If-Modified-Since', modtime)
         return self.submitRequest(ClientRequest(method, path, headers, None))
     
     def getRange(self, path, rangeStart, rangeEnd, method="GET"):
@@ -169,7 +173,7 @@ class TestClientManager(unittest.TestCase):
             d = self.client.get(path)
             d.addCallback(self.gotResp, num, expect)
             if last:
-                d.addCallback(lastDefer.callback)
+                d.addBoth(lastDefer.callback)
                 
         newRequest("/", 1, 3433)
         newRequest("/blog/", 2, 37121)
@@ -193,7 +197,7 @@ class TestClientManager(unittest.TestCase):
             d = self.client.get(path)
             d.addCallback(self.gotResp, num, expect)
             if last:
-                d.addCallback(lastDefer.callback)
+                d.addBoth(lastDefer.callback)
                 
         newRequest("/", 1, 3433)
         newRequest("/blog/", 2, 37121)