nopaste: Update the raw handler

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/web/nopaste.py b/src/web/nopaste.py
index 0368e0fc2213c38ebafc096fd9e5634cd08f091c..910d5364d2ee059c22f77dbbd5e300122dfab950 100644 (file)
--- a/src/web/nopaste.py
+++ b/src/web/nopaste.py
@@ -71,25 +71,21 @@ class CreateHandler(base.AnalyticsMixin, base.BaseHandler):
 class RawHandler(base.AnalyticsMixin, base.BaseHandler):
        def get(self, uid):
                with self.db.transaction():
-                       entry = self.backend.nopaste.get(uid)
-                       if not entry:
+                       paste = self.backend.nopaste.get(uid)
+                       if not paste:
                                raise tornado.web.HTTPError(404)
 
                        # This has received a view
-                       entry.viewed()
+                       paste.viewed()
 
                # Set the filename
-               self.set_header("Content-Disposition", "inline; filename=\"%s\"" % entry.subject)
+               self.set_header("Content-Disposition", "inline; filename=\"%s\"" % paste.subject)
 
                # Set mimetype
-               self.set_header("Content-Type", entry.mimetype)
-
-               # Set expiry headers
-               self.set_expires(3600)
+               self.set_header("Content-Type", paste.mimetype)
 
                # Send content
-               content = self.backend.nopaste.get_content(entry.uuid)
-               self.finish(content)
+               self.finish(paste.blob)
 
 
 class ViewHandler(base.AnalyticsMixin, base.BaseHandler):