Added fileiter and fileresp.

[wrw.git] / wrw / resp.py

diff --git a/wrw/resp.py b/wrw/resp.py
index b62ce0e..00c7045 100644 (file)
--- a/wrw/resp.py
+++ b/wrw/resp.py
@@ -1,3 +1,4 @@
+import os
 from . import dispatch, proto, env
 from .sp import xhtml
 h = xhtml.cons()
@@ -42,10 +43,10 @@ class message(dispatch.restart):
         self.detail = detail
 
     def handle(self, req):
-        return skelfor(req).error(req, self.message, *self.detail)
+        return skelfor(req).message(req, self.message, *self.detail)
 
 class httperror(usererror):
-    def __init__(self, status, message = None, detail = None):
+    def __init__(self, status, message=None, detail=None):
         if message is None:
             message = proto.statusinfo[status][0]
         if detail is None:
@@ -62,12 +63,60 @@ class notfound(httperror):
         return super().__init__(404)
 
 class redirect(dispatch.restart):
-    def __init__(self, url, status = 303):
+    bases = {"url": proto.requrl,
+             "script": proto.scripturl,
+             "site": proto.siteurl}
+
+    def __init__(self, url, status=303, base="url"):
         super().__init__()
         self.url = url
         self.status = status
+        self.bases[base]
+        self.base = base
 
     def handle(self, req):
         req.status(self.status, "Redirect")
-        req.ohead["Location"] = proto.appendurl(proto.requrl(req), self.url)
+        req.ohead["Location"] = proto.appendurl(self.bases[self.base](req), self.url)
+        req.ohead["Content-Length"] = 0
+        return []
+
+class unmodified(dispatch.restart):
+    def handle(self, req):
+        req.status(304, "Not Modified")
+        req.ohead["Content-Length"] = "0"
         return []
+
+class fileiter(object):
+    def __init__(self, fp):
+        self.fp = fp
+
+    def __iter__(self):
+        return self
+
+    def __next__(self):
+        if self.fp is None:
+            raise StopIteration()
+        data = self.fp.read(16384)
+        if data == b"":
+            self.fp.close()
+            self.fp = None
+            raise StopIteration()
+        return data
+
+    def close(self):
+        if self.fp is not None:
+            self.fp.close()
+            self.fp = None
+
+class fileresp(dispatch.restart):
+    def __init__(self, fp, ctype):
+        self.fp = fp
+        self.ctype = ctype
+
+    def handle(self, req):
+        req.ohead["Content-Type"] = self.ctype
+        if hasattr(self.fp, "fileno"):
+            sz = os.fstat(self.fp.fileno()).st_size
+            if sz > 0:
+                req.ohead["Content-Length"] = str(sz)
+        return fileiter(self.fp)