d.manz/osc-variant
1
0
Fork 0
forked from Plugin-JF-Onkostar/osc-variant
Code Pull Requests Activity

Show required dependencies not included in OSC file

Browse Source
This commit is contained in:
Paul-Christian Volkmer
2023-08-31 16:46:40 +02:00
parent af4ec8898a
commit f507893b4d
4 changed files with 50 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/model/unterformular.rs
View File

@@ -265,9 +265,10 @@ impl Requires for Unterformular {
.iter()
.collect::<HashSet<_>>()
.into_iter()
.map(|entry| all.find_data_catalogue(entry.as_str()))
.filter(Option::is_some)
.map(|entry| Requirement::DataCatalogue(entry.unwrap()))
.map(|entry| match all.find_data_catalogue(entry.as_str()) {
Some(contained) => Requirement::DataCatalogue(contained),
None => Requirement::ExternalDataCatalogue(entry.to_string()),
})
.collect::<Vec<_>>()
}
@@ -283,7 +284,10 @@ impl Requires for Unterformular {
.get_required_entries(all)
.iter()
.map(|inner_entry| match inner_entry {
Requirement::PropertyCatalogue(y) => Some(y.to_listed_string()),
Requirement::PropertyCatalogue(_) => Some(inner_entry.to_string()),
Requirement::ExternalPropertyCatalogue(_) => {
Some(inner_entry.to_string())
}
_ => None,
})
.filter(Option::is_some)
@@ -297,6 +301,9 @@ impl Requires for Unterformular {
Some(format!(" + {}\n{}", x.to_listed_string(), inner))
}
}
Requirement::ExternalDataCatalogue(_) => {
Some(format!(" + {}\n", entry.to_string()))
}
_ => None,
})
.filter(Option::is_some)