back to nicer interface

Author: metame

server/src/files.rs

@@ -4,7 +4,7 @@ use actix_multipart::Field;
 use futures::StreamExt;
 use opendal::{services::S3, Operator};
 
-use crate::{config::Config, errors::AtomicServerResult};
+use crate::{appstate::AppState, config::Config, errors::AtomicServerResult};
 
 #[derive(Clone, Debug, PartialEq)]
 pub enum FileStore {
@@ -50,11 +50,11 @@ impl FileStore {
         }
     }
 
-    pub fn get_subject_file_store<'a>(file_store: &'a FileStore, fs_file_store: &'a FileStore, subject: &str) -> &'a FileStore {
+    pub fn get_subject_file_store<'a>(appstate: &'a AppState, subject: &str) -> &'a FileStore {
         if subject.contains(Self::S3_PREFIX) {
-            file_store
+            &appstate.file_store
         } else {
-            fs_file_store
+            &appstate.fs_file_store
         }
     }
 
@@ -196,10 +196,8 @@ mod test {
             .map_err(|e| format!("Initialization failed: {}", e))
             .expect("failed init config");
 
-        let appstate = crate::appstate::init(config.clone()).expect("failed init appstate");
-
         let fs_store = FileStore::init_fs_from_config(&config);
-        if let FileStore::FS(fs_config) = fs_store.clone() {
+        if let FileStore::FS(fs_config) = &fs_store {
             assert!(fs_config.path.to_str().unwrap().contains("uploads"));
         } else {
             panic!("fs FileStore not initiated");
@@ -211,16 +209,15 @@ mod test {
 
         assert!(fs_store.get_fs_file_path("my-great-file").unwrap().to_str().unwrap().contains("uploads/my-great-file"));
         assert!(fs_store.get_fs_file_path("fs:my-great-file").unwrap().to_str().unwrap().contains("uploads/my-great-file"));
-        //assert_eq!(file_path, fs_store.get_fs_file_path("my-great-file").unwrap());
-        //assert_eq!(file_path, fs_store.get_fs_file_path("fs:my-great-file").unwrap());
 
         // FileStore::S3 init
         opts.s3_bucket = Some("test-bucket".to_string());
         opts.s3_path = Some("uploads".to_string());
         config.opts = opts;
+        let appstate = crate::appstate::init(config.clone()).expect("failed init appstate");
 
         let s3_store = FileStore::init_from_config(&config, fs_store.clone());
-        if let FileStore::S3(s3_config) = s3_store.clone() {
+        if let FileStore::S3(s3_config) = &s3_store {
             assert_eq!(s3_config.bucket, "test-bucket");
             assert_eq!(s3_config.path, "uploads");
         } else {
@@ -230,8 +227,8 @@ mod test {
         assert_eq!("s3:", s3_store.prefix());
         assert_eq!("s3%3A", s3_store.encoded());
 
-        assert_eq!(&fs_store, FileStore::get_subject_file_store(&s3_store, &fs_store, "my-great-file"));
-        assert_eq!(&fs_store, FileStore::get_subject_file_store(&s3_store, &fs_store, "fs:my-great-file"));
-        assert_eq!(&s3_store, FileStore::get_subject_file_store(&s3_store, &fs_store, "s3:my-great-file"));
+        assert_eq!(&fs_store, FileStore::get_subject_file_store(&appstate, "my-great-file"));
+        assert_eq!(&fs_store, FileStore::get_subject_file_store(&appstate, "fs:my-great-file"));
+        assert_eq!(&s3_store, FileStore::get_subject_file_store(&appstate, "s3:my-great-file"));
     }
 }

server/src/handlers/download.rs

@@ -33,7 +33,7 @@ pub async fn handle_download(
 
     let for_agent = get_client_agent(headers, &appstate, subject.clone())?;
     tracing::info!("handle_download: {}", subject);
-    let file_store = FileStore::get_subject_file_store(&appstate.file_store, &appstate.fs_file_store, &subject);
+    let file_store = FileStore::get_subject_file_store(&appstate, &subject);
     let encoded = subject.replace(file_store.prefix(), &file_store.encoded());
     let resource = store.get_resource_extended(&encoded, false, &for_agent)?;
     let file_id = resource