libjam 0.0.11__tar.gz → 0.0.12__tar.gz

{libjam-0.0.11 → libjam-0.0.12}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libjam
-Version: 0.0.11
+Version: 0.0.12
 Summary: A library jam for Python.
 Project-URL: Homepage, https://github.com/philippkosarev/libjam
 Project-URL: Issues, https://github.com/philippkosarev/libjam/issues

{libjam-0.0.11 → libjam-0.0.12}/libjam/notebook.py

@@ -1,5 +1,5 @@
 # Imports
-import os, tomllib, configparser, json, ast
+import tomllib, configparser, json, ast, re
 from .drawer import Drawer
 
 # Jam classes
@@ -23,7 +23,7 @@ class Notebook:
 
   # parsing a toml config
   def read_toml(self, config_file: str):
-    config_file = os.path.normpath(config_file)
+    config_file = drawer.absolute_path(config_file)
     # Parsing config
     data = open(config_file, 'r').read()
     try:
@@ -32,7 +32,7 @@ class Notebook:
         for item in data.get(category):
           path = data.get(category).get(item)
           if type(path) == str:
-            data[category][item] = path.replace(os.sep, '/')
+            data[category][item] = drawer.absolute_path(path)
       return data
     except:
       print(f"Encountered error reading '{config_file}'")
@@ -40,17 +40,45 @@ class Notebook:
       print(data)
       return None
 
-  # Reads ini file and returns its contents in the form of a dict
-  def read_ini(self, ini_file: str, inline_comments=False):
+  # Reads ini file and returns its contents in the form of a dict.
+  # allow_duplicates is only to be used as a last resort due to the performance
+  # impact and inaccuracy in results.
+  def read_ini(self, ini_file: str, inline_comments=False, allow_duplicates=False):
     if drawer.is_file(ini_file) is False:
       return None
-    ini_file = os.path.normpath(ini_file)
+    ini_file = drawer.absolute_path(ini_file)
     if inline_comments is True:
       parser = configparser.ConfigParser(inline_comment_prefixes=('#', ';'))
     else:
       parser = configparser.ConfigParser()
     try:
       parser.read(ini_file)
+    except configparser.DuplicateSectionError:
+      if allow_duplicates is True:
+        ini_string = open(ini_file, 'r').read()
+        ini_string = re.sub(';.*', '', ini_string) # Removing comments
+        ini_sections = ini_string.replace(' =', '=').replace('= ', '=')
+        ini_sections = ini_sections.replace('\n', ';')
+        ini_sections = ini_sections.replace('[', '\n[')
+        ini_sections = ini_sections.removeprefix('\n')
+        ini_sections = ini_sections.split('\n')
+        ini_dict = {}
+        for section in ini_sections:
+          section_name = re.sub('];.*', '', section).replace('[', '')
+          section_name = section_name.upper()
+          ini_dict[section_name] = {}
+          declarations = section.removeprefix(f"[{section_name}];")
+          declarations = declarations.split(';')
+          for declaration in declarations:
+            if declaration == '':
+              continue
+            info = declaration.split('=')
+            name = info[0].lower()
+            value = info[1]
+            ini_dict[section_name][name] = value
+        return ini_dict
+      else:
+        return None
     except configparser.ParsingError:
       return None
     sections = parser.sections()
@@ -67,7 +95,7 @@ class Notebook:
   def write_ini(self, ini_file: str, contents: dict):
     if drawer.is_file(ini_file) is False:
       return None
-    ini_file = os.path.normpath(ini_file)
+    ini_file = drawer.absolute_path(ini_file)
     parser = configparser.ConfigParser()
     for section in contents:
       for var_name in contents.get(section):
@@ -82,7 +110,7 @@ class Notebook:
   def read_json(self, json_file: str):
     if drawer.is_file(json_file) is False:
       return None
-    json_file = os.path.normpath(json_file)
+    json_file = drawer.absolute_path(json_file)
     json_string = open(json_file, 'r').read()
     try:
       data = json.loads(json_string)

{libjam-0.0.11 → libjam-0.0.12}/pyproject.toml

@@ -14,7 +14,7 @@ include = [
 
 [project]
 name = "libjam"
-version = "0.0.11"
+version = "0.0.12"
 authors = [
   { name="Philipp Kosarev", email="philipp.kosarev@gmail.com" },
 ]
@@ -30,4 +30,4 @@ license-files = ["LICEN[CS]E*"]
 
 [project.urls]
 Homepage = "https://github.com/philippkosarev/libjam"
-Issues = "https://github.com/philippkosarev/libjam/issues"
+Issues = "https://github.com/philippkosarev/libjam/issues"