bundles download: Use Namedfile

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/daemon/main.rs b/daemon/main.rs
index 03a39249f5fc25d700845aeac481c5cd3766268f..54d9c5adb841f5ace0012d4bc0c49829fb4f50f5 100644 (file)
--- a/daemon/main.rs
+++ b/daemon/main.rs
@@ -247,12 +247,16 @@ fn bundle<'r>(instance: Parse<InstanceName>,
     let ig = ig.by_ref(Authorisation::authorise_any());
     ig.asset_url_key.check("bundle", &(instance, id), &token)?
   }.map(|(_,id)| id);
-  let f = id.open_by_name(instance, auth).map_err(IE::from)?;
+  let path = id.path(&ig, auth);
+  let f = match rocket::response::NamedFile::open(&path) {
+    Err(e) if e.kind() == ErrorKind::NotFound => throw!(BDE::NotFound),
+    Err(e) => throw!(IE::from(AE::from(e).context(path).context("bundle"))),
+    Ok(y) => y,
+  };
   let ctype = match id.kind {
     bundles::Kind::Zip => ContentType::ZIP,
   };
-  if_let!{ Some(f) = f; else throw!(BundleDownloadError::NotFound) }
-  Content(ctype, rocket::response::Stream::from(f))
+  Content(ctype, f)
 }
 
 #[derive(Debug,Copy,Clone)]