wip

Author: syphar

src/web/build_details.rs

@@ -96,34 +96,53 @@ pub(crate) async fn build_details_handler(
         (output, Vec::new(), None)
     } else {
         let prefix = format!("build-logs/{}/", id);
+        let all_log_filenames: Vec<_> = storage
+            .list_prefix(&prefix) // the result from S3 is ordered by key
+            .await
+            .map_ok(|path| {
+                path.strip_prefix(&prefix)
+                    .expect("since we query for the prefix, it has to be always there")
+                    .to_owned()
+            })
+            .try_collect()
+            .await?;
+
+        let fetch_file = |filename: String| async {
+            let file = File::from_path(&storage, &format!("{prefix}{filename}"), &config).await?;
+            Ok::<_, anyhow::Error>(String::from_utf8(file.0.content).context("non utf8")?)
+        };
 
-        if let Some(current_filename) = params
-            .filename
-            .or(row.default_target.map(|target| format!("{}.txt", target)))
-        {
-            let path = format!("{prefix}{current_filename}");
-            let file = File::from_path(&storage, &path, &config).await?;
+        let (filename, file_content) = if let Some(filename) = params.filename {
+            (Some(filename.clone()), fetch_file(filename.clone()).await?)
+        } else if let Some(default_target) = row.default_target {
+            let filename = format!("{default_target}.txt");
             (
-                String::from_utf8(file.0.content).context("non utf8")?,
-                storage
-                    .list_prefix(&prefix) // the result from S3 is ordered by key
-                    .await
-                    .map_ok(|path| {
-                        path.strip_prefix(&prefix)
-                            .expect("since we query for the prefix, it has to be always there")
-                            .to_owned()
-                    })
-                    .try_collect()
-                    .await?,
-                Some(current_filename),
+                Some(filename),
+                match fetch_file(filename.clone()).await {
+                    Ok(content) => content,
+                    Err(_err) => "".to_string(),
+                },
             )
         } else {
-            // this can only happen when `releases.default_target` is NULL,
-            // which is the case for in-progress builds or builds which errored
-            // before we could determine the target.
-            // For the "error" case we show `row.errors`, which should contain what we need to see.
-            ("".into(), Vec::new(), None)
-        }
+            (None, "".into())
+        };
+
+        // .or(row.default_target.map(|target| format!("{}.txt", target)))
+        // {
+        //     let path = format!("{prefix}{current_filename}");
+        //     let file = File::from_path(&storage, &path, &config).await?;
+        //     (
+        //         String::from_utf8(file.0.content).context("non utf8")?,
+        //         Some(current_filename),
+        //     )
+        // } else {
+        //     // this can only happen when `releases.default_target` is NULL,
+        //     // which is the case for in-progress builds or builds which errored
+        //     // before we could determine the target.
+        //     // For the "error" case we show `row.errors`, which should contain what we need to see.
+        //     ("".into(), Vec::new(), None)
+        // }
+        (file_content, all_log_filenames, filename)
     };
 
     Ok(BuildDetailsPage {