pcvolkmer/osc-variant
1
0
Fork 0
mirror of https://github.com/pcvolkmer/osc-variant.git synced 2025-07-06 02:12:55 +00:00
Code Issues Activity

chore: code cleanup

Browse Source
This commit is contained in:
Paul-Christian Volkmer
2024-12-08 12:19:08 +01:00
parent b4e1113f3d
commit efa2dc68d6
10 changed files with 80 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/model/data_catalogue.rs
View File

@ -63,9 +63,10 @@ impl Listable for DataCatalogue {
fn to_listed_string(&self) -> String {
format!(
"Datenkatalog ({}) '{}' in Revision '{}'",
match self.is_system_library_content() {
true => style("S").yellow(),
_ => style("u"),
if self.is_system_library_content() {
style("S").yellow()
} else {
style("u")
},
style(&self.name).yellow(),
style(&self.revision).yellow()
@ -129,11 +130,9 @@ impl Requires for DataCatalogue {
self.get_required_entries(all)
.iter()
.map(|entry| match entry {
Requirement::PropertyCatalogue(_) => {
Some(format!(" - {}\n", entry))
}
Requirement::ExternalPropertyCatalogue(_) => {
Some(format!(" - {}\n", entry))
Requirement::PropertyCatalogue(_)
| Requirement::ExternalPropertyCatalogue(_) => {
Some(format!(" - {entry}\n"))
}
_ => None,
})
@ -231,7 +230,7 @@ impl Sortable for Entry {
{
if let Some(ref mut use_) = self.use_ {
use_.program_module
.sort_unstable_by_key(|item| item.sorting_key())
.sort_unstable_by_key(|item| item.sorting_key());
}
self
}

11
src/model/form.rs
View File

@ -210,7 +210,7 @@ impl<Type: 'static> FormEntryContainer for Form<Type> {
.form_references
.iter()
.for_each(|form_reference| {
apply_profile_to_form_entry(entry, form_reference)
apply_profile_to_form_entry(entry, form_reference);
});
// Hide form field using filter set to "false" if requested and change default value
@ -226,7 +226,7 @@ impl<Type: 'static> FormEntryContainer for Form<Type> {
column: menu_category.column.clone(),
});
}
})
});
}
});
}
@ -241,9 +241,10 @@ impl<Type: 'static> Listable for Form<Type> {
} else {
"Unterformular"
},
match self.is_system_library_content() {
true => style("S").yellow(),
_ => style("u"),
if self.is_system_library_content() {
style("S").yellow()
} else {
style("u")
},
style(&self.name).yellow(),
style(&self.revision).yellow()

10
src/model/mod.rs
View File

@ -323,7 +323,7 @@ where
entry.update_scripts_code(scripts_code.clone());
}
if form_reference.remove_filter {
entry.remove_filter()
entry.remove_filter();
}
}
}
@ -334,16 +334,16 @@ where
{
if entry.get_name() == form_field.name {
if form_field.hide {
entry.hide()
entry.hide();
}
if let Some(new_default_value) = &form_field.default_value {
entry.update_default_value(new_default_value.to_string())
entry.update_default_value(new_default_value.to_string());
}
if let Some(scripts_code) = &form_field.escaped_scripts_code() {
entry.update_scripts_code(scripts_code.clone());
}
if form_field.remove_filter {
entry.remove_filter()
entry.remove_filter();
}
}
}
@ -372,7 +372,7 @@ pub trait Comparable: Debug {
fn get_revision(&self) -> u16;
fn get_hash(&self) -> String {
let mut h = DefaultHasher::new();
format!("{:?}", self).hash(&mut h);
format!("{self:?}").hash(&mut h);
h.finish().to_string()
}
fn compare_by_requirement(_: &Self, _: &Self) -> Ordering

12
src/model/onkostar_editor.rs
View File

@ -381,7 +381,7 @@ impl OnkostarEditor {
);
has_diff = true;
} else if strict {
println!("{}: {}", entry_a.get_name(), style("Identisch").green())
println!("{}: {}", entry_a.get_name(), style("Identisch").green());
}
}
}
@ -390,7 +390,7 @@ impl OnkostarEditor {
});
if !has_diff {
println!("Keine Unterschiede")
println!("Keine Unterschiede");
}
}
}
@ -464,12 +464,12 @@ impl Checkable for OnkostarEditor {
.for_each(|entry| match entry {
Requirement::DataFormReference(item) => {
if !requirement_checked_forms.contains(&item.get_name()) {
result.push(requirement_error(form, *item, "Formular"))
result.push(requirement_error(form, *item, "Formular"));
}
}
Requirement::UnterformularReference(item) => {
if !requirement_checked_forms.contains(&item.get_name()) {
result.push(requirement_error(form, *item, "Unterformular"))
result.push(requirement_error(form, *item, "Unterformular"));
}
}
_ => {}
@ -483,12 +483,12 @@ impl Checkable for OnkostarEditor {
.for_each(|entry| match entry {
Requirement::DataFormReference(item) => {
if !requirement_checked_forms.contains(&item.get_name()) {
result.push(requirement_error(form, *item, "Formular"))
result.push(requirement_error(form, *item, "Formular"));
}
}
Requirement::UnterformularReference(item) => {
if !requirement_checked_forms.contains(&item.get_name()) {
result.push(requirement_error(form, *item, "Unterformular"))
result.push(requirement_error(form, *item, "Unterformular"));
}
}
_ => {}

6
src/model/other.rs
View File

@ -528,7 +528,7 @@ impl FormEntry for Entry {
}
fn update_default_value(&mut self, value: String) {
self.default_value = value
self.default_value = value;
}
fn hide(&mut self) {
@ -537,7 +537,7 @@ impl FormEntry for Entry {
valid: true,
ref_entries: Some(RefEntries { ref_entry: None }),
});
self.speichern = "0".into()
self.speichern = "0".into();
}
fn remove_filter(&mut self) {
@ -557,7 +557,7 @@ impl Sortable for Entry {
if let Some(ref mut filter) = self.filter {
if let Some(ref mut ref_entries) = filter.ref_entries {
if let Some(ref mut ref_entry) = ref_entries.ref_entry {
ref_entry.sort_unstable()
ref_entry.sort_unstable();
}
}
}

16
src/model/requirements.rs
View File

@ -73,21 +73,21 @@ impl Display for Requirement<'_> {
Requirement::DataFormSubform(item) => item.to_listed_string(),
Requirement::UnterformularSubform(item) => item.to_listed_string(),
Requirement::ExternalPropertyCatalogue(name) => {
format!("Merkmalskatalog (-) '{}' - hier nicht enthalten", name)
format!("Merkmalskatalog (-) '{name}' - hier nicht enthalten")
}
Requirement::ExternalDataCatalogue(name) => {
format!("Datenkatalog (-) '{}' - hier nicht enthalten", name)
format!("Datenkatalog (-) '{name}' - hier nicht enthalten")
}
Requirement::ExternalDataFormReference(name)
| Requirement::ExternalDataFormSubform(name) => {
format!("Formular (-) '{}' - hier nicht enthalten", name)
format!("Formular (-) '{name}' - hier nicht enthalten")
}
Requirement::ExternalUnterformularReference(name)
| Requirement::ExternalUnterformularSubform(name) => {
format!("Unterformular (-) '{}' - hier nicht enthalten", name)
format!("Unterformular (-) '{name}' - hier nicht enthalten")
}
};
write!(f, "{}", str)
write!(f, "{str}")
}
}
@ -134,19 +134,19 @@ where
}
}
Requirement::ExternalDataCatalogue(_) => {
Some(format!(" + {}\n", entry))
Some(format!(" + {entry}\n"))
}
Requirement::DataFormReference(_)
| Requirement::ExternalDataFormReference(_)
| Requirement::UnterformularReference(_)
| Requirement::ExternalUnterformularReference(_) => {
Some(format!(" > {}\n", entry))
Some(format!(" > {entry}\n"))
}
Requirement::DataFormSubform(_)
| Requirement::ExternalDataFormSubform(_)
| Requirement::UnterformularSubform(_)
| Requirement::ExternalUnterformularSubform(_) => {
Some(format!(" * {}\n", entry))
Some(format!(" * {entry}\n"))
}
_ => None,
})