possibly fix issue with :

Author: metame

server/src/handlers/download.rs

@@ -29,12 +29,12 @@ pub async fn handle_download(
 
     let for_agent = get_client_agent(headers, &appstate, subject.clone())?;
     tracing::info!("handle_download: {}", subject);
-    let resource = store.get_resource_extended(&subject, false, &for_agent)?;
+    let resource = store.get_resource_extended(&urlencoding::encode(&subject).into_owned(), false, &for_agent)?;
     let file_id = resource
         .get(urls::INTERNAL_ID)
         .map_err(|e| format!("Internal ID of file could not be resolved. {}", e))?
         .to_string();
-    let is_s3 = file_id.starts_with("s3-");
+    let is_s3 = file_id.starts_with("s3:");
     if is_s3 {
         signed_url_redirect_handler(file_id.as_str(), &req, &appstate).await
     } else {
@@ -47,8 +47,10 @@ pub fn download_file_handler_partial(
     req: &HttpRequest,
     appstate: &AppState,
 ) -> AtomicServerResult<HttpResponse> {
+    println!("{file_id:?}");
+    let fs_file_id = file_id.strip_prefix("fs:").unwrap_or(file_id);
     let mut file_path = appstate.config.uploads_path.clone();
-    file_path.push(file_id.to_string());
+    file_path.push(fs_file_id.to_string());
     let file = NamedFile::open(file_path)?;
     Ok(file.into_response(req))
 }

server/src/handlers/upload.rs

@@ -56,19 +56,16 @@ pub async fn upload_handler(
 
         std::fs::create_dir_all(&appstate.config.uploads_path)?;
 
-        let is_s3 = appstate.config.opts.s3_bucket.is_some();
-        let file_store = if is_s3 { "s3" } else { "fs" };
-        let file_id = format!(
-            "{}-{}-{}",
-            file_store,
+        let fs_file_id = format!(
+            "{}-{}",
             now(),
             sanitize_filename::sanitize(filename)
                 // Spacebars lead to very annoying bugs in browsers
                 .replace(' ', "-")
         );
 
         let mut file_path = appstate.config.uploads_path.clone();
-        file_path.push(&file_id);
+        file_path.push(&fs_file_id);
         let mut file = File::create(&file_path)?;
 
         // Field in turn is stream of *Bytes* object
@@ -84,6 +81,9 @@ pub async fn upload_handler(
             .try_into()
             .map_err(|_e| "Too large")?;
 
+        let is_s3 = appstate.config.opts.s3_bucket.is_some();
+        let file_store = if is_s3 { "s3" } else { "fs" };
+        let file_id = format!("{}:{}", &file_store, &fs_file_id);
         if is_s3 {
             upload_object(&appstate, &file_id, &file_path).await?;
             fs::remove_file(&file_path)?;
@@ -176,16 +176,3 @@ async fn upload_object(
 
     Ok(())
 }
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    #[actix_web::test]
-    async fn upload_object_works() {
-        let mut file = File::create(&"/tmp/test").unwrap();
-        file.write_all("it works!".as_bytes()).unwrap();
-        let _ = upload_object(&"it-works", file).await;
-        assert!(true);
-    }
-}