reached usable state with procedural macro

.gitignore

@@ -19,3 +19,5 @@ Cargo.lock
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
+
+/*.txt

config-parser/config-parser-common/src/common.rs

@@ -1,51 +1,39 @@
 #![allow(dead_code)]
 
-use proc_macro2::TokenStream;
+pub fn parse_config_file(input: &String) -> std::io::Result<std::collections::HashMap<String, String>> {
-use quote::quote;
+    let mut config = std::collections::HashMap::<String, String>::new();
+    let lines = input.lines();
 
-use syn::{Attribute, Error, Field, Meta, Path, punctuated::Punctuated, token::Comma};
+    for line in lines {
+        let line = line.trim();
+        // ignore empty lines
+        if line.is_empty() { continue; }
 
-pub fn gen_config_load_function(fields: &Punctuated<Field, Comma>, config_map_name: &syn::Ident) -> Result<TokenStream, Error> {
+        if line.starts_with("[") {
-    let mut assignments : TokenStream = TokenStream::new();
+            // check for table
-    'field_loop: for field in fields.iter() {
+            if !line.ends_with("]") {
-        let attr = &field.attrs;
+                // TODO: implement error handling
-        let name = match &field.ident {
+            } else if line.contains(' ') {
-            Some(value) => value,
+                // TODO: implement error handling
-            // skip anonymous fields
-            None => continue 'field_loop,
-        };
-        let name_string: String = name.to_string();
-        let ty = &field.ty;
-        for attribute in attr {
-            if let Attribute{ meta: Meta::Path( Path{segments: attr_name, ..} ), .. } = attribute {
-                match attr_name.first() {
-                    Some(value) => if value.ident == "nested_config" {
-                        assignments.extend(quote! {
-                            self.#name.parse_from_map(&mut #config_map_name);
-                        });
-                        continue 'field_loop;
-                    } else if value.ident == "no_config" {
-                        continue 'field_loop;
-                    },
-                    None => (),
             }
+            //let tokens = line.split('.');
+            // TODO: implement hirarchical map
+        } else {
+            // check for config
+            let mut tokens: Vec<&str> = line.split('=').map(|entry| entry.trim()).collect();
+            tokens.retain(|entry| !entry.is_empty());
+            // check for valid input
+            if tokens.len() != 2 {
+                // println!("error in line'", line);
+                continue;
             }
+            //// clean up value: remove quotes.. TODO:
+            //let mut options: Vec<&str> = tokens[1].split(['\'', '\"']).collect::<Vec<&str>>().join(',');
+
+            config.insert(tokens[0].to_string(), tokens[1].to_string());
         }
-        assignments.extend(quote! {
+
-            self.#name = match #config_map_name.get(#name_string) {
-                Some(value) => match value.parse::<#ty>() {
-                    Ok(parsed) => {
-                        _ = #config_map_name.remove(#name_string);
-                        parsed
-                    },
-                    Err(_) => {
-                        self.#name.clone()
-                    },
-                },
-                None => self.#name.clone(),
-            };
-        });
     }
-    Ok(assignments.into())
+    Ok(config)
 }
 

config-parser/config-parser-common/src/format.rs

@@ -189,7 +189,7 @@ pub fn make_padding_string(len: usize) -> String {
 /// input format is a quoted string (either double or single)
 /// the style can be a combination of **one** color and
 /// one or more style options (bold, italic, underlined, strikethrough)
-pub fn parse_style(arg: String) -> Result<String> {
+pub fn parse_style(arg: &String) -> Result<String> {
     let mut colors: Vec<String> = Vec::<String>::new();
     let mut styles: Vec<String> = Vec::<String>::new();
 

config-parser/config-parser-common/src/lib.rs

@@ -1,3 +1,5 @@
 
 pub mod common;
 pub mod format;
+
+pub use common::parse_config_file;

config-parser/config-parser-macro/src/generator_functions.rs

@@ -0,0 +1,128 @@
+use proc_macro2::{Ident, TokenStream};
+use syn::{Attribute, Field, Meta, Path, punctuated::Punctuated, token::Comma};
+use quote::quote;
+
+pub fn gen_parse_from_string(config_name: &Ident, assignments: &TokenStream) -> TokenStream {
+    quote! {
+        /// tries to parse config from a string
+        /// if **convert_styles** == true, the settings marked with
+        /// `style_config` are converted to ansi escape sequences to
+        /// style terminal ouput
+        pub fn parse_from_string(&mut self, input: &String) -> std::io::Result<()> {
+            let mut #config_name : std::collections::HashMap<String, String> = parse_config_file(input)?;
+
+            #assignments
+
+            if !#config_name.is_empty() {
+                let leftovers = #config_name.keys().cloned().collect::<Vec<String>>();
+                return Err(std::io::Error::other(format!("the following settings were not recognised: {:#?}", leftovers)));
+            }
+            Ok(())
+        }
+    }
+}
+
+pub fn gen_parse_from_map(config_name: &Ident, assignments: &TokenStream) -> TokenStream {
+    quote! {
+        /// **do not call**
+        /// this function needs to be public for nested configs but is not intended
+        /// to be called by the user
+        pub fn parse_from_map(&mut self, input: &mut std::collections::HashMap<String, String>) -> std::io::Result<()> {
+            let mut #config_name = input;
+
+            #assignments
+
+            Ok(())
+        }
+    }
+}
+
+pub fn gen_to_ansi_sequences(fields: &Punctuated<Field, Comma>) -> TokenStream {
+    let mut conversions: TokenStream = TokenStream::new();
+    'fields: for field in fields.iter() {
+        let attr = &field.attrs;
+        let name = match &field.ident {
+            Some(value) => value,
+            // skip anonymous fields
+            None => continue 'fields,
+        };
+        for attribute in attr {
+            if let Attribute{ meta: Meta::Path( Path{segments: attr_name, ..} ), .. } = attribute {
+                match attr_name.first() {
+                    Some(value) => if value.ident == "style_config" {
+                        conversions.extend(quote! {
+                            self.#name = match config_parser::parse_style(&self.#name) {
+                                Ok(value) => value,
+                                Err(_) => return Err(std::io::Error::other(format!("failed to convert '{}' to ansi escape sequence", self.#name))),
+                            };
+                        });
+                    } else if value.ident == "nested_config" {
+                        conversions.extend(quote! {
+                            self.#name.to_ansi_sequences()?;
+                        });
+                    },
+                    None => (),
+                }
+            }
+        }
+    };
+    quote!{
+        fn to_ansi_sequences(&mut self) -> std::io::Result<()> {
+            #conversions
+            Ok(())
+        }
+    }
+}
+
+pub fn gen_to_string(name: &Ident, fields: &Punctuated<Field, Comma>) -> TokenStream {
+    quote! {
+        /// prints configuration to `String`
+        //pub fn to_string() -> String {
+        //    let mut default = "# default configuration file for `navigate`\n".to_string();
+        //}
+    }
+}
+
+pub fn gen_config_assignments(fields: &Punctuated<Field, Comma>, config_map_name: &syn::Ident) -> TokenStream {
+    let mut assignments : TokenStream = TokenStream::new();
+    'fields: for field in fields.iter() {
+        let attr = &field.attrs;
+        let name = match &field.ident {
+            Some(value) => value,
+            // skip anonymous fields
+            None => continue 'fields,
+        };
+        let name_string: String = name.to_string();
+        let ty = &field.ty;
+        for attribute in attr {
+            if let Attribute{ meta: Meta::Path( Path{segments: attr_name, ..} ), .. } = attribute {
+                match attr_name.first() {
+                    Some(value) => if value.ident == "nested_config" {
+                        assignments.extend(quote! {
+                            self.#name.parse_from_map(&mut #config_map_name);
+                        });
+                        continue 'fields;
+                    } else if value.ident == "no_config" {
+                        continue 'fields;
+                    },
+                    None => (),
+                }
+            }
+        }
+        assignments.extend(quote! {
+            self.#name = match #config_map_name.get(#name_string) {
+                Some(value) => match value.parse::<#ty>() {
+                    Ok(parsed) => {
+                        parsed
+                    },
+                    Err(_) => {
+                        self.#name.clone()
+                    },
+                },
+                None => self.#name.clone(),
+            };
+        });
+    }
+    assignments
+}
+

config-parser/config-parser-macro/src/lib.rs

@@ -1,14 +1,17 @@
-use config_parser_common::common::gen_config_load_function;
+mod generator_functions;
+
 use proc_macro2::TokenStream;
 use syn::{parse_macro_input, DeriveInput};
 use quote::quote;
 
+use generator_functions::*;
+
 /// **for structs only**
 /// - implements `parse_config(&mut self, input: &String) -> Result<()>`
 /// which parses a string and fills the fills recognised values into the struct
 /// - implements `write_default_config() -> Result<String>`
 /// which write a default configuration, in case the documentation is lacking
-#[proc_macro_derive(ConfigParser, attributes(color_config, nested_config, no_config))]
+#[proc_macro_derive(ConfigParser, attributes(nested_config, no_config, style_config))]
 pub fn derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     let ast = parse_macro_input!(input as DeriveInput);
     let name = &ast.ident;
@@ -18,83 +21,21 @@ pub fn derive(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
     } else {
         panic!("the macro `ConfigParser` applies only to structs!");
     };
-    let assignments = match gen_config_load_function(fields, &config_name) {
+    let assignments: TokenStream = gen_config_assignments(fields, &config_name);
-        Ok(value) => value,
+    let func_parse_string: TokenStream = gen_parse_from_string(&config_name, &assignments);
-        Err(_) => panic!("loading config failed"),
+    let func_parse_map: TokenStream = gen_parse_from_map(&config_name, &assignments);
-    };
+    let func_to_ansi_sequences: TokenStream = gen_to_ansi_sequences(fields);
+    //let func_to_string = gen_to_string(&name, &fields);
 
-    if name.to_string() == "Settings" {
+    quote! {
-        let string = format!("{:#?}", ast);
-        _ = std::fs::write("test.txt", string);
-    }
-
-    let expanded_stream: TokenStream = quote! {
         impl #name {
-            /// tries to parse config from a string
+            #func_parse_string
-            pub fn parse_from_string(&mut self, input: &String) -> std::io::Result<()> {
+            #func_parse_map
-                let mut #config_name : std::collections::HashMap<String, String> = Self::parse_config_file(input)?;
+            #func_to_ansi_sequences
-
+            //#func_to_string
-                #assignments
-
-                if !#config_name.is_empty() {
-                    let leftovers = #config_name.keys().cloned().collect::<Vec<String>>();
-                    return Err(std::io::Error::other(format!("the following settings were not recognised: {:#?}", leftovers)));
-                }
-                Ok(())
-            }
-
-            /// **do not call**
-            /// this function needs to be public for nested configs but is not intended
-            /// to be called by the user
-            pub fn parse_from_map(&mut self, input: &mut std::collections::HashMap<String, String>) -> std::io::Result<()> {
-                let mut #config_name = input;
-
-                #assignments
-
-                Ok(())
-            }
-
-            fn parse_config_file(input: &String) -> std::io::Result<std::collections::HashMap<String, String>> {
-                let mut config = std::collections::HashMap::<String, String>::new();
-                let lines = input.lines();
-
-                for line in lines {
-                    let mut line = line.trim();
-                    // ignore empty lines
-                    if line.is_empty() { continue; }
-
-                    if line.starts_with("[") {
-                        // check for table
-                        if !line.ends_with("]") {
-                            // TODO: implement error handling
-                        } else if line.contains(' ') {
-                            // TODO: implement error handling
-                        }
-                        //let tokens = line.split('.');
-                        // TODO: implement hirarchical map
-                    } else {
-                        // check for config
-                        let mut tokens: Vec<&str> = line.split('=').map(|entry| entry.trim()).collect();
-                        tokens.retain(|entry| !entry.is_empty());
-                        if tokens.len() != 2 {
-                            // println!("error in line'", line);
-                            continue;
-                        }
-                        config.insert(tokens[0].to_string(), tokens[1].to_string());
-                    }
-
-                }
-                Ok(config)
-            }
-
-            // TODO: implement
-            pub fn write_default_config(&self) -> Result<()> {
-                Ok(())
-            }
 
             // TODO: implement function to parse style settings
         }
-    }.into();
+    }.into()
-    expanded_stream.into()
 }
 

config-parser/src/lib.rs

@@ -1,3 +1,3 @@
 
-pub use config_parser_common::format;
+pub use config_parser_common::{common::*, format::*};
 pub use config_parser_macro::ConfigParser;

src/bookmarks.rs

@@ -9,9 +9,8 @@ use std::io::{Error, Result};
 use std::path::PathBuf;
 use std::str::FromStr;
 
-use config_parser::format::make_padding_string;
+use super::config::*;
-
+use config_parser::{make_padding_string, apply_format};
-use super::{apply_format, config::*};
 
 #[derive(Debug, Clone)]
 pub struct Bookmarks {
@@ -132,12 +131,12 @@ impl Bookmarks {
             };
             for (mark, path) in &self.bookmarks {
                 let padding = make_padding_string(max_name_len - mark.len());
-                let name = apply_format(mark, &config.styles.bookmarks_name);
+                let name = apply_format(mark, &config.styles.bookmarks_name_style);
                 let separator = apply_format(
                     &config.format.bookmarks_separator,
-                    &config.styles.bookmarks_seperator,
+                    &config.styles.bookmarks_seperator_style,
                 );
-                let path = apply_format(path.to_str().unwrap(), &config.styles.bookmarks_path);
+                let path = apply_format(path.to_str().unwrap(), &config.styles.bookmarks_path_style);
                 if config.format.align_separators {
                     buffer.push_str(&format!("{}{}{}{}\n", name, padding, separator, path));
                 } else {

src/config.rs

@@ -7,8 +7,9 @@ use dirs::config_dir;
 use std::fs;
 use std::io::{Error, Result};
 use std::path::PathBuf;
-use config_parser::ConfigParser;
+use config_parser::*;
-use config_parser::format::*;
+
+use crate::debug::debug_print;
 
 #[derive(Debug, Clone)]
 pub struct Config {
@@ -42,25 +43,25 @@ pub struct FormatSettings {
 
 #[derive(Debug, Clone, Default, ConfigParser)]
 pub struct StyleSettings {
-    #[color_config]
+    #[style_config]
-    pub stack_number: String,
+    pub stack_number_style: String,
-    #[color_config]
+    #[style_config]
-    pub stack_separator: String,
+    pub stack_separator_style: String,
-    #[color_config]
+    #[style_config]
-    pub stack_path: String,
+    pub stack_path_style: String,
-    #[color_config]
+    #[style_config]
-    pub bookmarks_name: String,
+    pub bookmarks_name_style: String,
-    #[color_config]
+    #[style_config]
-    pub bookmarks_seperator: String,
+    pub bookmarks_seperator_style: String,
-    #[color_config]
+    #[style_config]
-    pub bookmarks_path: String,
+    pub bookmarks_path_style: String,
 }
 
 impl Config {
     const CONFIG_FILE_NAME: &str = "navigate.conf";
 
     /// generates and populates a new instance of Config
-    pub fn new() -> Result<Self> {
+    pub fn new(styles_as_ansi_sequences: bool) -> Result<Self> {
         let mut config = Config {
             conf_file: PathBuf::new(),
             settings: Settings {
@@ -75,12 +76,12 @@ impl Config {
                     align_separators: false,
                 },
                 styles: StyleSettings {
-                    stack_number: String::new(),
+                    stack_number_style: String::new(),
-                    stack_separator: String::new(),
+                    stack_separator_style: String::new(),
-                    stack_path: String::new(),
+                    stack_path_style: String::new(),
-                    bookmarks_name: String::new(),
+                    bookmarks_name_style: String::new(),
-                    bookmarks_seperator: String::new(),
+                    bookmarks_seperator_style: String::new(),
-                    bookmarks_path: String::new(),
+                    bookmarks_path_style: String::new(),
                 },
             },
         };
@@ -113,6 +114,10 @@ impl Config {
         //config.set_default_settings()?;
         //config.parse_color_settings()?;
 
+        if styles_as_ansi_sequences {
+            config.settings.to_ansi_sequences()?;
+        }
+
         Ok(config)
     }
 
@@ -140,40 +145,25 @@ impl Config {
             self.settings.format.bookmarks_separator = default_separator.clone();
         }
 
-        if self.settings.styles.stack_number.is_empty() {
+        if self.settings.styles.stack_number_style.is_empty() {
-            self.settings.styles.stack_number = default_number_color.clone();
+            self.settings.styles.stack_number_style = default_number_color.clone();
         }
-        if self.settings.styles.stack_separator.is_empty() {
+        if self.settings.styles.stack_separator_style.is_empty() {
-            self.settings.styles.stack_separator = default_separator_color.clone();
+            self.settings.styles.stack_separator_style = default_separator_color.clone();
         }
-        if self.settings.styles.stack_path.is_empty() {
+        if self.settings.styles.stack_path_style.is_empty() {
-            self.settings.styles.stack_path = default_path_color.clone();
+            self.settings.styles.stack_path_style = default_path_color.clone();
         }
-        if self.settings.styles.bookmarks_name.is_empty() {
+        if self.settings.styles.bookmarks_name_style.is_empty() {
-            self.settings.styles.bookmarks_name = default_number_color.clone();
+            self.settings.styles.bookmarks_name_style = default_number_color.clone();
         }
-        if self.settings.styles.bookmarks_seperator.is_empty() {
+        if self.settings.styles.bookmarks_seperator_style.is_empty() {
-            self.settings.styles.bookmarks_seperator = default_separator_color.clone();
+            self.settings.styles.bookmarks_seperator_style = default_separator_color.clone();
         }
-        if self.settings.styles.bookmarks_path.is_empty() {
+        if self.settings.styles.bookmarks_path_style.is_empty() {
-            self.settings.styles.bookmarks_path = default_path_color.clone();
+            self.settings.styles.bookmarks_path_style = default_path_color.clone();
         }
 
         Ok(())
     }
-
-    /// convert color settings to ansi escape sequences
-    pub fn parse_color_settings(&mut self) -> Result<()> {
-        self.settings.styles.stack_number = parse_style(self.settings.styles.stack_number.clone())?;
-        self.settings.styles.stack_separator =
-            parse_style(self.settings.styles.stack_separator.clone())?;
-        self.settings.styles.stack_path = parse_style(self.settings.styles.stack_path.clone())?;
-        self.settings.styles.bookmarks_name =
-            parse_style(self.settings.styles.bookmarks_name.clone())?;
-        self.settings.styles.bookmarks_seperator =
-            parse_style(self.settings.styles.bookmarks_seperator.clone())?;
-        self.settings.styles.bookmarks_path =
-            parse_style(self.settings.styles.bookmarks_path.clone())?;
-        Ok(())
-    }
 }

src/main.rs

@@ -8,7 +8,7 @@ use arguments::*;
 use clap::Parser;
 use config::*;
 use bookmarks::*;
-use config_parser::format::*;
+use config_parser::*;
 use stack::Stack;
 use std::env::{current_dir, var};
 use std::io::{Error, Result};
@@ -25,7 +25,7 @@ fn main() -> Result<()> {
             return Ok(());
         }
     };
-    let config = match Config::new() {
+    let config = match Config::new(true) {
         Ok(value) => value,
         Err(error) => {
             print!("echo '{}{}{}' && false", style_error, error, RESET_SEQ);

src/stack.rs

@@ -41,12 +41,12 @@ impl Stack {
             let max_num_len = self.stack.len().to_string().len();
             for (n, item) in self.stack.iter().rev().enumerate() {
                 let padding = make_padding_string(max_num_len - n.to_string().len());
-                let number = apply_format(&n.to_string(), &config.styles.stack_number);
+                let number = apply_format(&n.to_string(), &config.styles.stack_number_style);
                 let separator = apply_format(
                     &config.format.stack_separator,
-                    &config.styles.stack_separator,
+                    &config.styles.stack_separator_style,
                 );
-                let path = apply_format(item.to_str().unwrap(), &config.styles.stack_path);
+                let path = apply_format(item.to_str().unwrap(), &config.styles.stack_path_style);
                 if config.format.align_separators {
                     buffer.push_str(&format!("{}{}{}{}\n", number, padding, separator, path));
                 } else {