jeang3nie/hpk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Skip directories when creating a package from directory; Take an

Browse Source 
optional directory when creating a package from file list;
This commit is contained in:
Nathan Fisher 2023-04-06 10:41:10 -04:00
parent c099790f5a
commit ca9c0d7cdb
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/creator/mod.rs
View File

@ -40,6 +40,7 @@ impl Creator {
.into_iter() .into_iter()
.filter(Result::is_ok) .filter(Result::is_ok)
.map(|x| x.unwrap().path().to_path_buf()) .map(|x| x.unwrap().path().to_path_buf())
.filter(|x| !x.is_dir())
.collect::<Vec<_>>(); .collect::<Vec<_>>();
env::set_current_dir(d)?; env::set_current_dir(d)?;
Ok(Self { Ok(Self {
@ -49,10 +50,15 @@ impl Creator {
}) })
} }
pub fn from_list(list: &[&str], specs: Specs) -> Result<Self, io::Error> { pub fn from_list(list: &[&str], path: Option<&Path>, specs: Specs) -> Result<Self, io::Error> {
let entries = list.iter().map(|x| Path::new(x).to_path_buf()).collect(); let entries = list.iter().map(|x| Path::new(x).to_path_buf()).collect();
let path = if let Some(p) = path {
p.to_path_buf()
} else {
env::current_dir().unwrap_or(Path::new("/").to_path_buf())
};
Ok(Self { Ok(Self {
path: env::current_dir().unwrap_or(Path::new("/").to_path_buf()), path,
entries, entries,
specs, specs,
}) })