From a46c1d6cc58b847b9b140de2c59e1c7a8ba06655 Mon Sep 17 00:00:00 2001
From: davidovski <david@davidovski.xyz>
Date: Mon, 8 Nov 2021 21:33:28 +0000
Subject: added config parsing

---
 example.conf   | 11 +++++++
 notes.txt      |  2 +-
 src/config.py  | 90 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/options.py |  8 +++++-
 src/xi.py      | 20 ++++++-------
 5 files changed, 119 insertions(+), 12 deletions(-)
 create mode 100644 example.conf
 create mode 100644 src/config.py

diff --git a/example.conf b/example.conf
new file mode 100644
index 0000000..b947794
--- /dev/null
+++ b/example.conf
@@ -0,0 +1,11 @@
+# This is the default configuration for xipkg
+
+sources {
+    davidovski      https://xi.davidovski.xyz/repo/
+}
+
+repos [
+    core
+    extra
+]
+
diff --git a/notes.txt b/notes.txt
index 962ba2b..b9002b6 100644
--- a/notes.txt
+++ b/notes.txt
@@ -1,4 +1,4 @@
-/etc/xi/xipkg.conf
+/etc/xipkg.conf
     for xipkg config
 
 in config define repo sources like this:
diff --git a/src/config.py b/src/config.py
new file mode 100644
index 0000000..ed86dc9
--- /dev/null
+++ b/src/config.py
@@ -0,0 +1,90 @@
+"""xipkg config file parser
+
+    Simple Key value, supporting map-style objects and arrays
+
+    ```
+    key      value
+    key2     another value
+
+    # this is a commment
+
+    map {
+        mapkey1 value
+        mapkey2 value
+    }
+
+    array [
+        item1
+        item2
+        item3
+        item4
+    ]
+    ```
+"""
+import sys
+# TODO: add more validation to this
+
+"""Parse a config file from a path into a python dict
+    Args:
+        file_path: (str) the path to the file
+    Returns:
+        (dict) the configuration
+    
+
+"""
+def parse_file(file_path):
+    with open(file_path, "r") as config_file:
+        return _parse_config(config_file)
+
+
+"""Parse a config file's lines, is also used for dictionaries within the config
+    Args:
+        config_file: (file) a file with the readline function
+    Returns:
+        (dict) the configuration that has been parsed
+
+"""
+def _parse_config(config_file):
+    config = {}
+    line = config_file.readline()
+    while line:
+        line = line.strip()
+        if len(line) > 0 and (line[-1] == "}" or line[-1] == "]"):
+            return config
+        else:
+            values = _parse_line(line.strip(), config_file)
+            for k,v in values.items():
+                config[k] = v
+            line = config_file.readline()
+    return config
+
+"""Parse a single config ling
+    Args:
+        line: (str) the line to be parsed
+        config_file: (file) the file that the line has been taken from
+    Returns:
+        (dict) the configuration that has been parsed from the single line
+
+"""
+def _parse_line(line, config_file):
+    if len(line) == 0:
+        return {}
+    if line[0] == "#":
+        return {}
+    else:
+        split = line.split(" ")
+        key = split[0]
+        value = " " if len(split) == 1 else " ".join(line.split(" ")[1:])
+
+        # if starting with include, then include another file in the same config
+        if key == "include":
+            included = parse_conf(value)
+            return included
+        elif value[-1].endswith("{"):
+            return {key: _parse_config(config_file)}
+        elif value[-1].endswith("["):
+            return {key: [k for k in _parse_config(config_file).keys()]}
+        else:
+            return {key: value}
+
+
diff --git a/src/options.py b/src/options.py
index 9064369..c910ef2 100644
--- a/src/options.py
+++ b/src/options.py
@@ -5,7 +5,7 @@ options = {
                 "name": "help",
                 "flag" : True,
                 "desc" : "prints the command usage and exists the program",
-            }
+            },
         "y" : {
                 "name" : "no-confirm",
                 "flag" : True,
@@ -21,6 +21,12 @@ options = {
                 "name" : "no-sync",
                 "flag" : True,
                 "desc" : "skip syncing with repo sources (not recommended)"
+            },
+        "c": {
+                "name" : "config",
+                "flag" : False,
+                "desc" : "specify the configuration file to use",
+                "default" : "/etc/xipkg.conf"
             }
         }
 
diff --git a/src/xi.py b/src/xi.py
index 2449328..90930c2 100644
--- a/src/xi.py
+++ b/src/xi.py
@@ -1,21 +1,20 @@
 import options
+import config
 
-def search(terms):
-    print(f"searching for {terms}")
+def search():
     pass
-
-def install(terms):
-    print(f"installing for {terms}")
+def install():
     pass
-
-def remove(terms):
-    print(f"removing for {terms}")
+def remove():
+    pass
+def sync():
     pass
 
 verbs = { v: globals()[v] for v in [
                 "search",
-                "install"
-                "remove"
+                "install",
+                "remove",
+                "sync"
             ]
         }
 
@@ -27,6 +26,7 @@ def main():
         options.print_usage()
         return
 
+    conf = config.parse_file(opts["c"])
     if len(args) > 0:
         verb = args[0].lower()
         (
-- 
cgit v1.2.1