alemi/postwoman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: don't inherit fallbacks from parents

Browse source 
just weird
This commit is contained in:
əlemi 2024-10-30 01:42:41 +01:00
parent d7dff98c8a
commit 956297b87f
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main.rs
View file

@ -72,7 +72,7 @@ fn main() {
let mut collections = IndexMap::new(); let mut collections = IndexMap::new();
if !load_collections(&mut collections, args.collection.clone(), &toml::Table::default()) { if !load_collections(&mut collections, args.collection.clone()) {
return; return;
} }
@ -212,7 +212,7 @@ async fn run_collection_endpoints(
} }
} }
fn load_collections(store: &mut IndexMap<String, PostWomanCollection>, mut path: std::path::PathBuf, parent_env: &toml::Table) -> bool { fn load_collections(store: &mut IndexMap<String, PostWomanCollection>, mut path: std::path::PathBuf) -> bool {
let collection_raw = match std::fs::read_to_string(&path) { let collection_raw = match std::fs::read_to_string(&path) {
Ok(x) => x, Ok(x) => x,
Err(e) => { Err(e) => {
@ -221,7 +221,7 @@ fn load_collections(store: &mut IndexMap<String, PostWomanCollection>, mut path:
}, },
}; };
let mut collection: PostWomanCollection = match toml::from_str(&collection_raw) { let collection: PostWomanCollection = match toml::from_str(&collection_raw) {
Ok(x) => x, Ok(x) => x,
Err(e) => { Err(e) => {
eprintln!("! error parsing collection {path:?}: {e}"); eprintln!("! error parsing collection {path:?}: {e}");
@ -229,8 +229,6 @@ fn load_collections(store: &mut IndexMap<String, PostWomanCollection>, mut path:
}, },
}; };
collection.env.extend(parent_env.iter().map(|(k, v)| (k.clone(), v.clone())));
let name = path.to_string_lossy().replace(".toml", ""); let name = path.to_string_lossy().replace(".toml", "");
let mut to_include = Vec::new(); let mut to_include = Vec::new();
@ -242,11 +240,10 @@ fn load_collections(store: &mut IndexMap<String, PostWomanCollection>, mut path:
to_include.push(base); to_include.push(base);
} }
let parent_env = collection.env.clone();
store.insert(name, collection); store.insert(name, collection);
for base in to_include { for base in to_include {
if !load_collections(store, base, &parent_env) { if !load_collections(store, base) {
return false; return false;
} }
} }