ptn 0.1.4__py3-none-any.whl → 0.2.5__py3-none-any.whl

porterminal/config.py

@@ -1,12 +1,14 @@
 """Configuration loading and validation using Pydantic."""
 
+import os
 import shutil
-import sys
 from pathlib import Path
 
 import yaml
 from pydantic import BaseModel, Field, field_validator
 
+from porterminal.infrastructure.config import ShellDetector
+
 
 class ServerConfig(BaseModel):
     """Server configuration."""
@@ -37,67 +39,6 @@ class ShellConfig(BaseModel):
         raise ValueError(f"Shell executable not found: {v}")
 
 
-def detect_available_shells() -> list[ShellConfig]:
-    """Auto-detect available shells based on the platform."""
-    shells = []
-
-    if sys.platform == "win32":
-        # Windows shells
-        candidates = [
-            ("PowerShell", "powershell", "powershell.exe", ["-NoLogo"]),
-            ("PowerShell 7", "pwsh", "pwsh.exe", ["-NoLogo"]),
-            ("CMD", "cmd", "cmd.exe", []),
-            ("WSL", "wsl", "wsl.exe", []),
-            ("Git Bash", "gitbash", r"C:\Program Files\Git\bin\bash.exe", ["--login"]),
-        ]
-    else:
-        # Unix-like shells (Linux, macOS)
-        candidates = [
-            ("Bash", "bash", "bash", ["--login"]),
-            ("Zsh", "zsh", "zsh", ["--login"]),
-            ("Fish", "fish", "fish", []),
-            ("Sh", "sh", "sh", []),
-        ]
-
-    for name, shell_id, command, args in candidates:
-        # Check if shell exists
-        shell_path = shutil.which(command)
-        if shell_path or Path(command).exists():
-            shells.append(
-                ShellConfig(
-                    name=name,
-                    id=shell_id,
-                    command=shell_path or command,
-                    args=args,
-                )
-            )
-
-    return shells
-
-
-def get_default_shell_id() -> str:
-    """Get the default shell ID for the current platform."""
-    if sys.platform == "win32":
-        # Prefer PowerShell 7, then PowerShell, then CMD
-        if shutil.which("pwsh"):
-            return "pwsh"
-        if shutil.which("powershell"):
-            return "powershell"
-        return "cmd"
-    elif sys.platform == "darwin":
-        # macOS defaults to zsh
-        if shutil.which("zsh"):
-            return "zsh"
-        return "bash"
-    else:
-        # Linux - prefer bash
-        if shutil.which("bash"):
-            return "bash"
-        if shutil.which("zsh"):
-            return "zsh"
-        return "sh"
-
-
 class TerminalConfig(BaseModel):
     """Terminal configuration."""
 
@@ -118,7 +59,7 @@ class ButtonConfig(BaseModel):
     """Custom button configuration."""
 
     label: str
-    send: str
+    send: str | list[str | int] = ""  # string or list of strings/ints (ints = wait ms)
 
 
 class CloudflareConfig(BaseModel):
@@ -128,6 +69,13 @@ class CloudflareConfig(BaseModel):
     access_aud: str = ""
 
 
+class UpdateConfig(BaseModel):
+    """Update checker configuration."""
+
+    notify_on_startup: bool = True  # Show "update available" on startup
+    check_interval: int = Field(default=86400, ge=0)  # Seconds between checks (0 = always)
+
+
 class Config(BaseModel):
     """Application configuration."""
 
@@ -135,13 +83,46 @@ class Config(BaseModel):
     terminal: TerminalConfig = Field(default_factory=TerminalConfig)
     buttons: list[ButtonConfig] = Field(default_factory=list)
     cloudflare: CloudflareConfig = Field(default_factory=CloudflareConfig)
+    update: UpdateConfig = Field(default_factory=UpdateConfig)
+
+
+def find_config_file(cwd: Path | None = None) -> Path | None:
+    """Find config file in standard locations.
 
+    Search order:
+    1. PORTERMINAL_CONFIG_PATH env var (if set)
+    2. ptn.yaml in cwd
+    3. .ptn/ptn.yaml in cwd
+    4. ~/.ptn/ptn.yaml (user home directory)
+    """
+    # Check env var first
+    if env_path := os.environ.get("PORTERMINAL_CONFIG_PATH"):
+        return Path(env_path)
 
-def load_config(config_path: Path | str = "config.yaml") -> Config:
+    base = cwd or Path.cwd()
+
+    # Search order: cwd first, then home
+    candidates = [
+        base / "ptn.yaml",
+        base / ".ptn" / "ptn.yaml",
+        Path.home() / ".ptn" / "ptn.yaml",
+    ]
+
+    for path in candidates:
+        if path.exists():
+            return path
+
+    return None  # No config found, use defaults
+
+
+def load_config(config_path: Path | str | None = None) -> Config:
     """Load configuration from YAML file."""
-    config_path = Path(config_path)
+    if config_path is None:
+        config_path = find_config_file()
 
-    if not config_path.exists():
+    detector = ShellDetector()
+
+    if config_path is None or not Path(config_path).exists():
         data = {}
     else:
         with open(config_path, encoding="utf-8") as f:
@@ -162,10 +143,13 @@ def load_config(config_path: Path | str = "config.yaml") -> Config:
         except Exception:
             pass
 
-    # If no valid shells from config, auto-detect
+    # If no valid shells from config, auto-detect using ShellDetector
     if not valid_shells:
-        detected = detect_available_shells()
-        terminal_data["shells"] = [s.model_dump() for s in detected]
+        detected = detector.detect_shells()
+        terminal_data["shells"] = [
+            {"id": s.id, "name": s.name, "command": s.command, "args": list(s.args)}
+            for s in detected
+        ]
     else:
         terminal_data["shells"] = valid_shells
 
@@ -173,7 +157,7 @@ def load_config(config_path: Path | str = "config.yaml") -> Config:
     default_shell = terminal_data.get("default_shell", "")
     shell_ids = [s.get("id") or s.get("name", "").lower() for s in terminal_data.get("shells", [])]
     if not default_shell or default_shell not in shell_ids:
-        terminal_data["default_shell"] = get_default_shell_id()
+        terminal_data["default_shell"] = detector.get_default_shell_id()
         # Make sure the default shell is in the list
         if terminal_data["default_shell"] not in shell_ids and terminal_data.get("shells"):
             terminal_data["default_shell"] = terminal_data["shells"][0].get("id", "")

porterminal/container.py

@@ -52,14 +52,3 @@ class Container:
 
     # Working directory
     cwd: str | None = None
-
-    def get_shell(self, shell_id: str | None = None) -> ShellCommand | None:
-        """Get shell by ID or default."""
-        target_id = shell_id or self.default_shell_id
-
-        for shell in self.available_shells:
-            if shell.id == target_id:
-                return shell
-
-        # Return first available if target not found
-        return self.available_shells[0] if self.available_shells else None

porterminal/domain/__init__.py

@@ -15,7 +15,6 @@ from .entities import (
 
 # Ports
 from .ports import (
-    PTYFactory,
     PTYPort,
     SessionRepository,
     TabRepository,
@@ -87,5 +86,4 @@ __all__ = [
     "SessionRepository",
     "TabRepository",
     "PTYPort",
-    "PTYFactory",
 ]

porterminal/domain/entities/output_buffer.py

@@ -67,7 +67,3 @@ class OutputBuffer:
         """Clear the buffer."""
         self._buffer.clear()
         self._size = 0
-
-    def __len__(self) -> int:
-        """Return number of chunks in buffer."""
-        return len(self._buffer)

porterminal/domain/ports/__init__.py

@@ -1,6 +1,6 @@
 """Domain ports - interfaces for infrastructure to implement."""
 
-from .pty_port import PTYFactory, PTYPort
+from .pty_port import PTYPort
 from .session_repository import SessionRepository
 from .tab_repository import TabRepository
 
@@ -8,5 +8,4 @@ __all__ = [
     "SessionRepository",
     "TabRepository",
     "PTYPort",
-    "PTYFactory",
 ]

porterminal/domain/ports/pty_port.py

@@ -2,7 +2,6 @@
 
 from abc import ABC, abstractmethod
 
-from ..values.shell_command import ShellCommand
 from ..values.terminal_dimensions import TerminalDimensions
 
 
@@ -50,31 +49,3 @@ class PTYPort(ABC):
     def dimensions(self) -> TerminalDimensions:
         """Get current terminal dimensions."""
         ...
-
-
-class PTYFactory(ABC):
-    """Abstract interface for PTY creation.
-
-    Infrastructure provides platform-specific factory.
-    """
-
-    @abstractmethod
-    def create(
-        self,
-        shell: ShellCommand,
-        dimensions: TerminalDimensions,
-        environment: dict[str, str],
-        working_directory: str | None = None,
-    ) -> PTYPort:
-        """Create and spawn a new PTY.
-
-        Args:
-            shell: Shell command to run.
-            dimensions: Initial terminal dimensions.
-            environment: Sanitized environment variables.
-            working_directory: Optional working directory.
-
-        Returns:
-            PTY port implementation.
-        """
-        ...

porterminal/domain/ports/tab_repository.py

@@ -68,8 +68,3 @@ class TabRepository(ABC):
     def count_for_user(self, user_id: UserId) -> int:
         """Get tab count for a user."""
         ...
-
-    @abstractmethod
-    def all_tabs(self) -> list[Tab]:
-        """Get all tabs (for cleanup iteration)."""
-        ...

porterminal/infrastructure/config/__init__.py

@@ -1,9 +1,7 @@
 """Configuration infrastructure - loading and detection."""
 
 from .shell_detector import ShellDetector
-from .yaml_loader import YAMLConfigLoader
 
 __all__ = [
-    "YAMLConfigLoader",
     "ShellDetector",
 ]

porterminal/infrastructure/config/shell_detector.py

@@ -53,6 +53,7 @@ class ShellDetector:
                 ("PS", "powershell", "powershell.exe", ["-NoLogo"]),
                 ("CMD", "cmd", "cmd.exe", []),
                 ("WSL", "wsl", "wsl.exe", []),
+                ("Git Bash", "gitbash", r"C:\Program Files\Git\bin\bash.exe", ["--login"]),
             ]
         return [
             ("Bash", "bash", "bash", ["--login"]),

porterminal/infrastructure/repositories/in_memory_tab.py

@@ -118,7 +118,3 @@ class InMemoryTabRepository(TabRepository):
     def count_for_user(self, user_id: UserId) -> int:
         """Get tab count for a user."""
         return len(self._user_tabs.get(str(user_id), set()))
-
-    def all_tabs(self) -> list[Tab]:
-        """Get all tabs."""
-        return list(self._tabs.values())

porterminal/infrastructure/server.py

@@ -13,6 +13,12 @@ from rich.console import Console
 console = Console()
 
 
+def _is_icmp_warning(line: str) -> bool:
+    """Check if line is a harmless ICMP/ping warning from cloudflared."""
+    lower = line.lower()
+    return "icmp" in lower or "ping_group" in lower or "ping group" in lower
+
+
 def wait_for_server(host: str, port: int, timeout: int = 30) -> bool:
     """Wait for the server to be ready and verify it's Porterminal.
 
@@ -137,8 +143,8 @@ def start_cloudflared(port: int) -> tuple[subprocess.Popen, str | None]:
             url = match.group(0)
             break
 
-        # Also check for errors
-        if "error" in line.lower():
+        # Also check for errors (ignore ICMP/ping warnings - harmless)
+        if "error" in line.lower() and not _is_icmp_warning(line):
             console.print(f"[red]Cloudflared error:[/red] {line.strip()}")
 
     return process, url
@@ -155,7 +161,8 @@ def drain_process_output(process: subprocess.Popen) -> None:
             if not line:
                 break
             line = line.strip()
-            if line and "error" in line.lower():
+            # Print errors, but ignore harmless ICMP/ping warnings
+            if line and "error" in line.lower() and not _is_icmp_warning(line):
                 console.print(f"[red]{line}[/red]")
     except (OSError, ValueError):
         pass