twd-m4sc0 2.0.0__tar.gz → 2.0.1__tar.gz

{twd_m4sc0-2.0.0 → twd_m4sc0-2.0.1}/PKG-INFO

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

{twd_m4sc0-2.0.0 → twd_m4sc0-2.0.1}/setup.py

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

{twd_m4sc0-2.0.0 → twd_m4sc0-2.0.1}/twd/crud.py

@@ -2,9 +2,12 @@ import os
 import json
 import hashlib
 import time
-from .logger import log, error
+import logging
 from collections import OrderedDict
 
+log = logging.getLogger("log")
+error_log = logging.getLogger("error")
+
 
 def create_alias_id():
     data = str(time.time()) + str(os.urandom(16))
@@ -21,8 +24,9 @@ def ensure_data_file_exists(config):
         try:
             with open(data_file, "w") as f:
                 json.dump({}, f)
+            log.info(f"Created data file at {data_file}")
         except OSError as e:
-            error(f"Error creating data file: {e}", config)
+            error_log.error(f"Error creating data file: {e}")
 
 
 def load_data(config):
@@ -32,12 +36,13 @@ def load_data(config):
     try:
         with open(data_file, "r") as f:
             data = json.load(f)
+            log.info(f"Loaded data from {data_file}")
             return data
     except json.JSONDecodeError as e:
-        error(f"Error reading data file: {e}", config)
+        error_log.error(f"Error reading data file: {e}")
         return {}
     except OSError as e:
-        error(f"Error reading data file: {e}", config)
+        error_log.error(f"Error reading data file: {e}")
         return {}
 
 
@@ -49,8 +54,9 @@ def save_data(config, data):
         )
         with open(data_file, "w") as f:
             json.dump(sorted_data, f, indent=4)
+        log.info(f"Saved data to {data_file}")
     except OSError as e:
-        error(f"Error writing to data file: {e}", config)
+        error_log.error(f"Error writing to data file: {e}")
 
 
 def create_entry(config, data, path, alias=None):
@@ -61,6 +67,7 @@ def create_entry(config, data, path, alias=None):
         "created_at": time.time(),
     }
     save_data(config, data)
+    log.info(f"Created new entry with alias_id '{alias_id}' and path '{path}'")
     return alias_id
 
 
@@ -68,8 +75,9 @@ def delete_entry(config, data, entry_id):
     if entry_id in data:
         del data[entry_id]
         save_data(config, data)
+        log.info(f"Deleted entry with alias_id '{entry_id}'")
     else:
-        error(f"Entry ID {entry_id} not found", config)
+        error_log.error(f"Entry ID '{entry_id}' not found")
         raise KeyError(f"Entry ID {entry_id} not found")
 
 
@@ -77,8 +85,9 @@ def update_entry(config, data, entry_id, entry):
     if entry_id in data:
         data[entry_id] = entry
         save_data(config, data)
+        log.info(f"Updated entry with alias_id '{entry_id}'")
     else:
-        error(f"Entry ID {entry_id} not found", config)
+        error_log.error(f"Entry ID '{entry_id}' not found")
         raise KeyError(f"Entry ID {entry_id} not found")
 
 
@@ -87,8 +96,9 @@ def delete_data_file(config):
     if os.path.exists(data_file):
         try:
             os.remove(data_file)
+            log.info(f"Deleted data file at {data_file}")
         except OSError as e:
-            error(f"Error deleting data file: {e}", config)
+            error_log.error(f"Error deleting data file: {e}")
             raise
     else:
-        error("No data file found to delete", config)
+        error_log.error("No data file found to delete")

twd_m4sc0-2.0.1/twd/logger.py

@@ -0,0 +1,47 @@
+import logging
+import os
+from logging.handlers import RotatingFileHandler
+
+
+def setup_logger(config):
+    """Set up loggers based on the configuration provided."""
+    log_file = os.path.expanduser(config.get("log_file"))
+    error_file = os.path.expanduser(config.get("error_file"))
+    log_level = config.get("log_level", "INFO").upper()
+    max_bytes = config.get("log_max_bytes", 5 * 1024 * 1024)  # Default 5MB
+    backup_count = config.get("log_backup_count", 3)  # Default 3 backup files
+
+    os.makedirs(os.path.dirname(log_file), exist_ok=True)
+    os.makedirs(os.path.dirname(error_file), exist_ok=True)
+
+    # General log configuration
+    log_formatter = logging.Formatter(
+        config.get("log_format", "%(asctime)s - %(levelname)s - %(message)s")
+    )
+
+    # Avoid duplicate handlers
+    logger = logging.getLogger("log")
+    if not logger.hasHandlers():
+        logger.setLevel(log_level)
+        log_handler = RotatingFileHandler(
+            log_file, maxBytes=max_bytes, backupCount=backup_count
+        )
+        log_handler.setFormatter(log_formatter)
+        logger.addHandler(log_handler)
+
+    # Error log configuration
+    error_logger = logging.getLogger("error")
+    if not error_logger.hasHandlers():
+        error_logger.setLevel(logging.ERROR)
+        error_handler = RotatingFileHandler(
+            error_file, maxBytes=max_bytes, backupCount=backup_count
+        )
+        error_handler.setFormatter(log_formatter)
+        error_logger.addHandler(error_handler)
+
+    return logger, error_logger
+
+
+def initialize_logging(config):
+    setup_logger(config)
+

{twd_m4sc0-2.0.0 → twd_m4sc0-2.0.1}/twd/screen.py

@@ -2,7 +2,10 @@ import curses
 import time
 import os
 from . import crud
-from .logger import error
+import logging
+
+log = logging.getLogger("log")
+error_log = logging.getLogger("error")
 
 CONFIG = None
 DIRS = None
@@ -163,7 +166,7 @@ def display_select_screen(stdscr):
                 try:
                     crud.delete_entry(CONFIG, data, selected_entry_id)
                 except KeyError:
-                    error(f"Entry ID {selected_entry_id} not found", CONFIG)
+                    error_log.error(f"Entry ID {selected_entry_id} not found")
                 del filtered_DIRS[selected_entry_id]
                 if selected_entry >= len(filtered_DIRS):
                     selected_entry = max(len(filtered_DIRS) - 1, 0)
@@ -196,4 +199,3 @@ def display_select(config, dirs):
     original_DIRS = DIRS
     search_query = ""
     return curses.wrapper(display_select_screen)
-

{twd_m4sc0-2.0.0 → twd_m4sc0-2.0.1}/twd/twd.py

@@ -3,11 +3,15 @@ import argparse
 import json
 import time
 import re
+import logging
 from importlib.metadata import version, PackageNotFoundError
-from .logger import log, error
+from .logger import initialize_logging
 from .screen import display_select
 from . import crud
 
+log = logging.getLogger("log")
+error_log = logging.getLogger("error")
+
 TWD_DIR = os.path.join(os.path.expanduser("~"), ".twd")
 CONFIG_FILE = os.path.join(TWD_DIR, "config")
 
@@ -16,7 +20,10 @@ DEFAULT_CONFIG = {
     "output_behaviour": 2,
     "log_file": os.path.expanduser("~/.twd/log"),
     "error_file": os.path.expanduser("~/.twd/error"),
-    "log_format": "[$T]: $M",
+    "log_format": "%(asctime)s - %(levelname)s - %(message)s",
+    "log_level": "INFO",
+    "log_max_bytes": 5 * 1024 * 1024,  # 5 MB log rotation
+    "log_backup_count": 3,
 }
 
 
@@ -31,32 +38,34 @@ def load_config():
             try:
                 return json.load(file)
             except json.JSONDecodeError as e:
-                error(f"Error loading config: {e}", DEFAULT_CONFIG)
+                error_log.error(f"Error loading config: {e}")
                 return DEFAULT_CONFIG
 
 
 CONFIG = load_config()
+initialize_logging(CONFIG)
 
-# Ensure data files exist
 crud.ensure_data_file_exists(CONFIG)
-log_file = os.path.expanduser(CONFIG.get("log_file"))
-error_file = os.path.expanduser(CONFIG.get("error_file"))
 
 
 def ensure_log_error_files():
+    """Ensure that log and error files exist based on configuration settings."""
+    log_file = os.path.expanduser(CONFIG.get("log_file"))
+    error_file = os.path.expanduser(CONFIG.get("error_file"))
+
     if not os.path.exists(log_file):
         try:
             with open(log_file, "w+") as f:
                 f.write("")
         except OSError as e:
-            error(f"Error creating log file: {e}", CONFIG)
+            error_log.error(f"Error creating log file: {e}")
 
     if not os.path.exists(error_file):
         try:
             with open(error_file, "w+") as f:
                 f.write("")
         except OSError as e:
-            error(f"Error creating error file: {e}", CONFIG)
+            error_log.error(f"Error creating error file: {e}")
 
 
 ensure_log_error_files()
@@ -66,14 +75,14 @@ def get_absolute_path(path):
     try:
         return os.path.abspath(path)
     except Exception as e:
-        error(f"Error getting absolute path for {path}: {e}", CONFIG)
+        error_log.error(f"Error getting absolute path for {path}: {e}")
         raise
 
 
 def validate_alias(alias):
     """Ensure the alias contains only valid characters."""
     if not re.match(r"^[\w-]+$", alias):
-        error(f"Invalid alias provided: {alias}", CONFIG)
+        error_log.error(f"Invalid alias provided: {alias}")
         raise ValueError(
             f"Invalid alias: '{alias}'. Aliases can only contain alphanumeric characters, dashes, and underscores."
         )
@@ -83,7 +92,7 @@ def validate_alias(alias):
 def output_handler(
     message=None, path=None, output=True, simple_output=False, message_type=0
 ):
-    log(f"Type: {message_type}, Msg: {message or path}", CONFIG)
+    log.info(f"Type: {message_type}, Msg: {message or path}")
 
     if CONFIG["output_behaviour"] == 1 or simple_output:
         if path:
@@ -126,12 +135,10 @@ def load_directory():
 
 def show_main(alias=None, output=True, simple_output=False):
     dirs = load_directory()
-
     if dirs is None:
         output_handler("No TWD found", None, output, simple_output)
         return 1
     else:
-        # Use alias if provided
         if alias:
             matched_dirs = []
 
@@ -149,14 +156,13 @@ def show_main(alias=None, output=True, simple_output=False):
 
             if len(matched_dirs) == 1:
                 TWD = matched_dirs[0]["path"]
-
                 if os.path.exists(TWD):
                     output_handler(
                         f"cd {TWD}", TWD, output, simple_output, message_type=1
                     )
                     return 0
                 else:
-                    error(f"Directory does not exist: {TWD}", CONFIG)
+                    error_log.error(f"Directory does not exist: {TWD}")
                     output_handler(
                         f"Directory does not exist: {TWD}", None, output, simple_output
                     )
@@ -177,19 +183,17 @@ def show_main(alias=None, output=True, simple_output=False):
                 output_handler("No TWD with alias found", None, output, simple_output)
                 return 1
 
-        # Display selection using curses if alias is not given
         selected_dir = display_select(CONFIG, dirs)
         if selected_dir is None:
             output_handler("No TWD selected", None, output, simple_output)
             return 0
         else:
             TWD = selected_dir["path"]
-
             if os.path.exists(TWD):
                 output_handler(f"cd {TWD}", TWD, output, simple_output, message_type=1)
                 return 0
             else:
-                error(f"Directory does not exist: {TWD}", CONFIG)
+                error_log.error(f"Directory does not exist: {TWD}")
                 output_handler(
                     f"Directory does not exist: {TWD}", None, output, simple_output
                 )
@@ -198,7 +202,6 @@ def show_main(alias=None, output=True, simple_output=False):
 
 def show_directory(output=True, simple_output=False):
     dirs = load_directory()
-
     if not dirs:
         output_handler("No TWD set", None, output, simple_output)
         return
@@ -240,7 +243,7 @@ This feature is to prevent accidental execution.""",
     try:
         crud.delete_data_file(CONFIG)
     except OSError as e:
-        error(f"Error deleting TWD file: {e}", CONFIG)
+        error_log.error(f"Error deleting TWD file: {e}")
         raise
     output_handler("TWD File deleted and TWD unset", None, output, simple_output)
 
@@ -249,7 +252,7 @@ def get_package_version():
     try:
         return version("twd_m4sc0")
     except PackageNotFoundError as e:
-        error(f"Package version not found: {e}", CONFIG)
+        error_log.error(f"Package version not found: {e}")
         return "Unknown version"
 
 
@@ -258,13 +261,10 @@ def main():
         description="Temporarily save and navigate to working directories."
     )
 
-    # Positional arguments
     parser.add_argument("directory", nargs="?", help="Directory to save")
     parser.add_argument(
         "alias", nargs="?", help="Alias for the saved directory (optional)"
     )
-
-    # Optional Arguments/Flags
     parser.add_argument(
         "-s",
         "--save",
@@ -285,63 +285,48 @@ def main():
         "--version",
         action="version",
         version=f"TWD Version: v{get_package_version()}",
-        help="Show the current version of TWD installed",
     )
     parser.add_argument("-f", "--force", action="store_true", help="Force an action")
     parser.add_argument(
         "--shell", nargs="?", const="twd", help="Output shell function for integration"
     )
     parser.add_argument(
-        "--simple-output",
-        action="store_true",
-        help="Only print essential output (new directory, absolute path, etc.)",
+        "--simple-output", action="store_true", help="Only print essential output"
     )
     parser.add_argument(
         "--no-output",
         action="store_true",
         help="Prevents the console from sending output",
     )
-    args = parser.parse_args()
 
+    args = parser.parse_args()
     output = not args.no_output
     simple_output = args.simple_output
 
-    # Shell function
     if args.shell:
-        print(rf"""
-function {args.shell}() {{
-    python3 -m twd "$@"
-    if [[ -f /tmp/twd_path ]]; then
-        cd "$(cat /tmp/twd_path)"
-        /bin/rm -f /tmp/twd_path
-    fi
-}}
-""")
+        print(rf"""function {args.shell}() {{
+            python3 -m twd "$@";
+            if [ -f /tmp/twd_path ]; then
+                cd "$(cat /tmp/twd_path)";
+                /bin/rm -f /tmp/twd_path;
+            fi;
+        }}""")
         return 0
 
     directory = args.directory or args.dir
     alias = args.alias or args.ali
 
     if args.save:
-        if not directory:
-            directory = os.getcwd()
-
-        alias = args.alias or args.ali
-
         save_directory(directory, alias, output, simple_output)
     elif args.go:
-        alias = args.go
-        return show_main(alias, output, simple_output)
+        show_main(alias, output, simple_output)
     elif args.list:
         show_directory(output, simple_output)
     elif args.unset:
-        force = args.force
-        unset_directory(output, simple_output, force)
+        unset_directory(output, simple_output, force=args.force)
     else:
         show_main(None, output, simple_output)
-        return 1
 
 
 if __name__ == "__main__":
     main()
-

{twd_m4sc0-2.0.0 → twd_m4sc0-2.0.1}/twd_m4sc0.egg-info/PKG-INFO

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

twd_m4sc0-2.0.0/twd/logger.py

@@ -1,47 +0,0 @@
-import os
-import time
-
-
-def format_message(message, config):
-    """Format the log message according to the provided config."""
-    result = config.get("log_format", "[$T]: $M")
-    result = result.replace("$T", time.strftime("%Y-%m-%d %H:%M:%S"))
-    result = result.replace("$M", message)
-    return result
-
-
-def ensure_directory_exists(file_path):
-    """Ensure the directory for the given file path exists."""
-    directory = os.path.dirname(file_path)
-    if not os.path.exists(directory):
-        os.makedirs(directory, exist_ok=True)
-
-
-def write_log(message, config):
-    """Write log message to the log file specified in the config."""
-    log_file = os.path.expanduser(config.get("log_file"))
-    log_file = os.path.abspath(log_file)
-    ensure_directory_exists(log_file)  # Ensure the directory exists
-    with open(log_file, "a+") as f:
-        f.write(message + "\n")
-
-
-def write_error(message, config):
-    """Write error message to the error file specified in the config."""
-    error_file = os.path.expanduser(config.get("error_file"))
-    error_file = os.path.abspath(error_file)
-    ensure_directory_exists(error_file)  # Ensure the directory exists
-    with open(error_file, "a+") as f:
-        f.write(message + "\n")
-
-
-def log(message, config):
-    """Log the message using the provided config."""
-    formatted_message = format_message(message, config)
-    write_log(formatted_message, config)
-
-
-def error(message, config):
-    """Log the error using the provided config."""
-    formatted_message = format_message(message, config)
-    write_error(formatted_message, config)