Add more public functions

Mainly just added a function that collects all attributes in a nix configuration and outputs them as a hashmap

Cargo.toml

@@ -1,8 +1,8 @@
 [package]
 name = "nix-editor"
-version = "0.2.8"
+version = "0.2.9"
 edition = "2021"
-license = "GPL-3.0-or-later"
+license = "MIT"
 description = "Some functions to modify NixOS configuration files"
 repository = "https://github.com/vlinkz/nix-editor/"
 readme = "README.md"
@@ -14,6 +14,7 @@ include = [
 ]
 
 [dependencies]
-clap =  { version = "3.1.8", features = ["derive"] }
+clap =  { version = "3.1.18", features = ["derive"] }
 rnix = "0.10.1"
-owo-colors = "3.3.0"
+owo-colors = "3.4.0"
+failure = { version = "0.1.8", features = ["derive"] }

src/parse.rs

@@ -2,6 +2,8 @@ use std::collections::HashMap;
 
 use rnix::{self, SyntaxKind, SyntaxNode};
 
+use crate::read::ReadError;
+
 enum AttrTypes {
     String,
     Int,
@@ -43,7 +45,20 @@ pub fn findattr(configbase: &SyntaxNode, name: &str) -> Option<SyntaxNode> {
     return None;
 }
 
-pub fn collectattrs(configbase: &SyntaxNode, map: &mut HashMap<String, SyntaxNode>) /*-> HashMap<String, String>*/
+pub fn get_collection(f: String) -> Result<HashMap<String, String>, ReadError> {
+    let mut map = HashMap::new();
+    let ast = rnix::parse(&f);
+    let configbase = match getcfgbase(&ast.node()) {
+        Some(x) => x,
+        None => {
+            return Err(ReadError::ParseError);
+        }
+    };
+    collectattrs(&configbase, &mut map);
+    Ok(map)
+}
+
+pub fn collectattrs(configbase: &SyntaxNode, map: &mut HashMap<String, String>) /*-> HashMap<String, String>*/
 {
     for child in configbase.children() {
         if child.kind() == SyntaxKind::NODE_KEY_VALUE {
@@ -58,7 +73,7 @@ pub fn collectattrs(configbase: &SyntaxNode, map: &mut HashMap<String, SyntaxNod
                         map.insert(format!("{}.{}", nodekey.to_string(), nk),v.clone());
                     }
                 } else {
-                    map.insert(nodekey.to_string(), value.clone());
+                    map.insert(nodekey.to_string(), value.to_string());
                 }
             }
         }
@@ -72,7 +87,7 @@ pub fn getkey(node: &SyntaxNode) -> Vec<String> {
             key.push(child.text().to_string());
         }
     }
-    return key;
+    key
 }
 
 pub fn getcfgbase(node: &SyntaxNode) -> Option<SyntaxNode> {
@@ -94,5 +109,5 @@ pub fn getcfgbase(node: &SyntaxNode) -> Option<SyntaxNode> {
             None => {}
         }
     }
-    return None;
+    None
 }

src/read.rs

@@ -1,8 +1,14 @@
 use crate::parse::{findattr, getcfgbase};
+use failure::Fail;
 use rnix::{SyntaxKind, SyntaxNode};
+
+#[derive(Fail, Debug)]
 pub enum ReadError {
+    #[fail(display = "Read Error: Error while parsing.")]
     ParseError,
+    #[fail(display = "Read Error: No attributes.")]
     NoAttr,
+    #[fail(display = "Read Error: Error with array.")]
     ArrayError,
 }