encounter
/
decomp-toolkit
mirror of https://github.com/encounter/decomp-toolkit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup find_object_base & better error handling

This commit is contained in:
Luke Street 2024-10-18 00:41:17 -06:00
parent 8823c2225e
commit f984bc3fb2
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/cmd/dol.rs
View File

@ -2065,13 +2065,26 @@ pub fn find_object_base(config: &ProjectConfig) -> Result<ObjectBase> {
if let Some(base) = &config.object_base { if let Some(base) = &config.object_base {
let base = base.with_encoding(); let base = base.with_encoding();
// Search for disc images in the object base directory // Search for disc images in the object base directory
for result in fs::read_dir(&base)? { for result in fs::read_dir(&base).with_context(|| format!("Reading directory {}", base))? {
let entry = result?; let entry = result.with_context(|| format!("Reading entry in directory {}", base))?;
// Use fs::metadata to follow symlinks let Ok(path) = check_path_buf(entry.path()) else {
if fs::metadata(entry.path())?.file_type().is_file() { log::warn!("Path is not valid UTF-8: {:?}", entry.path());
let path = check_path_buf(entry.path())?; continue;
};
let file_type =
entry.file_type().with_context(|| format!("Getting file type for {}", path))?;
let is_file = if file_type.is_symlink() {
// Also traverse symlinks to files
fs::metadata(&path)
.with_context(|| format!("Getting metadata for {}", path))?
.is_file()
} else {
file_type.is_file()
};
if is_file {
let mut file = open_file(&path, false)?; let mut file = open_file(&path, false)?;
let format = nodtool::nod::Disc::detect(file.as_mut())?; let format = nodtool::nod::Disc::detect(file.as_mut())
.with_context(|| format!("Detecting file type for {}", path))?;
if let Some(format) = format { if let Some(format) = format {
file.rewind()?; file.rewind()?;
let fs = open_fs(file, ArchiveKind::Disc(format))?; let fs = open_fs(file, ArchiveKind::Disc(format))?;