Add semver support to rustdoc html server handler

Fixes: #26

Author: onur

src/web/file.rs

@@ -69,21 +69,7 @@ pub struct DatabaseFileHandler;
 impl Handler for DatabaseFileHandler {
     fn handle(&self, req: &mut Request) -> IronResult<Response> {
 
-        let path = {
-            let mut path = req.url.path.clone().join("/");
-            if path.ends_with("/") {
-                path.push_str("index.html");
-            }
-            // rustdoc javascripts have rustdoc prefix in database
-            // FIXME: this is kinda lame I have to save all javascripts with rustdoc prefix
-            // FIXME: this code became more retarded than before
-            if path.ends_with(".js") && !path.starts_with("main-") &&
-               !path.starts_with("jquery-") && !path.starts_with("playpen-") {
-                format!("rustdoc/{}", path)
-            } else {
-                path
-            }
-        };
+        let path = req.url.path.clone().join("/");
 
         let conn = req.extensions.get::<Pool>().unwrap();
         if let Some(file) = File::from_path(&conn, &path) {

src/web/rustdoc.rs

@@ -111,25 +111,41 @@ pub fn rustdoc_redirector_handler(req: &mut Request) -> IronResult<Response> {
 
 pub fn rustdoc_html_server_handler(req: &mut Request) -> IronResult<Response> {
 
-    let path = {
-        let mut path = req.url.path.clone();
-        // documentations have "rustdoc" prefix in database
-        path.insert(0, "rustdoc".to_owned());
+    let name = req.extensions.get::<Router>().unwrap().find("crate").unwrap_or("").to_string();
+    let version = req.extensions
+        .get::<Router>()
+        .unwrap()
+        .find("version");
+    let conn = req.extensions.get::<Pool>().unwrap();
+    let version = try!(match_version(&conn, &name, version)
+        .ok_or(IronError::new(Nope::ResourceNotFound, status::NotFound)));
+
+    // remove name and version from path
+    for _ in 0..2 {
+        req.url.path.remove(0);
+    }
+
+    // docs have "rustdoc" prefix in database
+    req.url.path.insert(0, "rustdoc".to_owned());
+
+    // add crate name and version
+    req.url.path.insert(1, name.clone());
+    req.url.path.insert(2, version.clone());
 
-        let mut path = path.join("/");
+    let path = {
+        let mut path = req.url.path.join("/");
         if path.ends_with("/") {
-            path.push_str("index.html")
+            path.push_str("index.html");
+            req.url.path.push("index.html".to_owned());
         }
-
         path
     };
-
+    
     // don't touch anything other than html files
     if !path.ends_with(".html") {
         return Err(IronError::new(Nope::ResourceNotFound, status::NotFound));
     }
 
-    let conn = req.extensions.get::<Pool>().unwrap();
 
     let file = match File::from_path(&conn, &path) {
         Some(f) => f,
@@ -165,15 +181,6 @@ pub fn rustdoc_html_server_handler(req: &mut Request) -> IronResult<Response> {
         }
     }
 
-
-    let name = req.extensions.get::<Router>().unwrap().find("crate").unwrap_or("").to_string();
-    let version = req.extensions
-        .get::<Router>()
-        .unwrap()
-        .find("version")
-        .unwrap_or("")
-        .to_string();
-
     // content.metadata = MetaData::from_crate(&conn, &name, &version);
     let (metadata, platforms) = {
         let rows = conn.query("SELECT crates.name,