eapyTool 0.3.2__tar.gz → 0.3.3__tar.gz

{eapytool-0.3.2 → eapytool-0.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eapyTool
-Version: 0.3.2
+Version: 0.3.3
 Summary: A Python utility library for math, algebra, data structures, and everyday tools
 Project-URL: Homepage, https://github.com/eapy/eapy
 Project-URL: Repository, https://github.com/eapy/eapy
@@ -152,6 +152,36 @@ A Python utility library that extends the standard library with math, algebra, d
 - `colorText(text, color, style, bg)` — return colored text string
 - `printColor(text, color, style, bg)` — print colored text
 
+### Logging
+- `Logger` — simple logger (console + file)
+- `@logTime` — log function calls with timing
+
+### Config Management
+- `Config` — JSON-based config with dot notation support
+
+### Validation (Extended)
+- `isPhoneNumber` — Chinese phone number validation
+- `isDate` — date format validation
+- `isHexColor` — hex color validation
+
+### File Utilities
+- `listFiles(dir, ext)` — list files by extension
+- `fileSize(path)` — human-readable file size
+- `ensureDir(path)` — create directory if not exists
+
+### CLI Interaction
+- `confirm(prompt)` — yes/no confirmation
+- `askInput(prompt, default)` — input with default
+- `selectOption(prompt, options)` — selection menu
+
+### Encryption
+- `encrypt(text, key)` / `decrypt(text, key)` — simple XOR encryption
+
+### Time Utilities
+- `formatDuration(seconds)` — human-readable duration
+- `timestamp()` — current Unix timestamp
+- `parseDate(str, fmt)` — parse date string
+
 ## Installation
 
 ```bash

{eapytool-0.3.2 → eapytool-0.3.3}/README.md

@@ -129,6 +129,36 @@ A Python utility library that extends the standard library with math, algebra, d
 - `colorText(text, color, style, bg)` — return colored text string
 - `printColor(text, color, style, bg)` — print colored text
 
+### Logging
+- `Logger` — simple logger (console + file)
+- `@logTime` — log function calls with timing
+
+### Config Management
+- `Config` — JSON-based config with dot notation support
+
+### Validation (Extended)
+- `isPhoneNumber` — Chinese phone number validation
+- `isDate` — date format validation
+- `isHexColor` — hex color validation
+
+### File Utilities
+- `listFiles(dir, ext)` — list files by extension
+- `fileSize(path)` — human-readable file size
+- `ensureDir(path)` — create directory if not exists
+
+### CLI Interaction
+- `confirm(prompt)` — yes/no confirmation
+- `askInput(prompt, default)` — input with default
+- `selectOption(prompt, options)` — selection menu
+
+### Encryption
+- `encrypt(text, key)` / `decrypt(text, key)` — simple XOR encryption
+
+### Time Utilities
+- `formatDuration(seconds)` — human-readable duration
+- `timestamp()` — current Unix timestamp
+- `parseDate(str, fmt)` — parse date string
+
 ## Installation
 
 ```bash

{eapytool-0.3.2 → eapytool-0.3.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "eapyTool"
-version = "0.3.2"
+version = "0.3.3"
 description = "A Python utility library for math, algebra, data structures, and everyday tools"
 readme = "README.md"
 license = "MPL-2.0"

{eapytool-0.3.2 → eapytool-0.3.3}/src/eapy/__init__.py

@@ -1,6 +1,6 @@
 """eapy - A Python utility library for math, algebra, data structures, and everyday tools."""
 
-__version__ = "0.3.2"
+__version__ = "0.3.3"
 
 from eapy.core import (
     # Timer
@@ -92,4 +92,18 @@ from eapy.core import (
     Storage,
     # Colored text
     Color, colorText, printColor,
+    # Logging
+    Logger, logTime,
+    # Config
+    Config,
+    # Validation (extended)
+    isPhoneNumber, isDate, isHexColor,
+    # File utilities
+    listFiles, fileSize, ensureDir,
+    # CLI interaction
+    confirm, askInput, selectOption,
+    # Encryption
+    encrypt, decrypt,
+    # Time utilities
+    formatDuration, timestamp, parseDate,
 )

{eapytool-0.3.2 → eapytool-0.3.3}/src/eapy/core.py

@@ -2247,4 +2247,247 @@ def colorText(text: str, color: str = "", style: str = "", bg: str = "") -> str:
 
 def printColor(text: str, color: str = "", style: str = "", bg: str = ""):
     """Print colored text to terminal."""
-    print(colorText(text, color, style, bg))
+    print(colorText(text, color, style, bg))
+
+
+# ======================================================== Logging ========================================================
+
+import logging as _logging
+
+
+class Logger:
+    """Simple logger that outputs to both console and file."""
+
+    def __init__(self, name: str = "app", file_path: str = None, level: int = _logging.INFO):
+        self._logger = _logging.getLogger(name)
+        self._logger.setLevel(level)
+        self._logger.handlers.clear()
+        fmt = _logging.Formatter("%(asctime)s [%(levelname)s] %(message)s", datefmt="%Y-%m-%d %H:%M:%S")
+        ch = _logging.StreamHandler()
+        ch.setFormatter(fmt)
+        self._logger.addHandler(ch)
+        if file_path:
+            fh = _logging.FileHandler(file_path, encoding="utf-8")
+            fh.setFormatter(fmt)
+            self._logger.addHandler(fh)
+
+    def info(self, msg: str):
+        self._logger.info(msg)
+
+    def debug(self, msg: str):
+        self._logger.debug(msg)
+
+    def warning(self, msg: str):
+        self._logger.warning(msg)
+
+    def error(self, msg: str):
+        self._logger.error(msg)
+
+    def critical(self, msg: str):
+        self._logger.critical(msg)
+
+
+def logTime(func):
+    """Decorator that logs function calls with arguments and return value."""
+    @functools.wraps(func)
+    def wrapper(*args, **kwargs):
+        arg_str = ", ".join([str(a) for a in args] + [f"{k}={v}" for k, v in kwargs.items()])
+        start = _time.perf_counter()
+        result = func(*args, **kwargs)
+        elapsed = _time.perf_counter() - start
+        print(f"[LOG] {func.__name__}({arg_str}) -> {result} ({elapsed:.4f}s)")
+        return result
+    return wrapper
+
+
+# ======================================================== Config ========================================================
+
+class Config:
+    """Simple configuration manager with JSON persistence."""
+
+    def __init__(self, path: str = "config.json"):
+        self.path = path
+        self._data = {}
+        if os.path.exists(path):
+            self._data = readJson(path)
+
+    def get(self, key: str, default=None):
+        """Get a config value. Supports dot notation (e.g., 'db.host')."""
+        keys = key.split(".")
+        val = self._data
+        for k in keys:
+            if isinstance(val, dict) and k in val:
+                val = val[k]
+            else:
+                return default
+        return val
+
+    def set(self, key: str, value):
+        """Set a config value. Supports dot notation."""
+        keys = key.split(".")
+        d = self._data
+        for k in keys[:-1]:
+            if k not in d or not isinstance(d[k], dict):
+                d[k] = {}
+            d = d[k]
+        d[keys[-1]] = value
+
+    def delete(self, key: str):
+        """Delete a config key."""
+        keys = key.split(".")
+        d = self._data
+        for k in keys[:-1]:
+            if isinstance(d, dict) and k in d:
+                d = d[k]
+            else:
+                return
+        d.pop(keys[-1], None)
+
+    def save(self):
+        """Save config to file."""
+        writeJson(self.path, self._data)
+
+    def reload(self):
+        """Reload config from file."""
+        if os.path.exists(self.path):
+            self._data = readJson(self.path)
+
+    def all(self) -> dict:
+        """Return all config data."""
+        return self._data.copy()
+
+    def __repr__(self):
+        return f"Config(path='{self.path}', keys={list(self._data.keys())})"
+
+
+# ======================================================== Validation (extended) ========================================================
+
+def isPhoneNumber(s: str) -> bool:
+    """Check if string is a valid Chinese phone number."""
+    return bool(re.match(r'^1[3-9]\d{9}$', s))
+
+
+def isDate(s: str, fmt: str = "%Y-%m-%d") -> bool:
+    """Check if string is a valid date in given format."""
+    try:
+        datetime.strptime(s, fmt)
+        return True
+    except ValueError:
+        return False
+
+
+def isHexColor(s: str) -> bool:
+    """Check if string is a valid hex color (#RGB or #RRGGBB)."""
+    return bool(re.match(r'^#([0-9a-fA-F]{3}|[0-9a-fA-F]{6})$', s))
+
+
+# ======================================================== File utilities ========================================================
+
+def listFiles(directory: str = ".", ext: str = None, recursive: bool = False) -> list[str]:
+    """List files in directory, optionally filtered by extension."""
+    result = []
+    if recursive:
+        for root, dirs, files in os.walk(directory):
+            for f in files:
+                if ext is None or f.endswith(ext):
+                    result.append(os.path.join(root, f))
+    else:
+        for f in os.listdir(directory):
+            full = os.path.join(directory, f)
+            if os.path.isfile(full):
+                if ext is None or f.endswith(ext):
+                    result.append(full)
+    return result
+
+
+def fileSize(path: str) -> str:
+    """Return human-readable file size."""
+    size = os.path.getsize(path)
+    for unit in ["B", "KB", "MB", "GB", "TB"]:
+        if size < 1024:
+            return f"{size:.1f} {unit}"
+        size /= 1024
+    return f"{size:.1f} PB"
+
+
+def ensureDir(path: str):
+    """Create directory if it doesn't exist."""
+    os.makedirs(path, exist_ok=True)
+
+
+# ======================================================== CLI interaction ========================================================
+
+def confirm(prompt: str, default: bool = False) -> bool:
+    """Ask user for yes/no confirmation."""
+    suffix = " [Y/n] " if default else " [y/N] "
+    answer = input(prompt + suffix).strip().lower()
+    if not answer:
+        return default
+    return answer in ("y", "yes")
+
+
+def askInput(prompt: str, default: str = "") -> str:
+    """Ask user for input with optional default value."""
+    if default:
+        result = input(f"{prompt} [{default}]: ").strip()
+        return result if result else default
+    return input(f"{prompt}: ").strip()
+
+
+def selectOption(prompt: str, options: list[str]) -> str:
+    """Show a menu and let user select an option."""
+    print(prompt)
+    for i, opt in enumerate(options, 1):
+        print(f"  {i}. {opt}")
+    while True:
+        choice = input("Enter number: ").strip()
+        if choice.isdigit() and 1 <= int(choice) <= len(options):
+            return options[int(choice) - 1]
+        print("Invalid choice, try again.")
+
+
+# ======================================================== Encryption ========================================================
+
+def encrypt(text: str, key: str) -> str:
+    """Simple XOR encryption, returns hex string."""
+    key_bytes = key.encode()
+    text_bytes = text.encode()
+    encrypted = bytes(t ^ key_bytes[i % len(key_bytes)] for i, t in enumerate(text_bytes))
+    return encrypted.hex()
+
+
+def decrypt(hex_str: str, key: str) -> str:
+    """Decrypt XOR encrypted hex string."""
+    key_bytes = key.encode()
+    data = bytes.fromhex(hex_str)
+    decrypted = bytes(d ^ key_bytes[i % len(key_bytes)] for i, d in enumerate(data))
+    return decrypted.decode()
+
+
+# ======================================================== Time utilities ========================================================
+
+def formatDuration(seconds: float) -> str:
+    """Format seconds into human-readable duration."""
+    if seconds < 60:
+        return f"{seconds:.1f}s"
+    minutes = int(seconds // 60)
+    secs = seconds % 60
+    if minutes < 60:
+        return f"{minutes}m {secs:.0f}s"
+    hours = minutes // 60
+    mins = minutes % 60
+    if hours < 24:
+        return f"{hours}h {mins}m {secs:.0f}s"
+    days = hours // 24
+    hrs = hours % 24
+    return f"{days}d {hrs}h {mins}m"
+
+
+def timestamp() -> float:
+    """Return current Unix timestamp."""
+    return _time.time()
+
+
+def parseDate(date_str: str, fmt: str = "%Y-%m-%d") -> datetime:
+    """Parse date string into datetime object."""
+    return datetime.strptime(date_str, fmt)

{eapytool-0.3.2 → eapytool-0.3.3}/tests/test_core.py

@@ -37,6 +37,12 @@ from eapy.core import (
     dotProduct, crossProduct, normalize,
     Storage,
     Color, colorText, printColor,
+    Logger, logTime,
+    Config,
+    isPhoneNumber, isDate, isHexColor,
+    listFiles, fileSize, ensureDir,
+    encrypt, decrypt,
+    formatDuration, timestamp, parseDate,
 )
 from math import pi
 import os
@@ -750,3 +756,136 @@ class TestColor:
         printColor("test", Color.YELLOW)
         captured = capsys.readouterr()
         assert "test" in captured.out
+
+
+# ======================================================== Logging ========================================================
+
+class TestLogging:
+    def test_logger(self, capsys):
+        logger = Logger("test")
+        logger.info("hello")
+        captured = capsys.readouterr()
+        assert "hello" in captured.err
+
+    def test_logTime(self, capsys):
+        @logTime
+        def add(a, b):
+            return a + b
+        result = add(1, 2)
+        assert result == 3
+        captured = capsys.readouterr()
+        assert "add" in captured.out
+        assert "LOG" in captured.out
+
+
+# ======================================================== Config ========================================================
+
+class TestConfig:
+    def setup_method(self):
+        self.cfg_path = ".test_config.json"
+        if os.path.exists(self.cfg_path):
+            os.remove(self.cfg_path)
+
+    def teardown_method(self):
+        if os.path.exists(self.cfg_path):
+            os.remove(self.cfg_path)
+
+    def test_set_get(self):
+        cfg = Config(self.cfg_path)
+        cfg.set("name", "test")
+        assert cfg.get("name") == "test"
+
+    def test_dot_notation(self):
+        cfg = Config(self.cfg_path)
+        cfg.set("db.host", "localhost")
+        assert cfg.get("db.host") == "localhost"
+
+    def test_save_reload(self):
+        cfg = Config(self.cfg_path)
+        cfg.set("key", "value")
+        cfg.save()
+        cfg2 = Config(self.cfg_path)
+        assert cfg2.get("key") == "value"
+
+    def test_delete(self):
+        cfg = Config(self.cfg_path)
+        cfg.set("a", 1)
+        cfg.delete("a")
+        assert cfg.get("a") is None
+
+
+# ======================================================== Validation (extended) ========================================================
+
+class TestValidationExtended:
+    def test_isPhoneNumber(self):
+        assert isPhoneNumber("13812345678") is True
+        assert isPhoneNumber("12345") is False
+
+    def test_isDate(self):
+        assert isDate("2024-01-15") is True
+        assert isDate("not-a-date") is False
+
+    def test_isHexColor(self):
+        assert isHexColor("#ff0000") is True
+        assert isHexColor("#f00") is True
+        assert isHexColor("red") is False
+
+
+# ======================================================== File utilities ========================================================
+
+class TestFileUtils:
+    def setup_method(self):
+        self.test_dir = ".test_file_utils"
+        ensureDir(self.test_dir)
+        with open(os.path.join(self.test_dir, "test.txt"), "w") as f:
+            f.write("hello")
+
+    def teardown_method(self):
+        if os.path.exists(self.test_dir):
+            shutil.rmtree(self.test_dir)
+
+    def test_listFiles(self):
+        files = listFiles(self.test_dir, ext=".txt")
+        assert len(files) == 1
+        assert files[0].endswith(".txt")
+
+    def test_fileSize(self):
+        path = os.path.join(self.test_dir, "test.txt")
+        size = fileSize(path)
+        assert "B" in size
+
+    def test_ensureDir(self):
+        new_dir = os.path.join(self.test_dir, "sub", "dir")
+        ensureDir(new_dir)
+        assert os.path.isdir(new_dir)
+
+
+# ======================================================== Encryption ========================================================
+
+class TestEncryption:
+    def test_encrypt_decrypt(self):
+        text = "hello world"
+        key = "secret"
+        encrypted = encrypt(text, key)
+        assert encrypted != text
+        decrypted = decrypt(encrypted, key)
+        assert decrypted == text
+
+
+# ======================================================== Time utilities ========================================================
+
+class TestTimeUtils:
+    def test_formatDuration(self):
+        assert formatDuration(30) == "30.0s"
+        assert formatDuration(90) == "1m 30s"
+        assert formatDuration(3661) == "1h 1m 1s"
+
+    def test_timestamp(self):
+        ts = timestamp()
+        assert ts > 0
+
+    def test_parseDate(self):
+        dt = parseDate("2024-01-15")
+        assert dt.year == 2024
+        assert dt.month == 1
+        assert dt.day == 15