import mimetypes, os, posixpath, signal, stat, sys, time, urllib, webbrowser
from bup import options, git, vfs
-from bup.helpers import (debug1, handle_ctrl_c, log, resource_path,
- saved_errors)
+from bup.helpers import (chunkyreader, debug1, handle_ctrl_c, log,
+ resource_path, saved_errors)
try:
+ from tornado import gen
from tornado.httpserver import HTTPServer
from tornado.ioloop import IOLoop
from tornado.netutil import bind_unix_socket
class BupRequestHandler(tornado.web.RequestHandler):
+
+ def decode_argument(self, value, name=None):
+ if name == 'path':
+ return value
+ return super(BupRequestHandler, self).decode_argument(value, name)
+
def get(self, path):
return self._process_request(path)
def head(self, path):
return self._process_request(path)
- @tornado.web.asynchronous
def _process_request(self, path):
path = urllib.unquote(path)
print 'Handling request for %s' % path
hidden_shown=show_hidden,
dir_contents=_compute_dir_contents(n, path, show_hidden))
+ @gen.coroutine
def _get_file(self, path, n):
"""Process a request on a file.
In either case, the headers are sent.
"""
ctype = self._guess_type(path)
-
self.set_header("Last-Modified", self.date_time_string(n.mtime))
self.set_header("Content-Type", ctype)
size = n.size()
self.set_header("Content-Length", str(size))
assert(len(n.hash) == 20)
self.set_header("Etag", n.hash.encode('hex'))
-
if self.request.method != 'HEAD':
- self.flush()
f = n.open()
- it = chunkyreader(f)
- def write_more(me):
- try:
- blob = it.next()
- except StopIteration:
- f.close()
- self.finish()
- return
- self.request.connection.stream.write(blob,
- callback=lambda: me(me))
- write_more(write_more)
- else:
- self.finish()
+ try:
+ it = chunkyreader(f)
+ for blob in chunkyreader(f):
+ self.write(blob)
+ finally:
+ f.close()
+ raise gen.Return()
def _guess_type(self, path):
"""Guess the type of a file.
sys.stdout = os.fdopen(sys.stdout.fileno(), 'w', 0)
application = tornado.web.Application([
- (r"(/.*)", BupRequestHandler),
+ (r"(?P<path>/.*)", BupRequestHandler),
], **settings)
http_server = HTTPServer(application)