download working

Author: metame

server/src/handlers/download.rs

@@ -53,16 +53,28 @@ pub fn download_file_handler_partial(
     Ok(file.into_response(req))
 }
 
-
-async fn signed_url_redirect_handler(file_id: &str, req: &HttpRequest, appstate: &AppState) -> AtomicServerResult<HttpResponse> {
+async fn signed_url_redirect_handler(
+    file_id: &str,
+    req: &HttpRequest,
+    appstate: &AppState,
+) -> AtomicServerResult<HttpResponse> {
     let mut builder = S3::default();
-    builder.bucket(appstate.config.opts.s3_bucket.as_ref().unwrap().as_str());
+
+    let bucket = appstate
+        .config
+        .opts
+        .s3_bucket
+        .as_ref()
+        .ok_or("s3 file found but no s3 bucket")?;
+    builder.bucket(bucket);
+
     appstate
         .config
         .opts
         .s3_region
         .as_ref()
         .map(|r| builder.region(&r));
+
     appstate
         .config
         .opts
@@ -80,6 +92,12 @@ async fn signed_url_redirect_handler(file_id: &str, req: &HttpRequest, appstate:
 
     let op: Operator = Operator::new(builder)?.finish();
 
-    let signed_url = op.presign_read(&format!("{}/{}", &path, file_id), Duration::from_secs(3600)).await?.uri().to_string();
-    Ok(web::Redirect::to(signed_url).respond_to(req).map_into_boxed_body())
+    let signed_url = op
+        .presign_read(&format!("{}/{}", &path, file_id), Duration::from_secs(3600))
+        .await?
+        .uri()
+        .to_string();
+    Ok(web::Redirect::to(signed_url)
+        .respond_to(req)
+        .map_into_boxed_body())
 }