More refactor

Author: niechen

src/mcpm/commands/edit.py

@@ -12,7 +12,7 @@
 from rich.prompt import Confirm
 
 from mcpm.clients.client_registry import ClientRegistry
-from mcpm.utils.display import print_server_config
+from mcpm.utils.display import print_client_error, print_error, print_server_config
 
 console = Console()
 
@@ -39,16 +39,15 @@ def edit():
 
     # Check if client is supported
     if client_manager is None:
-        console.print("[bold red]Error:[/] Unsupported active client")
-        console.print("Please switch to a supported client using 'mcpm client <client-name>'")
+        print_client_error(client_name)
         return
 
     # Get the client config file path
     config_path = client_manager.config_path
 
     # Check if the client is installed
     if not client_manager.is_client_installed():
-        console.print(f"[bold red]Error:[/] {client_name} installation not detected.")
+        print_error(f"{client_name} installation not detected.")
         return
 
     # Check if config file exists
@@ -87,7 +86,7 @@ def edit():
             console.print("[green]Successfully created config file![/]\n")
             config_exists = True
         except Exception as e:
-            console.print(f"[bold red]Error creating config file:[/] {str(e)}")
+            print_error("Error creating config file", str(e))
             return
 
     # Show the current configuration if it exists
@@ -117,7 +116,7 @@ def edit():
                 console.print("[yellow]Warning: Config file contains invalid JSON[/]")
 
         except Exception as e:
-            console.print(f"[bold red]Error reading config file:[/] {str(e)}")
+            print_error("Error reading config file", str(e))
 
     # Prompt to edit if file exists
     should_edit = False
@@ -137,5 +136,5 @@ def edit():
 
             console.print(f"[italic]After editing, {client_name} must be restarted for changes to take effect.[/]")
         except Exception as e:
-            console.print(f"[bold red]Error opening editor:[/] {str(e)}")
+            print_error("Error opening editor", str(e))
             console.print(f"You can manually edit the file at: {config_path}")

src/mcpm/commands/search.py

@@ -4,8 +4,8 @@
 
 import click
 from rich.console import Console
-from rich.table import Table
 
+from mcpm.utils.display import print_error, print_servers_table
 from mcpm.utils.repository import RepositoryManager
 
 console = Console()
@@ -50,37 +50,13 @@ def search(query, detailed=False):
         if detailed:
             _display_detailed_results(servers)
         else:
-            _display_table_results(servers)
+            print_servers_table(servers)
 
         # Show summary count
         console.print(f"\n[green]Found {len(servers)} server(s) matching search criteria[/]")
 
     except Exception as e:
-        console.print(f"[bold red]Error searching for servers:[/] {str(e)}")
-
-
-def _display_table_results(servers):
-    """Display search results in a compact table"""
-    table = Table(show_header=True, header_style="bold")
-    table.add_column("Name", style="cyan")
-    table.add_column("Description")
-    table.add_column("Categories/Tags", overflow="fold")
-
-    for server in sorted(servers, key=lambda s: s["name"]):
-        # Get server data
-        name = server["name"]
-        display_name = server.get("display_name", name)
-        description = server.get("description", "No description")
-
-        # Build categories and tags
-        categories = server.get("categories", [])
-        tags = server.get("tags", [])
-        meta_info = ", ".join([f"[dim]{c}[/]" for c in categories] + [f"[dim]{t}[/]" for t in tags])
-
-        # Add row to table
-        table.add_row(f"{display_name}\n[dim]({name})[/]", description, meta_info)
-
-    console.print(table)
+        print_error("Error searching for servers", str(e))
 
 
 def _display_detailed_results(servers):

src/mcpm/utils/display.py

@@ -4,6 +4,7 @@
 
 from rich.console import Console
 from rich.markup import escape
+from rich.table import Table
 
 console = Console()
 
@@ -43,3 +44,53 @@ def print_server_config(server_name, server_info, is_stashed=False):
 
     # Add a separator line between servers
     console.print("  " + "-" * 50)
+
+
+def print_servers_table(servers):
+    """Display a formatted table of server information.
+
+    Args:
+        servers: List of server dictionaries containing server information
+    """
+    table = Table(show_header=True, header_style="bold")
+    table.add_column("Name", style="cyan")
+    table.add_column("Description")
+    table.add_column("Categories/Tags", overflow="fold")
+
+    for server in sorted(servers, key=lambda s: s["name"]):
+        # Get server data
+        name = server["name"]
+        display_name = server.get("display_name", name)
+        description = server.get("description", "No description")
+
+        # Build categories and tags
+        categories = server.get("categories", [])
+        tags = server.get("tags", [])
+        meta_info = ", ".join([f"[dim]{c}[/]" for c in categories] + [f"[dim]{t}[/]" for t in tags])
+
+        # Add row to table
+        table.add_row(f"{display_name}\n[dim]({name})[/]", description, meta_info)
+
+    console.print(table)
+
+
+def print_error(message, details=None):
+    """Print a standardized error message.
+
+    Args:
+        message: The main error message
+        details: Optional additional error details
+    """
+    console.print(f"[bold red]Error:[/] {message}")
+    if details:
+        console.print(f"[red]{details}[/]")
+
+
+def print_client_error(client_name):
+    """Print a standardized client-related error message.
+
+    Args:
+        client_name: Name of the client that caused the error
+    """
+    console.print(f"[bold red]Error:[/] Unsupported active client")
+    console.print(f"Please switch to a supported client using 'mcpm client <client-name>'")

tests/test_search.py

@@ -144,7 +144,8 @@ def test_search_error_handling(monkeypatch):
     result = runner.invoke(search, [])
 
     assert result.exit_code == 0
-    assert "Error searching for servers: Test error" in result.output
+    assert "Error: Error searching for servers" in result.output
+    assert "Test error" in result.output
     mock_repo_manager.search_servers.assert_called_once_with(None)