WIP

Author: syphar

src/storage/mod.rs

@@ -345,26 +345,17 @@ impl AsyncStorage {
         path: &str,
         archive_storage: bool,
     ) -> Result<Blob> {
-        self.stream_source_file(name, version, latest_build_id, path, archive_storage)
-            .await?
-            .materialize(self.max_file_size_for(path))
-            .await
-    }
-
-    pub(crate) async fn stream_source_file(
-        &self,
-        name: &str,
-        version: &Version,
-        latest_build_id: Option<BuildId>,
-        path: &str,
-        archive_storage: bool,
-    ) -> Result<StreamingBlob> {
         Ok(if archive_storage {
-            self.stream_from_archive(&source_archive_path(name, version), latest_build_id, path)
-                .await?
+            self.get_from_archive(
+                &source_archive_path(name, version),
+                latest_build_id,
+                path,
+                self.max_file_size_for(path),
+            )
+            .await?
         } else {
             let remote_path = format!("sources/{name}/{version}/{path}");
-            self.get_stream(&remote_path).await?
+            self.get(&remote_path, self.max_file_size_for(path)).await?
         })
     }
 

src/web/statics.rs

@@ -56,7 +56,6 @@ async fn set_needed_static_headers(req: Request, next: Next) -> Response {
     response
 }
 
-#[axum::debug_middleware]
 async fn conditional_get(
     partial_uri: Uri,
     method: Method,