localhorst/TextureSync
3
1
Fork 0
Code Issues 2 Pull Requests Releases 3 Wiki Activity

change visibility of persistency::DataStore::extract_hash

Browse Source
This commit is contained in:
CodeSteak
2019-05-09 20:14:34 +02:00
parent 89b2b480ce
commit 92b053769a
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
server/texture-sync-server/src/persistency/mod.rs
View File

@ -199,20 +199,20 @@ impl DataStore {
self.textures.iter()
}
pub fn extract_hash(filename: &std::ffi::OsStr) -> Option<Sha256> {
// directly return None for invalidly encoded file names
let str_name = filename.to_str()?;
let hash = Sha256::from_hex(str_name)?;
// check back to ignore names with lowercase letters
if hash.as_hex_string() == str_name {
Some(hash)
} else {
None
}
}
pub fn garbage_collect(&mut self) -> io::Result<()> {
fn extract_hash(filename: &std::ffi::OsStr) -> Option<Sha256> {
// directly return None for invalidly encoded file names
let str_name = filename.to_str()?;
let hash = Sha256::from_hex(str_name)?;
// check back to ignore names with lowercase letters
if hash.as_hex_string() == str_name {
Some(hash)
} else {
None
}
}
let texture_dir = std::fs::read_dir(self.texture_base_path())?;
let mut hashs_on_disk = HashSet::new();
@ -222,7 +222,7 @@ impl DataStore {
Some(name) => name,
None => continue,
};
match Self::extract_hash(filename) {
match extract_hash(filename) {
Some(hash) => {
hashs_on_disk.insert(hash);
}