filed/src/files/lookup.rs

@@ -102,32 +102,30 @@ impl FileManager {
 
     pub fn save(self: &Self, file: &File, kind: LookupKind) -> Result<(), Box<dyn Error>> {
         let file = file.clone();
+        let midfix = match kind {
+            LookupKind::ByName => "-name-",
+            LookupKind::ByHash => "-hash-"
+        };
         
         match kind {
             LookupKind::ByName => {
-                if let Some(name) = file.name.clone() {
+                if (&file).name.is_none() {
-                    log::debug!("Using {} as a custom file name", name);
-                    return Ok(self.save_int(
-                        &file,
-                        format!(
-                            "{}-name-{}",
-                            self.env.redis.prefix,
-                            name
-                        )
-                    )?)
-                } else {
                     return Err("Filename can't be None when LookupKind is ByName!".into())
                 }
             }
-            _ => log::debug!("No custom file name detected")
+            _ => ()
         }
 
         self.save_int(
             &file,
             format!(
-                "{}-hash-{}",
+                "{}{}{}",
                 self.env.redis.prefix,
-                file.hash()
+                midfix,
+                match kind {
+                    LookupKind::ByName => (&file).name.as_ref().unwrap().clone(),
+                    LookupKind::ByHash => (&file).hash()
+                }
             )
         )
     }

filed/src/web/forms.rs

@@ -95,7 +95,7 @@ impl UploadFormData {
                 if val.is_checked() {
                     let name = data.get("filename")?;
                     out.filename = Some(name.as_atr_or_none()?);
-                    out.lookup_kind = LookupKind::ByName
+                    out.lookup_kind = LookupKind::ByHash
                 }
             },
             None => ()
@@ -107,6 +107,7 @@ impl UploadFormData {
                 if val.is_checked() {
                     let pass = data.get("password")?;
                     out.password = Some(pass.as_atr_or_none()?);
+                    out.lookup_kind = LookupKind::ByName
                 }
             },
             None => ()