blek
/
bfile
1
0
Fork 0
Code Issues 6 Pull Requests 1 Packages Projects Releases 1 Wiki Activity

Fix files naming #24

Merged
blek merged 3 commits from fix-naming into 0.2-dev 2023-12-11 00:56:44 +01:00
Conversation 5 Commits 3 Files Changed 2 +15 -14
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
filed/src/files/lookup.rs
View File

@ -102,30 +102,32 @@ impl FileManager {
pub fn save(self: &Self, file: &File, kind: LookupKind) -> Result<(), Box<dyn Error>> { pub fn save(self: &Self, file: &File, kind: LookupKind) -> Result<(), Box<dyn Error>> {
let file = file.clone(); let file = file.clone();
let midfix = match kind {
LookupKind::ByName => "-name-",
LookupKind::ByHash => "-hash-"
};
match kind { match kind {
LookupKind::ByName => { LookupKind::ByName => {
if (&file).name.is_none() { if let Some(name) = file.name.clone() {
log::debug!("Using {} as a custom file name", name);
return Ok(self.save_int(
&file,
format!(
"{}-name-{}",
blek commented 2023-12-10 16:45:55 +01:00
Outdated
Review
Copy Link

breaks dry? see line 130 as well. not quite sure if thats a bad thing

breaks dry? see line 130 as well. not quite sure if thats a bad thing
self.env.redis.prefix,
name
)
)?)
} else {
return Err("Filename can't be None when LookupKind is ByName!".into()) return Err("Filename can't be None when LookupKind is ByName!".into())
blek commented 2023-12-10 16:53:06 +01:00
Outdated
Review
Copy Link

i'd say that if we're not sticking with dry then there is no need for that midfix variable. could've just hardcoded the -(name|hash)- thing to make it more apparent

i'd say that if we're not sticking with dry then there is no need for that `midfix` variable. could've just hardcoded the `-(name|hash)-` thing to make it more apparent
} }
} }
_ => () _ => log::debug!("No custom file name detected")
} }
self.save_int( self.save_int(
&file, &file,
format!( format!(
"{}{}{}", "{}-hash-{}",
self.env.redis.prefix, self.env.redis.prefix,
midfix, file.hash()
match kind {
LookupKind::ByName => (&file).name.as_ref().unwrap().clone(),
LookupKind::ByHash => (&file).hash()
}
) )
) )
} }

3
filed/src/web/forms.rs
View File

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