Lookup the hash in the cache database.

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

diff --git a/apt_dht/HTTPServer.py b/apt_dht/HTTPServer.py
index 181da4e4575f20a1ab66a6fba71f70dd62b71db2..616fc2df5b3b7ad21b8c9761919dc47525db470f 100644 (file)
--- a/apt_dht/HTTPServer.py
+++ b/apt_dht/HTTPServer.py
@@ -1,4 +1,3 @@
-import os.path, time
 
 from twisted.python import log
 from twisted.internet import defer
@@ -26,10 +25,10 @@ class FileDownloader(static.File):
         if self.manager:
             path = 'http:/' + req.uri
             if resp.code >= 200 and resp.code < 400:
-                return self.manager.check_freshness(path, resp.headers.getHeader('Last-Modified'), resp)
+                return self.manager.check_freshness(req, path, resp.headers.getHeader('Last-Modified'), resp)
             
             log.msg('Not found, trying other methods for %s' % req.uri)
-            return self.manager.get_resp(path)
+            return self.manager.get_resp(req, path)
         
         return resp
 
@@ -44,17 +43,16 @@ class TopLevel(resource.Resource):
     def __init__(self, directory, manager):
         self.directory = directory
         self.manager = manager
-        self.subdirs = []
+        self.subdirs = {}
 
-    def addDirectory(self, directory):
-        path = "~" + str(len(self.subdirs))
-        self.subdirs.append(directory)
-        return path
+    def setDirectories(self, dirs):
+        self.subdirs = {}
+        for k in dirs:
+            # Don't allow empty subdirectory
+            if k:
+                self.subdirs[k] = dirs[k]
+        log.msg('new subdirectories initialized')
     
-    def removeDirectory(self, directory):
-        loc = self.subdirs.index(directory)
-        self.subdirs[loc] = ''
-        
     def render(self, ctx):
         return http.Response(
             200,
@@ -65,26 +63,16 @@ class TopLevel(resource.Resource):
 
     def locateChild(self, request, segments):
         name = segments[0]
-        if len(name) > 1 and name[0] == '~':
-            try:
-                loc = int(name[1:])
-            except:
-                log.msg('Not found: %s from %s' % (request.uri, request.remoteAddr))
-                return None, ()
-            
-            if loc >= 0 and loc < len(self.subdirs) and self.subdirs[loc]:
-                log.msg('Sharing %s with %s' % (request.uri, request.remoteAddr))
-                return static.File(self.subdirs[loc]), segments[1:]
-            else:
-                log.msg('Not found: %s from %s' % (request.uri, request.remoteAddr))
-                return None, ()
+        if name in self.subdirs:
+            log.msg('Sharing %s with %s' % (request.uri, request.remoteAddr))
+            return static.File(self.subdirs[name].path), segments[1:]
         
         if request.remoteAddr.host != "127.0.0.1":
             log.msg('Blocked illegal access to %s from %s' % (request.uri, request.remoteAddr))
             return None, ()
             
         if len(name) > 1:
-            return FileDownloader(self.directory, self.manager), segments[0:]
+            return FileDownloader(self.directory.path, self.manager), segments[0:]
         else:
             return self, ()