refactoring - reduced code size by about a third

1 files changed, 40 insertions, 0 deletions

diff --git a/src/model/vcard.rs b/src/model/vcard.rs
new file mode 100644
index 0000000..ee7e28e
--- /dev/null
+++ b/src/model/vcard.rs
@@ -0,0 +1,40 @@
+use crate::model::address::Address;
+use crate::model::dates::Dates;
+use crate::model::name::Name;
+use crate::model::organizational::Organizational;
+use crate::model::telephone::Telephone;
+
+/// Type that represents the data structure of a vcard.
+#[derive(Clone, Debug)]
+pub struct VCardData {
+    pub names: Vec<Name>,
+    pub addresses: Vec<Address>,
+    pub telephones: Vec<Telephone>,
+    pub datess: Vec<Dates>,
+    pub organizationals: Vec<Organizational>,
+}
+
+macro_rules! make_vec_adder_fn {
+    ( fn $fnname:ident $property:ident => $($arg_name:ident : $arg_type:ty),* ) => {
+        pub fn $fnname(&mut self, $( $arg_name : $arg_type ),*) {
+            $(self.$property.push($arg_name);)*
+        }
+    };
+}
+
+impl VCardData {
+    pub fn new() -> Self {
+        Self {
+            names: Vec::new(),
+            addresses: Vec::new(),
+            telephones: Vec::new(),
+            datess: Vec::new(),
+            organizationals: Vec::new(),
+        }
+    }
+    make_vec_adder_fn!( fn add_name names => name: Name );
+    make_vec_adder_fn!( fn add_address addresses => address: Address );
+    make_vec_adder_fn!( fn add_telephone telephones => telephone: Telephone );
+    make_vec_adder_fn!( fn add_dates datess => dates: Dates );
+    make_vec_adder_fn!( fn add_organizational organizationals => organizational: Organizational );
+}