# HG changeset patch # User julfers # Date 1393969764 18000 # Tue Mar 04 16:49:24 2014 -0500 # Node ID fd794cb3cd8afb1cfe6a342c620e1cc66db3575e # Parent ce3749f708351387f68126a8163045818f91f40e Fix serving from alternate directory diff --git a/dss.py b/dss.py --- a/dss.py +++ b/dss.py @@ -153,21 +153,18 @@ continue shutil.copy2(source, target) - def serve(self, port=8000): + def serve(site, port=8000): # TODO: show fatal rst syntax errors, e.g. include file that doesn't exist class LiveSiteHandler(SimpleHTTPRequestHandler): - def do_GET(self): + def do_GET(request): # TODO: expire immediately - if self.path.startswith('/_site/'): - # TODO: test for this - self.send_error(403) - else: - DeadSimpleSite('.').compile() - self.path = '/_site' + self.path - SimpleHTTPRequestHandler.do_GET(self) + # TODO: tests for this + site.compile() + SimpleHTTPRequestHandler.do_GET(request) server = SocketServer.TCPServer(('', port), LiveSiteHandler) + os.chdir(site.target) server.serve_forever() def publish(self, origin=None):