system/systeroid
system/systeroid
1
0
Fork 0
mirror of https://github.com/orhun/systeroid synced 2024-07-25 04:14:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(parser): filter out empty file names while checking

Browse source
This commit is contained in:
Orhun Parmaksız 2021-12-18 23:53:59 +03:00
parent 90fb9d504c
commit f0b58bcf21
No known key found for this signature in database
GPG key ID: F83424824B3E4B90
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
systeroid-parser/src/parser.rs
View file

@ -48,13 +48,16 @@ impl<'a> Parser<'a> {
if glob_files.is_empty() { if glob_files.is_empty() {
return Err(Error::EmptyFileListError); return Err(Error::EmptyFileListError);
} }
self.required_files.iter().try_for_each(|file_name| { self.required_files
glob_files .iter()
.iter() .filter(|file_name| !file_name.is_empty())
.find(|file| file.file_name().to_str() == Some(file_name)) .try_for_each(|file_name| {
.map(drop) glob_files
.ok_or_else(|| Error::MissingFileError(file_name.to_string())) .iter()
})?; .find(|file| file.file_name().to_str() == Some(file_name))
.map(drop)
.ok_or_else(|| Error::MissingFileError(file_name.to_string()))
})?;
for file in glob_files { for file in glob_files {
let input = if file.path().extension().and_then(|ext| ext.to_str()) == Some("gz") { let input = if file.path().extension().and_then(|ext| ext.to_str()) == Some("gz") {
reader::read_gzip(file.path())? reader::read_gzip(file.path())?