redstrate/physis
1
Fork 0
mirror of https://github.com/redstrate/Physis.git synced 2025-04-23 13:17:44 +00:00
Code Activity

Remove possible panic when checking if a file exists

Browse source 
Probably a leftover from me
This commit is contained in:
Joshua Goins 2024-04-29 19:09:51 -04:00
parent 89d026bf63
commit 349a194060
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/gamedata.rs
View file

@ -157,7 +157,9 @@ impl GameData {
/// } /// }
/// ``` /// ```
pub fn exists(&mut self, path: &str) -> bool { pub fn exists(&mut self, path: &str) -> bool {
let index_path = self.get_index_filenames(path); let Some(index_path) = self.get_index_filenames(path) else {
return false;
};
self.cache_index_file((&index_path.0, &index_path.1)); self.cache_index_file((&index_path.0, &index_path.1));
@ -219,8 +221,8 @@ impl GameData {
Some((&self.repositories[0], string_to_category(tokens[0])?)) Some((&self.repositories[0], string_to_category(tokens[0])?))
} }
fn get_index_filenames(&self, path: &str) -> (String, String) { fn get_index_filenames(&self, path: &str) -> Option<(String, String)> {
let (repository, category) = self.parse_repository_category(path).unwrap(); let (repository, category) = self.parse_repository_category(path)?;
let index_path: PathBuf = [ let index_path: PathBuf = [
&self.game_directory, &self.game_directory,
@ -240,10 +242,10 @@ impl GameData {
.iter() .iter()
.collect(); .collect();
( Some((
index_path.into_os_string().into_string().unwrap(), index_path.into_os_string().into_string().unwrap(),
index2_path.into_os_string().into_string().unwrap(), index2_path.into_os_string().into_string().unwrap(),
) ))
} }
/// Read an excel sheet by name (e.g. "Achievement") /// Read an excel sheet by name (e.g. "Achievement")
@ -419,7 +421,7 @@ impl GameData {
} }
fn find_entry(&mut self, path: &str) -> Option<IndexHashBitfield> { fn find_entry(&mut self, path: &str) -> Option<IndexHashBitfield> {
let index_path = self.get_index_filenames(path); let index_path = self.get_index_filenames(path)?;
debug!( debug!(
"Trying index files {index_path}, {index2_path}", "Trying index files {index_path}, {index2_path}",
index_path = index_path.0, index_path = index_path.0,