libjam 0.0.14__tar.gz → 0.0.16__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: libjam
-Version: 0.0.14
+Version: 0.0.16
 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.16/build.sh

@@ -0,0 +1,28 @@
+#! /bin/bash
+
+# Functions
+function Ask {
+  while true; do
+    read -p "$* [y/N]: " yn
+    case $yn in
+      [Yy]*) return 0 ;;
+      [Nn]*) return 1 ;;
+      *) return 1 ;;
+    esac
+  done
+}
+
+function Publish {
+  python3 -m twine upload --repository pypi dist/*
+}
+
+function Build {
+  echo "Deleting 'dist' directory..."
+  rm ./dist -r
+  echo "Building..."
+  python3 -m build
+}
+
+# Running
+Build
+Ask "Publish new version to PyPi?" && Publish

{libjam-0.0.14 → libjam-0.0.16}/libjam/drawer.py

@@ -90,13 +90,12 @@ class Drawer:
 
   # Returns a list of files in a given folder
   def get_files(self, path: str):
-    path = realpath(path)
     unfiltered_files = self.get_all(path)
     files = []
     for file in unfiltered_files:
-      if self.is_file:
+      if self.is_file(path):
         files.append(file)
-    return outpath(files)
+    return files
 
   # Returns a list of folders in a given folder
   def get_folders(self, path: str):

{libjam-0.0.14 → libjam-0.0.16}/libjam/notebook.py

@@ -8,9 +8,17 @@ drawer = Drawer()
 # Deals with configs and reading/writing files
 class Notebook:
 
+  # Reads a text file and returns a string.
+  def read_file(self, path):
+    if drawer.is_folder(path):
+      raise FileExistsError(f"Attempted to read folder '{path}' as a text file.")
+    elif drawer.is_file(path) is False:
+      raise FileNotFoundError(f"File '{path}' not found.")
+    return open(path, 'r').read()
+
   # Checking if config exists, and creating one if it does not
   def check_config(self, config_template_file: str, config_file: str):
-    config_template = open(config_template_file, 'r').read()
+    config_template = self.read_file(config_template_file)
     config_folder = drawer.get_parent(config_file)
     if drawer.is_folder(config_folder) is False:
       drawer.make_folder(config_folder)
@@ -23,36 +31,24 @@ class Notebook:
 
   # parsing a toml config
   def read_toml(self, config_file: str):
-    config_file = drawer.absolute_path(config_file)
-    # Parsing config
-    data = open(config_file, 'r').read()
-    try:
-      data = tomllib.loads(data)
-      for category in data:
-        for item in data.get(category):
-          path = data.get(category).get(item)
-          if type(path) == str:
-            data[category][item] = drawer.absolute_path(path)
-      return data
-    except:
-      print(f"Encountered error reading '{config_file}'")
-      print(f"Contents of '{config_file}':")
-      print(data)
-      return None
+    data = self.read_file(config_file)
+    data = tomllib.loads(data)
+    for category in data:
+      for item in data.get(category):
+        path = data.get(category).get(item)
+        if type(path) == str:
+          data[category][item] = drawer.absolute_path(path)
+    return data
 
   # 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, allow_duplicates=False):
-    if drawer.is_file(ini_file) is False:
-      return None
-    ini_file = drawer.absolute_path(ini_file)
-    parser = configparser.ConfigParser()
+    # Checking file
+    data = self.read_file(ini_file)
+    parser = configparser.ConfigParser(inline_comment_prefixes=('#', ';'))
     try:
-      parser.read(ini_file)
-    except configparser.InterpolationSyntaxError:
-      parser = configparser.ConfigParser(inline_comment_prefixes=('#', ';'))
-      parser.read(ini_file)
+      parser.read_string(data)
     except configparser.DuplicateSectionError:
       if allow_duplicates is True:
         ini_string = open(ini_file, 'r').read()
@@ -95,7 +91,6 @@ class Notebook:
   def write_ini(self, ini_file: str, contents: dict):
     if drawer.is_file(ini_file) is False:
       return None
-    ini_file = drawer.absolute_path(ini_file)
     parser = configparser.ConfigParser()
     for section in contents:
       for var_name in contents.get(section):
@@ -109,10 +104,7 @@ class Notebook:
   # 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 = self.read_file(json_file)
     json_string = json_string.replace('null', 'None')
     # Trying the sane method
     try:

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

@@ -83,7 +83,10 @@ class Typewriter:
       # Adding spaces
       current_text = 0
       for text in column:
-        spaces = ' ' * ((column_width - len(text)) + 1)
+        if current_column == len(columns) - 1:
+          spaces = ''
+        else:
+          spaces = ' ' * ((column_width - len(text)) + 1)
         columns[current_column][current_text] = text + spaces
         current_text += 1
       current_column += 1
@@ -121,4 +124,4 @@ class Typewriter:
       for text in row:
         output += text
     # Returning string
-    return output
+    return output.rstrip()

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

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

libjam-0.0.14/build.sh

@@ -1,8 +0,0 @@
-#! /bin/bash
-
-echo "Removing 'dist' directory..."
-rm ./dist -r
-python3 -m build
-
-# Publish command:
-# python3 -m twine upload --repository pypi dist/*