✨ Add Windows and --details

savannahostrowski · savannahostrowski · commit 2c877ebd4b39 · 2025-10-26T13:33:29.000-07:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,7 +24,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v6
         with:
-          python-version: "3.12"
+          python-version: "3.13"
 
       - name: Build package
         run: uv build
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -19,14 +19,14 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v4
+        uses: astral-sh/setup-uv@v7
         with:
           enable-cache: true
 
       - name: Set up Python
         uses: actions/setup-python@v5
         with:
-          python-version: "3.12"
+          python-version: "3.13"
 
       - name: Install dependencies
         run: uv sync
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -14,7 +14,10 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
     steps:
       - uses: actions/checkout@v5
 
@@ -23,11 +26,12 @@ jobs:
         with:
             python-version: "3.13"
 
-      - name: Install system dependencies
+      - name: Install system dependencies (Linux only)
+        if: runner.os == 'Linux'
         run: sudo apt-get update && sudo apt-get install -y lsof
 
       - name: Install uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v7
         with:
             enable-cache: true
       - name: Install dependencies
diff --git a/.python-version b/.python-version
@@ -1 +1 @@
-3.14
+3.13
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 A tiny, beautiful TUI program for viewing and killing processes listening on ports.
 
-![Gruyère Screenshot](gruyere.gif)
+![Gruyère Screenshot](https://raw.githubusercontent.com/savannahostrowski/gruyere/main/gruyere.gif)
 
 **Install:**
 ```bash
@@ -15,7 +15,10 @@ pip install gruyere
 
 **Usage:**
 ```bash
-gruyere
+gruyere                    # Show processes with clean app names
+gruyere --details          # Show full command details
+gruyere --port 8000        # Filter by specific port
+gruyere --user username    # Filter by specific user
 ```
 
 ### Controls
@@ -29,14 +32,18 @@ gruyere
 ## Features
 
 - 🎨 Beautiful gradient UI with rich colors
-- 🔍 Filter processes by command name
+- 🔍 Filter processes by command name, port, or user
+- 📱 Clean app names by default, with optional `--details` flag to show full command strings
 - ⌨️ Vim-style navigation (j/k) or arrow keys
 - 💀 Kill processes with confirmation dialog
 - 📄 Pagination for many processes
 
 ## Requirements
 
-- macOS or Linux (uses `lsof`)
+- macOS, Linux, or Windows
+- Python 3.13+
+
+**Note:** On macOS, the program will run without elevated privileges but will only show processes owned by the current user. For system-wide process information, run with `sudo`. On Windows, you may need to run as Administrator to see all processes.
 
 ## License
 
diff --git a/gruyere/main.py b/gruyere/main.py
@@ -1,18 +1,19 @@
-from dataclasses import dataclass
+import os
 import signal
-import subprocess
 import sys
+from dataclasses import dataclass
 from typing import List, Optional
 
+import psutil
 import typer
-from readchar import readkey, key
+from readchar import key, readkey
+from rich import box
 from rich.color import Color
 from rich.console import Console, Group
 from rich.live import Live
-from rich.style import Style
 from rich.panel import Panel
+from rich.style import Style
 from rich.text import Text
-from rich import box
 
 
 @dataclass
@@ -21,6 +22,7 @@ class Process:
     port: int | str
     user: str
     command: str
+    name: str
 
 
 SELECTED_COLOR = Style(color="#EE6FF8", bold=True)
@@ -44,27 +46,108 @@ def parse_port(port_str: str) -> int | str:
         return port_str
 
 
-def get_processes() -> list[Process]:
-    raw_processes = subprocess.run(
-        ["lsof", "-i", "-P", "-n", "-sTCP:LISTEN"], capture_output=True, text=True
+def extract_app_name(command: str) -> str:
+    if not command or command == "N/A":
+        return command
+
+    # Handle macOS .app bundles - extract the main app name from the full command string
+    if ".app/" in command:
+        first_app_end = command.find(".app/") + 4
+        path_before_app = command[:first_app_end]
+        app_start = path_before_app.rfind("/")
+        if app_start != -1:
+            app_name = path_before_app[app_start + 1 :]
+            return app_name.replace(".app", "")
+
+    # For other executables, get the first word/path component
+    parts = command.split()
+    if not parts:
+        return command
+
+    executable = parts[0]
+    basename = os.path.basename(executable)
+
+    # Remove common helper suffixes for cleaner names
+    basename = (
+        basename.replace(" (Plugin)", "")
+        .replace(" (Renderer)", "")
+        .replace(" (GPU)", "")
     )
-    processes: list[Process] = []
 
-    for line in raw_processes.stdout.splitlines()[1:]:
-        parts = line.split()
-        if len(parts) >= 9:
-            pid = int(parts[1])
-            user = parts[2]
-            command = parts[0]
-            port = parse_port(parts[8].split(":")[-1])
-            process = Process(pid=pid, port=port, user=user, command=command)
-            processes.append(process)
+    return basename
+
 
+def get_processes() -> list[Process]:
+    """Get a list of processes with their associated ports."""
+    processes: list[Process] = []
+    try:
+        connections = psutil.net_connections(kind="inet")
+        for conn in connections:
+            if (
+                conn.laddr
+                and conn.status == psutil.CONN_LISTEN
+                and conn.pid is not None
+            ):
+                pid = conn.pid
+                port = parse_port(str(conn.laddr.port))
+                try:
+                    proc = psutil.Process(pid)
+                    user = proc.username()
+                    command = (
+                        " ".join(proc.cmdline()) if proc.cmdline() else proc.name()
+                    )
+                except (psutil.NoSuchProcess, psutil.AccessDenied):
+                    user = "N/A"
+                    command = "N/A"
+
+                name = extract_app_name(command)
+                processes.append(
+                    Process(pid=pid, port=port, user=user, command=command, name=name)
+                )
+    except psutil.AccessDenied:
+        # On macOS, net_connections() requires elevated privileges
+        # Fall back to checking each process individually
+        for proc in psutil.process_iter(["pid"]):
+            try:
+                pid = proc.info["pid"]
+                proc_connections = proc.net_connections(kind="inet")
+                for conn in proc_connections:
+                    if conn.laddr and conn.status == psutil.CONN_LISTEN:
+                        port = parse_port(str(conn.laddr.port))
+                        try:
+                            user = proc.username()
+                            # get last part of command line or name if empty
+                            command = (
+                                " ".join(proc.cmdline())
+                                if proc.cmdline()
+                                else proc.name()
+                            )
+                        except (psutil.NoSuchProcess, psutil.AccessDenied):
+                            user = "N/A"
+                            command = "N/A"
+
+                        name = extract_app_name(command)
+                        processes.append(
+                            Process(
+                                pid=pid,
+                                port=port,
+                                user=user,
+                                command=command,
+                                name=name,
+                            )
+                        )
+            except (psutil.NoSuchProcess, psutil.AccessDenied, psutil.ZombieProcess):
+                # Skip processes we can't access
+                continue
+
+    # Sort processes by port number (numeric ports first, then strings)
+    processes.sort(key=lambda p: (isinstance(p.port, str), p.port))
     return processes
 
 
 def kill_process(pid: int):
-    subprocess.run(["kill", "-9", str(pid)])
+    proc = psutil.Process(pid)
+    proc.kill()
 
 
 def _show_pagination_indicator(total: int, selected: int, panels: list[Panel | str]):
@@ -83,7 +166,9 @@ def _show_pagination_indicator(total: int, selected: int, panels: list[Panel | s
     panels.append(f"  [dim]{indicator}[/dim]")
 
 
-def _render_processes_table(processes: List[Process], selected: int):
+def _render_processes_table(
+    processes: List[Process], selected: int, show_details: bool = False
+):
     max_display = 4
 
     if len(processes) <= max_display:
@@ -107,10 +192,15 @@ def _render_processes_table(processes: List[Process], selected: int):
         indicator = "▐ " if i == display_selected else "  "
 
         port_line = f"{indicator}[bold]Port: {process.port} (PID: {process.pid})[/bold]"
-        user_line = (
-            f"{indicator}[dim]User: {process.user}, Command: {process.command}[/dim]"
-        )
-        content = f"{port_line}\n{user_line}"
+        app_line = f"{indicator}[dim]App: {process.name}, User: {process.user}[/dim]"
+
+        if show_details:
+            # Show clean name AND full command details
+            details_line = f"{indicator}[dim]Details: {process.command}[/dim]"
+            content = f"{port_line}\n{app_line}\n{details_line}"
+        else:
+            # Show just clean app name and user
+            content = f"{port_line}\n{app_line}"
 
         # All items get a panel with no border
         panel = Panel(
@@ -247,17 +337,14 @@ def main(
     refresh_rate: int = typer.Option(
         10, "--refresh-rate", "-r", help="Display refresh rate per second"
     ),
+    details: bool = typer.Option(
+        False, "--details", "-d", help="Show full command details instead of app name"
+    ),
 ):
     console = Console()
     text = _render_title()
     processes: list[Process] = get_processes()
 
-    if sys.platform.startswith("win"):
-        console.print(
-            "[red]Error:[/red] This program is only supported on Unix-like systems."
-        )
-        sys.exit(1)
-
     if port is not None:
         processes = [p for p in processes if p.port == port]
 
@@ -288,7 +375,7 @@ def main(
             )
 
         with Live(
-            _render_processes_table(processes, selected),
+            _render_processes_table(processes, selected, details),
             console=console,
             refresh_per_second=refresh_rate,
         ) as live:
@@ -298,7 +385,9 @@ def main(
                         is_filtering = False
                         filter_text = ""
                         processes = get_processes()
-                        live.update(_render_processes_table(processes, selected))
+                        live.update(
+                            _render_processes_table(processes, selected, details)
+                        )
                         continue
                     elif ch == key.UP or ch == "k":
                         selected = max(0, selected - 1)
@@ -331,7 +420,8 @@ def main(
                         border_style="magenta",
                     )
                     display = Group(
-                        filter_panel, _render_processes_table(processes, selected)
+                        filter_panel,
+                        _render_processes_table(processes, selected, details),
                     )
                     live.update(display)
                 else:
@@ -348,7 +438,8 @@ def main(
                             border_style="magenta",
                         )
                         display = Group(
-                            filter_panel, _render_processes_table(processes, selected)
+                            filter_panel,
+                            _render_processes_table(processes, selected, details),
                         )
                         live.update(display)
                         continue  # Skip the update at the end of the loop
@@ -359,7 +450,7 @@ def main(
                         # Exit live context to show confirmation view
                         process_to_kill = processes[selected]
                         break
-                    live.update(_render_processes_table(processes, selected))
+                    live.update(_render_processes_table(processes, selected, details))
 
         if process_to_kill is not None:
             _clear_screen()
diff --git a/pyproject.toml b/pyproject.toml
@@ -7,8 +7,9 @@ authors = [
     { name = "Savannah Ostrowski", email = "savannah@python.org" }
 ]
 license = { text = "MIT" }
-requires-python = ">=3.12"
+requires-python = ">=3.13"
 dependencies = [
+    "psutil>=7.1.2",
     "readchar>=4.2.1",
     "rich>=14.2.0",
     "typer>=0.15.1",
@@ -20,9 +21,10 @@ classifiers = [
     "Intended Audience :: Developers",
     "License :: OSI Approved :: MIT License",
     "Operating System :: MacOS",
+    "Operating System :: Microsoft :: Windows",
     "Operating System :: POSIX :: Linux",
     "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: System :: Monitoring",
     "Topic :: Utilities",
 ]
@@ -60,7 +62,13 @@ dev = [
     "ruff>=0.14.2",
 ]
 
+[tool.ruff]
+fix = true
+
+[tool.ruff.lint]
+select = ["I"]  # Enable isort rules for import sorting
+
 [tool.pyright]
 include = ["gruyere"]
 typeCheckingMode = "strict"
-pythonVersion = "3.12"
+pythonVersion = "3.13"
diff --git a/test_gruyere.py b/test_gruyere.py
diff --git a/uv.lock b/uv.lock
