Redirect non-json for download (instead of sending json)

Author: alexcrichton

src/package.rs

@@ -466,7 +466,12 @@ pub fn download(req: &mut Request) -> CargoResult<Response> {
     let redirect_url = format!("https://{}/pkg/{}/{}-{}.tar.gz",
                                req.app().bucket.host(),
                                pkg_name, pkg_name, version);
-    #[deriving(Encodable)]
-    struct R { ok: bool, url: String }
-    Ok(req.json(&R{ ok: true, url: redirect_url }))
+
+    if req.wants_json() {
+        #[deriving(Encodable)]
+        struct R { ok: bool, url: String }
+        Ok(req.json(&R{ ok: true, url: redirect_url }))
+    } else {
+        Ok(req.redirect(redirect_url))
+    }
 }

src/tests/package.rs

@@ -296,7 +296,8 @@ fn download() {
     let rel = format!("/{}/{}-1.0.0.tar.gz", package.name, package.name);
     let mut req = MockRequest::new(conduit::Get, format!("/download{}", rel)
                                                         .as_slice());
-    ok_resp!(middle.call(&mut req));
+    let resp = t_resp!(middle.call(&mut req));
+    assert_eq!(resp.status.val0(), 302);
     {
         let conn = (&mut req as &mut Request).tx().unwrap();
         let pkg = Package::find_by_name(conn, package.name.as_slice()).unwrap();

src/util/mod.rs

@@ -27,6 +27,7 @@ pub trait RequestUtils {
 
     fn json<'a, T: Encodable<json::Encoder<'a>, IoError>>(self, t: &T) -> Response;
     fn query(self) -> HashMap<String, String>;
+    fn wants_json(self) -> bool;
 }
 
 pub fn json_response<'a, T>(t: &T) -> Response
@@ -62,6 +63,11 @@ impl<'a> RequestUtils for &'a Request + 'a {
             body: box MemReader::new(Vec::new()),
         }
     }
+
+    fn wants_json(self) -> bool {
+        let content = self.headers().find("Accept").unwrap_or(Vec::new());
+        content.iter().any(|s| s.contains("json"))
+    }
 }
 
 pub struct C(pub fn(&mut Request) -> CargoResult<Response>);