consolidate download fs path logic

Author: metame

server/src/config.rs

@@ -271,7 +271,7 @@ pub fn build_config(opts: Opts) -> AtomicServerResult<Config> {
     let initialize = !std::path::Path::exists(&store_path) || opts.initialize;
 
     // Initialize FileStore config
-    let fs_file_store = FileStore::init_fs_from_config(&opts);
+    let fs_file_store = FileStore::init_fs_from_config(&opts, uploads_path.clone());
     let file_store = FileStore::init_from_config(&opts, fs_file_store.clone());
 
     if opts.https & opts.email.is_none() {

server/src/files.rs

@@ -23,14 +23,16 @@ pub struct S3Config {
 }
 
 #[derive(Clone, Debug)]
-pub struct FSConfig {}
+pub struct FSConfig {
+    path: PathBuf
+}
 
 impl FileStore {
     const S3_PREFIX: &'static str = "s3:";
     const FS_PREFIX: &'static str = "fs:";
 
-    pub fn init_fs_from_config(_opts: &Opts) -> FileStore {
-        FileStore::FS(FSConfig {})
+    pub fn init_fs_from_config(_opts: &Opts, path: PathBuf) -> FileStore {
+        FileStore::FS(FSConfig {path})
     }
 
     pub fn init_from_config(opts: &Opts, fs_file_store: FileStore) -> FileStore {
@@ -55,6 +57,17 @@ impl FileStore {
         }
     }
 
+    pub fn get_fs_file_path(&self, file_id: &str) -> AtomicServerResult<PathBuf> {
+        if let FileStore::FS(config) = self {
+            let fs_file_id = file_id.strip_prefix(Self::FS_PREFIX).unwrap_or(file_id);
+            let mut file_path = config.path.clone();
+            file_path.push(fs_file_id.to_string());
+            Ok(file_path)
+        } else {
+            Err("Wrong FileStore passed to get_fs_file_path".into())
+        }
+    }
+
     pub fn prefix(&self) -> &str {
         match self {
             Self::S3(_) => Self::S3_PREFIX,

server/src/handlers/download.rs

@@ -53,9 +53,7 @@ pub fn download_file_handler_partial(
     req: &HttpRequest,
     appstate: &AppState,
 ) -> AtomicServerResult<HttpResponse> {
-    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(fs_file_id.to_string());
+    let file_path = appstate.config.fs_file_store.get_fs_file_path(file_id)?;
     let file = NamedFile::open(file_path)?;
     Ok(file.into_response(req))
 }