libjam 0.0.12__tar.gz → 0.0.14__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libjam
-Version: 0.0.12
+Version: 0.0.14
 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.12 → libjam-0.0.14}/libjam/notebook.py

@@ -43,16 +43,16 @@ class Notebook:
   # 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):
+  def read_ini(self, ini_file: str, allow_duplicates=False):
     if drawer.is_file(ini_file) is False:
       return None
     ini_file = drawer.absolute_path(ini_file)
-    if inline_comments is True:
-      parser = configparser.ConfigParser(inline_comment_prefixes=('#', ';'))
-    else:
-      parser = configparser.ConfigParser()
+    parser = configparser.ConfigParser()
     try:
       parser.read(ini_file)
+    except configparser.InterpolationSyntaxError:
+      parser = configparser.ConfigParser(inline_comment_prefixes=('#', ';'))
+      parser.read(ini_file)
     except configparser.DuplicateSectionError:
       if allow_duplicates is True:
         ini_string = open(ini_file, 'r').read()
@@ -107,16 +107,18 @@ class Notebook:
       parser.write(file)
 
   # Reads a given json file as a dictionary.
+  # Returns None if file doesn't exist.
   def read_json(self, json_file: str):
     if drawer.is_file(json_file) is False:
       return None
     json_file = drawer.absolute_path(json_file)
     json_string = open(json_file, 'r').read()
+    json_string = json_string.replace('null', 'None')
+    # Trying the sane method
     try:
       data = json.loads(json_string)
+    # Exception in case json contains multiline values
     except json.decoder.JSONDecodeError:
-      json_string = json_string.replace('\n', ' ').strip()
+      json_string = ' '.join(json_string.split())
       data = ast.literal_eval(json_string)
-    except:
-      data = None
     return data

{libjam-0.0.12 → libjam-0.0.14}/libjam/typewriter.py

@@ -3,26 +3,31 @@ import shutil
 
 # Responsible for formatting, modification and printing of strings
 class Typewriter:
-  def __init__(self):
-    # Shorthand vars
-    self.BOLD = '\033[1m'
-    self.NORMAL = '\033[0m'
-    self.CLEAR = '\x1b[2K'
-    self.CURSOR_UP = '\033[1A'
+  # Shorthand vars
+  BOLD = '\033[1m'
+  NORMAL = '\033[0m'
+  CLEAR = '\x1b[2K'
+  CURSOR_UP = '\033[1A'
 
   # Gets a string, makes it bold, returns the string
   def bolden(self, text: str):
     text = f'{self.BOLD}{text}{self.NORMAL}'
     return text
 
-  # Clears a given number of lines in the terminal
-  # if given 0 the current line will be erased
+  # Returns current terminal width and height (columns and lines) as a tuple.
+  def get_terminal_size(self):
+    size = shutil.get_terminal_size()
+    x, y = size[0], size[1]
+    return (x, y)
+
+  # Clears a given number of lines in the terminal.
+  # If the specified number of lines is 0 then the current line will be erased.
   def clear_lines(self, lines: int):
     if lines == 0:
       print("\r" + self.CLEAR, end='')
       return
     for line in range(lines):
-      print(self.CURSOR_UP + self.CLEAR, end='')
+      print(self.CLEAR, end=self.CURSOR_UP)
 
   # Clears current line to print a new one.
   # Usecase: after typewriter.print_status()
@@ -38,7 +43,7 @@ class Typewriter:
   # Prints on the same line
   def print_progress(self, status: str, current: int, total: int):
     width = 25
-    progress_float= (current / total)
+    progress_float = (current / total)
     percent = int(round((progress_float* 100), 0))
     percent_string = str(percent)
     if percent < 100:

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

@@ -14,7 +14,7 @@ include = [
 
 [project]
 name = "libjam"
-version = "0.0.12"
+version = "0.0.14"
 authors = [
   { name="Philipp Kosarev", email="philipp.kosarev@gmail.com" },
 ]