static str lovelies

Author: metame

server/src/files.rs

@@ -10,13 +10,8 @@ pub enum FileStore {
 }
 
 impl FileStore {
-    pub fn get_file_store(file_id: &str) -> FileStore {
-        if file_id.starts_with("s3:") {
-            FileStore::S3
-        } else {
-            FileStore::FS
-        }
-    }
+    const S3_PREFIX: &'static str = "s3:";
+    const FS_PREFIX: &'static str = "fs:";
 
     pub fn get_config_file_store(config: &Config) -> FileStore {
         if config.opts.s3_bucket.is_some() {
@@ -27,25 +22,29 @@ impl FileStore {
     }
 
     pub fn get_subject_file_store(subject: &str) -> FileStore {
-        if subject.contains("s3:") {
+        if subject.contains(Self::S3_PREFIX) {
             FileStore::S3
         } else {
             FileStore::FS
         }
     }
 
-    pub fn name(&self) -> &str {
+    pub fn prefix(&self) -> &str {
         match self {
-            Self::S3 => "s3",
-            Self::FS => "fs",
+            Self::S3 => Self::S3_PREFIX,
+            Self::FS => Self::FS_PREFIX,
         }
     }
 
+    pub fn encoded(&self) -> String {
+        urlencoding::encode(self.prefix()).into_owned()
+    }
+
 }
 
 impl fmt::Display for FileStore {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "{}", self.name())
+        write!(f, "{}", self.prefix())
     }
 }
 

server/src/handlers/download.rs

@@ -29,7 +29,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(&subject);
-    let encoded = subject.replace(&format!("{file_store}:"), &format!("{file_store}%3A"));
+    let encoded = subject.replace(file_store.prefix(), &file_store.encoded());
     let resource = store.get_resource_extended(&encoded, false, &for_agent)?;
     let file_id = resource
         .get(urls::INTERNAL_ID)

server/src/handlers/upload.rs

@@ -81,7 +81,7 @@ pub async fn upload_handler(
             .map_err(|_e| "Too large")?;
 
         let file_store = FileStore::get_config_file_store(&appstate.config);
-        let file_id = format!("{}:{}", &file_store, &fs_file_id);
+        let file_id = format!("{}{}", file_store.prefix(), &fs_file_id);
         if let FileStore::S3 = file_store {
             files::s3_upload_object(&appstate, &file_id, &file_path).await?;
             fs::remove_file(&file_path)?;