Fix some errors in the new twisted HTTP client's connectionLost() methods.

[quix0rs-apt-p2p.git] / apt_p2p / HTTPServer.py
diff --git a/apt_p2p/HTTPServer.py b/apt_p2p/HTTPServer.py

index da582fc350d5fb61218d7b7971374adaa5f91390..0c17d3fd8f6c5b34c2e4e70bbf7eadbf41d05a23 100644 (file)
--- a/apt_p2p/HTTPServer.py
+++ b/apt_p2p/HTTPServer.py
@@ -30,9 +30,27 @@ class FileDownloader(static.File):
      def __init__(self, path, manager, defaultType="text/plain", ignoredExts=(), processors=None, indexNames=None):
          self.manager = manager
          super(FileDownloader, self).__init__(path, defaultType, ignoredExts, processors, indexNames)
-        
+    
+    def locateChild(self, req, segments):
+        child, segments = super(FileDownloader, self).locateChild(req, segments)
+        # Make sure we always call renderHTTP()
+        if isinstance(child, FileDownloader):
+            return child, segments
+        else:
+            return self, server.StopTraversal
+            
      def renderHTTP(self, req):
          log.msg('Got request for %s from %s' % (req.uri, req.remoteAddr))
+        
+        # Make sure the file is in the DB and unchanged
+        if self.manager and not self.manager.db.isUnchanged(self.fp):
+            if self.fp.exists() and self.fp.isfile():
+                self.fp.remove()
+            return self._renderHTTP_done(http.Response(404,
+                        {'content-type': http_headers.MimeType('text', 'html')},
+                        '<html><body><p>File found but it has changed.</body></html>'),
+                        req)
+            
          resp = super(FileDownloader, self).renderHTTP(req)
          if isinstance(resp, defer.Deferred):
              resp.addCallbacks(self._renderHTTP_done, self._renderHTTP_error,
@@ -47,7 +65,7 @@ class FileDownloader(static.File):
          if self.manager:
              path = 'http:/' + req.uri
              if resp.code >= 200 and resp.code < 400:
-                return self.manager.check_freshness(req, path, resp.headers.getHeader('Last-Modified'), resp)
+                return self.manager.get_resp(req, path, resp)
              
              log.msg('Not found, trying other methods for %s' % req.uri)
              return self.manager.get_resp(req, path)
@@ -279,6 +297,7 @@ class TopLevel(resource.Resource):
                      return PiecesUploader(bencode({'t': files[0]['pieces']}), 'application/x-bencoded'), ()
              else:
                  log.msg('Hash could not be found in database: %r' % hash)
+                return None, ()
  
          if len(name) > 1:
              # It's a request from apt