konevsa/typst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: Allow reading every path not of type dir (#414)

Browse Source
This commit is contained in:
Johannes Wolf 2023-03-30 00:36:22 +02:00 committed by GitHub
parent dffaef0832
commit 4d9c6b28d0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cli/src/main.rs
View File

@ -569,10 +569,10 @@ impl PathHash {
/// Read a file. /// Read a file.
fn read(path: &Path) -> FileResult<Vec<u8>> { fn read(path: &Path) -> FileResult<Vec<u8>> {
let f = |e| FileError::from_io(e, path); let f = |e| FileError::from_io(e, path);
if fs::metadata(&path).map_err(f)?.is_file() { if fs::metadata(&path).map_err(f)?.is_dir() {
fs::read(&path).map_err(f)
} else {
Err(FileError::IsDirectory) Err(FileError::IsDirectory)
} else {
fs::read(&path).map_err(f)
} }
} }

6
tests/src/tests.rs
View File

@ -324,10 +324,10 @@ fn read(path: &Path) -> FileResult<Vec<u8>> {
.unwrap_or_else(|_| path.into()); .unwrap_or_else(|_| path.into());
let f = |e| FileError::from_io(e, &suffix); let f = |e| FileError::from_io(e, &suffix);
if fs::metadata(&path).map_err(f)?.is_file() { if fs::metadata(&path).map_err(f)?.is_dir() {
fs::read(&path).map_err(f)
} else {
Err(FileError::IsDirectory) Err(FileError::IsDirectory)
} else {
fs::read(&path).map_err(f)
} }
} }