From 458fee43d42c85e5caa08c38038effaa3453db3e Mon Sep 17 00:00:00 2001 From: Cameron Dale Date: Sat, 15 Dec 2007 19:12:02 -0800 Subject: [PATCH] Added a manager to the HTTPServer for it to call when a file is not found. --- HTTPServer.py | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/HTTPServer.py b/HTTPServer.py index 50b16ca..5d98d23 100644 --- a/HTTPServer.py +++ b/HTTPServer.py @@ -1,26 +1,34 @@ import os.path, time + from twisted.web2 import server, http, resource, channel from twisted.web2 import static, http_headers, responsecode 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 render(self, req): resp = super(FileDownloader, self).render(req) - if resp != responsecode.NOT_FOUND: - return resp - return http.Response( - 200, - {'content-type': http_headers.MimeType('text', 'html')}, - """ -

Finding

TODO: eventually this will trigger a search for that file.""") + if self.manager: + if resp != responsecode.NOT_FOUND: + return self.manager.check_freshness(req.uri, resp.headers.getHeader('Last-Modified')) + + return self.manager.get_resp(req.uri) + return resp -class Toplevel(resource.Resource): + def createSimilarFile(self, path): + return self.__class__(path, self.manager, self.defaultType, self.ignoredExts, + self.processors, self.indexNames[:]) +class TopLevel(resource.Resource): addSlash = True - def __init__(self, directory): + def __init__(self, directory, manager): self.directory = directory + self.manager = manager self.subdirs = [] def addDirectory(self, directory): @@ -53,14 +61,14 @@ class Toplevel(resource.Resource): else: return None, () - if len(name) > 1: - return FileDownloader(self.directory), segments[0:] - else: - return self, () +# if len(name) > 1: + return FileDownloader(self.directory, self.manager), segments[0:] +# else: +# return self, () if __name__ == '__builtin__': # Running from twistd -y - t = Toplevel('/home') + t = TopLevel('/home', None) t.addDirectory('/tmp') t.addDirectory('/var/log') site = server.Site(t) -- 2.39.5