twd-m4sc0 1.2.2__tar.gz → 1.4.0__tar.gz

{twd_m4sc0-1.2.2 → twd_m4sc0-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: twd_m4sc0
-Version: 1.2.2
+Version: 1.4.0
 Summary: A tool to temporarily save and go to a working directory
 Home-page: https://github.com/m4sc0/twd
 Author: m4sc0

{twd_m4sc0-1.2.2 → twd_m4sc0-1.4.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="twd_m4sc0",
-    version="1.2.2",
+    version="1.4.0",
     packages=find_packages(),
     entry_points={
         "console_scripts": [

{twd_m4sc0-1.2.2 → twd_m4sc0-1.4.0}/twd/twd.py

@@ -1,28 +1,60 @@
 import os
 import argparse
 import sys
+import json
 from importlib.metadata import version, PackageNotFoundError
 
-TWD_FILE = os.path.join(os.path.expanduser("~"), ".twd")
+TWD_DIR = os.path.join(os.path.expanduser("~"), ".twd")
+CONFIG_FILE = os.path.join(TWD_DIR, 'config')
+
+DEFAULT_CONFIG = {
+    "data_file": "~/.twd/data",
+    "output_behaviour": 2
+}
+
+os.makedirs(TWD_DIR, exist_ok=True)
+
+def load_config():
+    if not os.path.exists(CONFIG_FILE):
+        with open(CONFIG_FILE, 'w') as file:
+            json.dump(DEFAULT_CONFIG, file, indent=4)
+        return DEFAULT_CONFIG
+    else:
+        with open(CONFIG_FILE, 'r') as file:
+            try:
+                return json.load(file)
+            except json.JSONDecodeError as e:
+                print(f"Error loading config: {e}")
+                return DEFAULT_CONFIG
+
+CONFIG = load_config()
+
+TWD_FILE = os.path.expanduser(CONFIG.get("data_file", "~/.twd/data"))
+
+def ensure_data_file_exists():
+    if not os.path.exists(TWD_FILE):
+        with open(TWD_FILE, 'w') as f:
+            f.write("")
+
+ensure_data_file_exists()
 
 def get_absolute_path(path):
     return os.path.abspath(path)
 
-def output_handler(message=None, path=None, output=True, simple_output=False):
-    """
-    Handles all output based on the flags --no-output and --simple-output.
-    - message: Regular output string
-    - path: Path to be printed (in simple output mode)
-    - output: Whether output is enabled
-    - simple_output: Whether only essential output should be shown
-    """
+def output_handler(message=None, path=None, output=True, simple_output=False, message_type=0):
     if not output:
         return
 
-    if simple_output and path:
-        print(path)
-    elif not simple_output and message:
-        print(message)
+    if CONFIG["output_behaviour"] == 0:
+        return
+
+    if message_type == 1:
+        print(f"1;{message}")
+    elif message_type == 0:
+        if simple_output and path:
+            print(f"0;{path}")
+        elif not simple_output and message:
+            print(f"0;{message}")
 
 def save_directory(path=None, output=True, simple_output=False):
     if path is None:
@@ -38,7 +70,6 @@ def save_directory(path=None, output=True, simple_output=False):
 def load_directory():
     if not os.path.exists(TWD_FILE):
         return None
-
     with open(TWD_FILE, "r") as f:
         return f.read().strip()
 
@@ -50,7 +81,7 @@ def go_to_directory(output=True, simple_output=False):
         return 1
     else:
         if os.path.exists(TWD):
-            output_handler(f"cd {TWD}", TWD, output, simple_output)
+            output_handler(f"cd {TWD}", TWD, output, simple_output, message_type=1)
             return 0
         else:
             output_handler(f"Directory does not exist: {TWD}", None, output, simple_output)
@@ -64,6 +95,13 @@ def show_directory(output=True, simple_output=False):
     else:
         output_handler(f"Current TWD: {TWD}", TWD, output, simple_output)
 
+def unset_directory(output=True, simple_output=False):
+    if not os.path.exists(TWD_FILE):
+        output_handler(f"No TWD file found", None, output, simple_output)
+    else:
+        os.remove(TWD_FILE)
+        output_handler(f"TWD File deleted and TWD unset", None, output, simple_output)
+
 def get_package_version():
     try:
         return version("twd_m4sc0")
@@ -71,11 +109,14 @@ def get_package_version():
         return "Unknown version"
 
 def main():
+    global TWD_FILE
+
     parser = argparse.ArgumentParser(description="Temporarily save and navigate to working directories.")
 
     parser.add_argument('-s', '--save', nargs='?', const='', help="Save the current or specified directory")
     parser.add_argument('-g', '--go', action='store_true', help="Go to the saved directory")
     parser.add_argument('-l', '--list', action='store_true', help="Show saved TWD")
+    parser.add_argument('-u', '--unset', action='store_true', help="Unset the saved TWD")
     parser.add_argument('-v', '--version', action='version', version=f'TWD Version: {get_package_version()}', help='Show the current version of TWD installed')
     parser.add_argument('--shell', action='store_true', help="Output shell function for integration")
     parser.add_argument('--simple-output', action='store_true', help="Only print essential output (new directory, absolute path, etc.)")
@@ -89,12 +130,16 @@ def main():
     if args.shell:
         print('''
         function twd() {
-            output=$(python3 -m twd "$@");
-            if [[ "$1" == "-g" ]]; then
-                eval "$output";
-            else
-                echo "$output";
-            fi
+            output=$(python3 -m twd "$@"); 
+            while IFS= read -r line; do
+                type=$(echo "$line" | cut -d';' -f1); 
+                message=$(echo "$line" | cut -d';' -f2-); 
+                if [[ "$type" == "1" ]]; then 
+                    eval "$message"; 
+                else 
+                    echo "$message"; 
+                fi; 
+            done <<< "$output";
         }
         ''')
         return 0
@@ -105,6 +150,8 @@ def main():
         return go_to_directory(output, simple_output)
     elif args.list:
         show_directory(output, simple_output)
+    elif args.unset:
+        unset_directory(output, simple_output)
     else:
         parser.print_help()
         return 1

{twd_m4sc0-1.2.2 → twd_m4sc0-1.4.0}/twd_m4sc0.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: twd_m4sc0
-Version: 1.2.2
+Version: 1.4.0
 Summary: A tool to temporarily save and go to a working directory
 Home-page: https://github.com/m4sc0/twd
 Author: m4sc0