daniel156161
0d5c49c19a
Testing / test (push) Failing after 10m21s
- compat.py → compat/ package: auth.py (auth-field normalizers), commands.py (command-format shims), __init__.py (re-exports) - Add _auth_0_9_3 transformer: normalizes pubkey to lowercase before auth so clients < 0.9.3 sending uppercase hex are accepted - adapt_auth() now called before auth check in serve.py; command extracted after adapt_auth so future transformers can rename commands safely - serve.py: deduplicate _recv_exact (import from client), unify resp/resp_payload across Windows/Unix branches, require lowercase hex pubkey (re.fullmatch), reorganize imports, drop unused os import - client.py: move payload/framed construction inside branches (remote path no longer serializes JSON it never uses); fix _is_valid_key_spec operator precedence; import MAX_MSG_BYTES from version_manager - auth.py: narrow except clause (ValueError instead of bare Exception) - Bump version 0.9.2 → 0.9.3 Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
84 lines
3.8 KiB
Python
84 lines
3.8 KiB
Python
import click
|
|
from urllib.parse import quote_plus
|
|
from browser_cli.commands import _handle
|
|
from rich.console import Console
|
|
|
|
console = Console()
|
|
|
|
ENGINES = {
|
|
"google": "https://www.google.com/search?q={query}",
|
|
"brave": "https://search.brave.com/search?q={query}",
|
|
"duckduckgo": "https://duckduckgo.com/?q={query}",
|
|
"ddg": "https://duckduckgo.com/?q={query}",
|
|
"youtube": "https://www.youtube.com/results?search_query={query}",
|
|
"yt": "https://www.youtube.com/results?search_query={query}",
|
|
"spotify": "https://open.spotify.com/search/{query}",
|
|
"amazon": "https://www.amazon.com/s?k={query}",
|
|
"ecosia": "https://www.ecosia.org/search?q={query}",
|
|
"furaffinity": "https://www.furaffinity.net/search/?q={query}",
|
|
"fa": "https://www.furaffinity.net/search/?q={query}",
|
|
"bing": "https://www.bing.com/search?q={query}",
|
|
"github": "https://github.com/search?q={query}",
|
|
"wikipedia": "https://en.wikipedia.org/wiki/Special:Search?search={query}",
|
|
"wiki": "https://en.wikipedia.org/wiki/Special:Search?search={query}",
|
|
"reddit": "https://www.reddit.com/search/?q={query}",
|
|
"stackoverflow": "https://stackoverflow.com/search?q={query}",
|
|
"so": "https://stackoverflow.com/search?q={query}",
|
|
}
|
|
|
|
_DISPLAY_NAMES = {
|
|
"google": "Google", "brave": "Brave Search", "duckduckgo": "DuckDuckGo",
|
|
"ddg": "DuckDuckGo", "youtube": "YouTube", "yt": "YouTube",
|
|
"spotify": "Spotify", "amazon": "Amazon", "ecosia": "Ecosia",
|
|
"furaffinity": "FurAffinity", "fa": "FurAffinity", "bing": "Bing",
|
|
"github": "GitHub", "wikipedia": "Wikipedia", "wiki": "Wikipedia",
|
|
"reddit": "Reddit", "stackoverflow": "Stack Overflow", "so": "Stack Overflow",
|
|
}
|
|
|
|
_SUBCOMMANDS = [
|
|
("google", "Search with Google."),
|
|
("brave", "Search with Brave Search."),
|
|
("duckduckgo", "Search with DuckDuckGo."),
|
|
("ddg", "Search with DuckDuckGo (alias for duckduckgo)."),
|
|
("youtube", "Search YouTube videos."),
|
|
("yt", "Search YouTube (alias for youtube)."),
|
|
("spotify", "Search Spotify."),
|
|
("amazon", "Search Amazon."),
|
|
("ecosia", "Search with Ecosia."),
|
|
("furaffinity", "Search FurAffinity."),
|
|
("fa", "Search FurAffinity (alias for furaffinity)."),
|
|
("bing", "Search with Bing."),
|
|
("github", "Search GitHub."),
|
|
("wikipedia", "Search Wikipedia."),
|
|
("wiki", "Search Wikipedia (alias for wikipedia)."),
|
|
("reddit", "Search Reddit."),
|
|
("stackoverflow", "Search Stack Overflow."),
|
|
("so", "Search Stack Overflow (alias for stackoverflow)."),
|
|
]
|
|
|
|
|
|
@click.group("search")
|
|
def search_group():
|
|
"""Search the web — open a query in a search engine."""
|
|
|
|
|
|
def _build_command(engine_key: str, help_text: str) -> click.Command:
|
|
@click.command(engine_key, help=help_text)
|
|
@click.argument("query", nargs=-1, required=True)
|
|
@click.option("--bg", is_flag=True, help="Open in background (no focus)")
|
|
@click.option("--window", "window", default=None, help="Open in named window")
|
|
@click.option("--group", "group", default=None, help="Open in tab group (name or ID)")
|
|
def _cmd(query, bg, window, group):
|
|
terms = " ".join(query)
|
|
url = ENGINES[engine_key].format(query=quote_plus(terms))
|
|
_handle("navigate.open", {"url": url, "background": bg, "window": window, "group": group})
|
|
suffix = f" in group '{group}'" if group else (f" in window '{window}'" if window else "")
|
|
display = _DISPLAY_NAMES.get(engine_key, engine_key.capitalize())
|
|
console.print(f"[green]Searching[/green] [cyan]{display}[/cyan]: {terms}{suffix}")
|
|
|
|
return _cmd
|
|
|
|
|
|
for _name, _help in _SUBCOMMANDS:
|
|
search_group.add_command(_build_command(_name, _help))
|