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 +14 -6
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e84ddee2a4 - Show all commits

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

@ -109,11 +109,22 @@ impl FileManager {
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);
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
return Ok(self.save_int(
&file,
format!(
"{}{}{}",
self.env.redis.prefix,
midfix,
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
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())
} }
} }
_ => () _ => log::debug!("No custom file name detected")
} }
self.save_int( self.save_int(
@ -122,10 +133,7 @@ impl FileManager {
"{}{}{}", "{}{}{}",
self.env.redis.prefix, self.env.redis.prefix,
midfix, midfix,
match kind { file.hash()
LookupKind::ByName => (&file).name.as_ref().unwrap().clone(),
LookupKind::ByHash => (&file).hash()
}
) )
) )
} }