Serve experiment config and results from the API.

Author: tomprince

src/report.rs

@@ -13,7 +13,7 @@ fn results_file(dest: &Path) -> PathBuf {
 }
 
 #[derive(Serialize, Deserialize)]
-struct TestResults {
+pub struct TestResults {
     crates: Vec<CrateResult>,
 }
 
@@ -40,13 +40,16 @@ struct BuildTestResult {
     log: String,
 }
 
-fn generate_report(ex: &ex::Experiment, dest: &Path) -> Result<TestResults> {
+
+pub fn generate_report(ex: &ex::Experiment, dest: Option<&Path>) -> Result<TestResults> {
     let db = FileDB::for_experiment(ex);
     assert_eq!(ex.toolchains.len(), 2);
 
-    fs::create_dir_all(dest)?;
-    let json = serde_json::to_string(&ex)?;
-    file::write_string(&dest.join("config.json"), &json)?;
+    if let Some(dest) = dest {
+        fs::create_dir_all(dest)?;
+        let json = serde_json::to_string(&ex)?;
+        file::write_string(&dest.join("config.json"), &json)?;
+    }
 
     let res = ex::ex_crates_and_dirs(ex)?
         .into_iter()
@@ -59,13 +62,15 @@ fn generate_report(ex: &ex::Experiment, dest: &Path) -> Result<TestResults> {
                     let res = writer.load_test_result()?;
                     // If there was no test result return an error
                     let res = res.ok_or_else(|| Error::from("no result"))?;
-                    let mut result_log = writer.read_log()?;
 
                     let rel_log = writer.result_path_fragement();
 
-                    // TODO: Seperate out writting log files so that they can
-                    // be served via HTTP directly instead.
-                    write_log_file(dest, &rel_log, &mut result_log)?;
+                    if let Some(dest) = dest {
+                        let mut result_log = writer.read_log()?;
+                        // TODO: Seperate out writting log files so that they can
+                        // be served via HTTP directly instead.
+                        write_log_file(dest, &rel_log, &mut result_log)?;
+                    }
 
                     Ok(BuildTestResult {
                            res: res,
@@ -93,7 +98,7 @@ fn generate_report(ex: &ex::Experiment, dest: &Path) -> Result<TestResults> {
 pub fn gen(ex_name: &str, dest: &Path) -> Result<()> {
     let ex = ex::Experiment::load(ex_name)?;
 
-    let res = generate_report(&ex, dest)?;
+    let res = generate_report(&ex, Some(dest))?;
     let json = serde_json::to_string(&res)?;
 
     info!("writing results to {}", results_file(dest).display());

src/server/api.rs

@@ -36,3 +36,27 @@ pub mod post {
         Response { out: format!("Got {}!", post.input) }
     }
 }
+
+pub mod ex_report {
+    use ex;
+    use report::{TestResults, generate_report};
+    use server::{Data, Params};
+
+    #[cfg_attr(feature = "cargo-clippy", allow(needless_pass_by_value))]
+    pub fn handler(_data: &Data, params: Params) -> TestResults {
+        let ex_name = params.find("experiment").unwrap();
+        let ex = ex::Experiment::load(ex_name).unwrap();
+        generate_report(&ex, None).unwrap()
+    }
+}
+
+pub mod ex_config {
+    use ex;
+    use server::{Data, Params};
+
+    #[cfg_attr(feature = "cargo-clippy", allow(needless_pass_by_value))]
+    pub fn handler(_data: &Data, params: Params) -> ex::Experiment {
+        let ex_name = params.find("experiment").unwrap();
+        ex::Experiment::load(ex_name).unwrap()
+    }
+}

src/server/mod.rs

@@ -60,10 +60,10 @@ impl Server {
 
     fn handle_post<F, D, S>(&self,
                             req: Request,
-                            _params: Params,
+                            params: Params,
                             handler: F)
                             -> <Server as Service>::Future
-        where F: FnOnce(D, &Data) -> S + Send + 'static,
+        where F: FnOnce(D, &Data, Params) -> S + Send + 'static,
               D: DeserializeOwned,
               S: Serialize
     {
@@ -145,6 +145,14 @@ pub fn start(data: Data) {
     let mut router = Router::<Handler>::new();
     route!(router, "/api/get", handle_get, api::get::handler);
     route!(router, "/api/post", handle_post, api::post::handler);
+    route!(router,
+           "/api/ex/:experiment/results",
+           handle_get,
+           api::ex_report::handler);
+    route!(router,
+           "/api/ex/:experiment/config",
+           handle_get,
+           api::ex_config::handler);
     route!(router,
            "/static/report.html",
            handle_static,