merge fixes

imgsort/configs.py

@@ -1,9 +1,8 @@
 from os import path, getcwd, listdir, mkdir, makedirs, rename
 import re
 
-def read_config(filepath):
+def read_config(filepath, root_directory="."):
-    if not path.isfile(filepath):
+    if not path.isfile(filepath): return False
-        raise FileNotFoundError(f"read_config: Invalid filepath {filepath}")
 
     file = open(filepath, 'r')
     keys = {}
@@ -12,7 +11,7 @@ def read_config(filepath):
         match = re.match(r". = /?([a-z-A-ZöÖäÄüÜ0-9/: _-]+/)*[a-zA-ZöÖäÄüÜ0-9/: _-]+/?", line)
         if match:
             key, value = line.split(" = ")
-            keys[key]  = value
+            keys[key]  = root_directory + "/" + value
     return keys
 
 def write_config(filepath, keys):

imgsort/sorter.py

@@ -3,9 +3,8 @@
 import curses as c
 import ueberzug.lib.v0 as uz
 
-<<<<<<< HEAD
+import os
-
+from os import path, getcwd, listdir, makedirs, rename
-from os import path, getcwd, listdir, mkdir, makedirs, rename
 import subprocess
 
 if __name__ == "__main__":  # make relative imports work as described here: https://peps.python.org/pep-0366/#proposed-change
@@ -15,7 +14,9 @@ if __name__ == "__main__":  # make relative imports work as described here: http
         filepath = path.realpath(path.abspath(__file__))
         sys.path.insert(0, path.dirname(path.dirname(filepath)))
 
-from .configs import read_config, write_config, select_config, create_config
+from .configs import read_config, select_config
+
+import argparse
 
 settings = {
             "q": "quit",
@@ -219,6 +220,8 @@ class Sorter:
         for k, v in self.keys.items():
             if i >= self.win_y - KEYS_BEGIN - FOOTER_HEIGHT: # dont write into footer
                 break
+            # show only last part
+            v = v.split("/")[-1]
             if k == self.pressed_key:
                 self.window.addnstr(KEYS_BEGIN + i, 0, f"  {k}: {v}", SIDEBAR_WIDTH, c.A_STANDOUT)
             else:
@@ -242,7 +245,6 @@ class Sorter:
         print(message)
         print(f"Quitting imgsort {version}")
         exit(0)
-    
 
     def __del__(self):
         self.window.clear()
@@ -250,30 +252,28 @@ class Sorter:
         c.endwin()
 
 
-
 def main():
     # set working directory
-    print(f"""===================================================================================================
+    print("""
-imgsort {version} - Image Sorter
+===================================================================================================
-===================================================================================================""")
+Image Sorter
-    # set directories
+===================================================================================================
-    config_dir = os.path.join(os.environ.get("XDG_CONFIG_HOME", os.path.expanduser("~/.config")), "regina")
+""")
+    config_dir = os.path.join(os.environ.get("XDG_CONFIG_HOME", os.path.expanduser("~/.config")), "imgsort")
     # check if environment variables are set and use them if they are
     if 'IMGSOSRT_CONFIG_DIR' in os.environ: config_dir = os.environ['IMGSORT_CONFIG_DIR']
 
-    parser = argparse.ArgumentParser(prog="imgsort")
+    parser = argparse.ArgumentParser("imgsort")
-    parser.add_argument("--config", "-c",   action="store",         help="name or path of config file", metavar="config file")
+    parser.add_argument("-c", "--config", action="store", help="name of the config file in ($IMGSORT_CONFIG_DIR > $XDG_CONFIG_HOME/imgsort > ~/.config/imgsort)")
-    parser.add_argument("--dir", "-d",      action="store",         help="working directory", metavar="working directory")
+    parser.add_argument("-i", "--sort-dir", action="store", help="the directory where the folders from the config will be created")
     args = parser.parse_args()
 
-    # working directory
+    wd = getcwd();
-    if args.dir:
+
-        if not path.isdir(args.dir):
+    if args.sort_dir:
-            parser.error(f"invalid working directory: {args.wdir}")
+        args.sort_dir = path.abspath(args.sort_dir)
-        wd = path.abspath(args.dir)
-        os.chdir(wd)
     else:
-        wd = getcwd()
+        args.sort_dir = getcwd()
 
     # configuration
     if args.config:
@@ -284,16 +284,12 @@ imgsort {version} - Image Sorter
             if not path.isfile(config_path):
                 parser.error(f"invalid configuration path/name:'{config_path}'/'{args.config}'")
     else:
-        config_path = select_config()
+        args.config = select_config()
-    print(config_path)
-    if config_path is not None:
-        config = read_config(config_path)
-    else:
-        config = create_config()
 
+    config = read_config(args.config, root_directory=args.sort_dir)
     if not config:
         print("Error reading the config:")
-        print("  Config Name:", config_path)
+        print("  Config Name:", args.config)
         print("  Config:", config)
         exit(1)