mikancli 0.2.0__tar.gz → 0.2.2__tar.gz

{mikancli-0.2.0 → mikancli-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mikancli
-Version: 0.2.0
+Version: 0.2.2
 Summary: CLI foundation for building qBittorrent RSS rules from anime search input.
 Author: metails
 Project-URL: Repository, https://github.com/JianHua-Deng/MikanCli
@@ -20,11 +20,12 @@ Classifier: Topic :: Utilities
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: InquirerPy>=0.3
+Requires-Dist: prompt-toolkit<4,>=3.0.52
 Requires-Dist: rich>=14.0
 
 # MikanCli
 
-Language: [English](README.md) | [简体中文](README.zh-CN.md)
+Language: [简体中文](README.md) | [English](README.en.md)
 
 MikanCli is a Python command-line tool for finding bangumi/anime on Mikanani.me, choosing the correct Bangumi and subgroup RSS feed, and turning that selection into a qBittorrent RSS download rule.
 
@@ -43,6 +44,12 @@ It supports both a guided interactive flow and a JSON preview mode for scripting
 - Submit RSS feeds and auto-download rules to qBittorrent, then verify that qBittorrent saved them
 - Print rule drafts as JSON without submitting anything
 
+## Screenshots
+
+![Search input (demo data)](docs/images/search-input.png)
+
+![RSS feed preview (demo data)](docs/images/feed-preview.png)
+
 ## Requirements
 
 - Python 3.10 or newer

mikancli-0.2.0/README.md → mikancli-0.2.2/README.en.md

@@ -1,6 +1,6 @@
 # MikanCli
 
-Language: [English](README.md) | [简体中文](README.zh-CN.md)
+Language: [简体中文](README.md) | [English](README.en.md)
 
 MikanCli is a Python command-line tool for finding bangumi/anime on Mikanani.me, choosing the correct Bangumi and subgroup RSS feed, and turning that selection into a qBittorrent RSS download rule.
 
@@ -19,6 +19,12 @@ It supports both a guided interactive flow and a JSON preview mode for scripting
 - Submit RSS feeds and auto-download rules to qBittorrent, then verify that qBittorrent saved them
 - Print rule drafts as JSON without submitting anything
 
+## Screenshots
+
+![Search input (demo data)](docs/images/search-input.png)
+
+![RSS feed preview (demo data)](docs/images/feed-preview.png)
+
 ## Requirements
 
 - Python 3.10 or newer

mikancli-0.2.2/README.md

@@ -0,0 +1,227 @@
+# MikanCli
+
+语言：[简体中文](README.md) | [English](README.en.md)
+
+MikanCli 是一个 Python 命令行工具，可以在 Mikanani.me 上搜索番剧/动画，选定对应的 Bangumi 条目和字幕组 RSS 订阅，并据此生成 qBittorrent 的 RSS 下载规则。
+
+它既提供引导式交互流程，也支持用于脚本或检查的 JSON 预览模式。目前交互式流程是功能最完整的模式。
+
+## 功能
+
+- 按动画标题或关键词搜索 Mikan
+- 从匹配的 Bangumi 结果和字幕组 RSS 订阅中进行选择
+- 在确认订阅前分页预览最近的 RSS 条目
+- 使用 Rich 显示规则摘要、订阅预览和状态消息，并在网络请求期间显示加载指示器
+- 使用包含和排除过滤条件生成 qBittorrent RSS 规则
+- 按最低集数过滤动画发布标题
+- 选择并保存默认下载文件夹
+- 通过命令行配置 qBittorrent WebUI 访问
+- 将 RSS 订阅和自动下载规则提交到 qBittorrent，并验证 qBittorrent 已保存这些内容
+- 以 JSON 形式输出规则草稿，不提交任何内容
+
+## 界面预览
+
+![搜索输入框（演示数据）](docs/images/search-input.png)
+
+![RSS 订阅预览（演示数据）](docs/images/feed-preview.png)
+
+## 环境要求
+
+- Python 3.10 或更新版本
+- `pipx`，用于将 MikanCli 安装为独立命令行应用
+- qBittorrent，如果你希望 MikanCli 自动提交 RSS 订阅和规则
+
+## 快速开始 | 安装
+
+推荐使用 `pipx` 安装 MikanCli，这样可以在任意终端中直接使用。
+如果已经安装 `pipx`，可以跳过以下两条命令：
+
+```bash
+python -m pip install --user pipx           # 为当前用户安装 pipx
+python -m pipx ensurepath                   # 将 pipx 可执行文件目录添加到 PATH
+```
+
+运行 `pipx ensurepath` 后，请重新打开一个终端，然后执行：
+
+```bash
+pipx install mikancli
+```
+
+## 使用方法
+
+安装完成后，运行以下命令，并按菜单提示操作：
+
+```bash
+mikancli
+```
+
+## 通过克隆仓库安装
+
+从本地克隆安装：
+
+```bash
+git clone https://github.com/JianHua-Deng/MikanCli.git
+cd MikanCli
+python -m pipx install -e .
+```
+
+开发时也可以使用可编辑模式的 `pip` 安装：
+
+```bash
+python -m pip install -e .
+python -m mikancli
+```
+
+依赖项（包括用于输出的 Rich 和用于交互提示的 InquirerPy）声明在 `pyproject.toml` 中，由 `pip` 或 `pipx` 安装。MikanCli 运行时不会安装依赖包。
+
+如果已有可编辑模式的 `pip` 安装，在拉取依赖变更后，需要在原环境中重新运行 `python -m pip install -e .`。通过 `pipx` 安装的应用应使用 `pipx` 更新，以确保依赖仍安装在应用自己的环境中。
+
+## 终端输出
+
+Rich 负责显示规则摘要、订阅预览和反馈消息，InquirerPy 负责菜单和文本输入。发布标题中的方括号会原样显示；较长的标题、URL 和路径会按终端宽度自动换行。
+
+交互式终端会在网络请求期间显示加载指示器，并在提示输入前或请求失败后停止。输出被重定向时，会改用静态状态消息，订阅预览仍保留纯文本布局。
+
+在 PowerShell 中禁用 Rich 颜色：
+
+```powershell
+$env:NO_COLOR = "1"
+mikancli
+```
+
+使用 `Remove-Item Env:NO_COLOR` 移除此设置。粗体、暗色样式和加载动画可能仍会显示；菜单样式由 InquirerPy 单独管理。
+
+`--json` 草稿模式只输出一个 JSON 文档，不使用 Rich 格式，也不显示进度消息。
+
+## 引导式流程
+
+不带参数运行 `mikancli` 时，首先会看到菜单，可选择：
+
+- 搜索动画
+- 修改 qBittorrent 配置
+- 切换语言
+- 退出 MikanCli
+
+搜索流程依次为：
+
+1. 输入动画标题或关键词
+2. 在 Mikan 上搜索匹配的 Bangumi 条目
+3. 选择正确的 Bangumi 条目
+4. 从所选 Bangumi 页面获取字幕组 RSS 订阅
+5. 选择字幕组
+6. 预览最近的 RSS 订阅条目
+7. 设置包含、排除和最低集数过滤条件
+8. 选择下载保存位置
+9. 生成规则草稿
+10. 将订阅和规则提交到 qBittorrent
+11. 通过 qBittorrent WebUI API 验证订阅和规则已保存
+
+在需要输入文本的交互提示中，可输入 `exit` 或 `quit` 退出；菜单中也会提供退出选项。
+
+## qBittorrent 设置
+
+在 MikanCli 提交订阅或规则之前，需要先启用 qBittorrent WebUI：
+
+1. 打开 qBittorrent 设置
+2. 启用 WebUI 或远程控制
+3. 确认 WebUI 地址、用户名和密码。地址为空通常表示 `http://localhost:[port]`
+4. 运行 `mikancli --setup-qbittorrent`
+
+设置说明：
+
+- URL 直接按 Enter 将使用 `http://localhost:8080`
+- 输入 `localhost:8080` 会自动规范化为 `http://localhost:8080`
+- 如果 qBittorrent WebUI 允许 localhost 免认证访问，用户名和密码可以留空
+- 如果 qBittorrent 拒绝连接，请重新检查 qBittorrent 设置中的 WebUI 端口和凭据
+
+## 配置
+
+MikanCli 将配置保存在 JSON 文件中：
+
+- Windows：`%APPDATA%\Roaming\MikanCli\config.json`
+
+保存的设置可包括：
+
+- 默认下载文件夹
+- 语言偏好
+- qBittorrent WebUI URL
+- qBittorrent 用户名和密码
+- qBittorrent 分类
+- qBittorrent 是否以暂停状态添加匹配的种子
+
+qBittorrent 密码会保存在配置文件中，以便 MikanCli 后续运行时提交规则。在共享机器上请妥善保护该文件。
+
+## 语言支持
+
+MikanCli 的面向用户 CLI 文本支持英文和简体中文，包括交互菜单、提示、设置说明、摘要和帮助文本。命令名、选项名、JSON 字段名、Mikan 标题、字幕组名称、URL 和 qBittorrent API 数据保持固定，不随语言变化。
+
+语言选择优先级如下：
+
+1. `--language en` 或 `--language zh-CN`
+2. `MIKANCLI_LANG=en` 或 `MIKANCLI_LANG=zh-CN`
+3. 已保存的配置值
+4. 默认回退到英文
+
+交互式用户可随时从启动菜单切换语言。所选语言会保存到配置文件，供后续运行使用。
+
+## 项目结构
+
+```text
+mikancli/
+  cli/             CLI 入口、提示和交互流程
+  core/            数据类、规范化和规则生成逻辑
+  integrations/    Mikan 和 qBittorrent 适配器
+  config.py        用户配置和文件夹选择辅助函数
+  display.py       Rich 摘要、订阅预览、反馈和加载指示器
+```
+
+控制台命令在 `pyproject.toml` 中声明：
+
+```toml
+[project.scripts]
+mikancli = "mikancli.cli.entrypoint:main"
+```
+
+## 命令用法
+
+```text
+usage: mikancli [-h] [--include INCLUDE] [--exclude EXCLUDE]
+                [--min-episode MIN_EPISODE] [--save-path SAVE_PATH] [--json]
+                [--setup-qbittorrent] [--language {en,zh-CN}] [--version]
+                [keyword]
+```
+
+选项：
+
+- `keyword`：动画标题或搜索短语
+- `--include VALUE`：要求已接受的发布标题中包含某个词或短语。可重复传入多个值
+- `--exclude VALUE`：拒绝标题中包含某个词或短语的发布。可重复传入多个值
+- `--min-episode NUMBER`：只接受达到此集数或更高集数的动画发布标题
+- `--save-path PATH`：为生成的 qBittorrent 规则使用该基础下载文件夹
+- `--json`：以 JSON 形式输出规则草稿。此模式不会提交到 qBittorrent
+- `--setup-qbittorrent`：配置并验证 qBittorrent WebUI 设置
+- `--language {en,zh-CN}`：为本次运行选择 CLI 语言
+- `--version`：输出已安装的 CLI 版本
+
+## 最低集数过滤
+
+当 RSS 条目标题采用常见动画格式，在集数前使用短横线或用方括号标注集数时，可以使用 `--min-episode`：
+
+```text
+[SubsPlease] One Piece - 1126 (1080p)
+[Skymoon-Raws][One Piece][1126][ViuTV][WEB-RIP][CHT][SRT][1080p][MKV]
+```
+
+例如：
+
+```bash
+mikancli "one piece" --include SubsPlease --min-episode 1126
+```
+
+MikanCli 会将最低集数转换为 qBittorrent 规则 `mustContain` 字段中的正则表达式，并启用 `useRegex`。普通的 `--include` 和 `--exclude` 值仍按字面词或短语处理；只有标题中包含所有 include 值，qBittorrent 才会视为匹配。
+
+提交最低集数规则时，MikanCli 会检查 qBittorrent 的 RSS 条目保留上限。如果 qBittorrent 每个订阅保留的条目少于 500 条，MikanCli 会询问是否调高该设置，以便 qBittorrent 能看到足够多的 Mikan 订阅条目来匹配较新的集数。
+
+## 发布
+
+仓库包含 GitHub Actions 工作流 `.github/workflows/publish.yml`。当 `main` 分支中 `pyproject.toml` 的包版本发生变化时，该工作流会发布到 PyPI。

{mikancli-0.2.0 → mikancli-0.2.2}/mikancli/cli/entrypoint.py

@@ -31,7 +31,7 @@ from mikancli.config import get_config_path, load_config, save_config
 from mikancli.core.models import AppConfig, RuleDraft, SearchRequest
 from mikancli.core.normalize import collapse_spaces
 from mikancli.core.rules import build_rule_draft
-from mikancli.display import print_message, print_text_summary
+from mikancli.display import print_message, print_section, print_text_summary
 from mikancli.i18n import (
     LANGUAGE_LABELS,
     SUPPORTED_LANGUAGES,
@@ -143,6 +143,7 @@ def resolve_startup_language(requested_language: str | None, config: AppConfig)
 
 
 def prompt_startup_action() -> str:
+    print_section("MikanCli")
     return select_option(
         t("startup.choose_action"),
         [
@@ -156,6 +157,7 @@ def prompt_startup_action() -> str:
 
 
 def run_language_configuration_flow(config: AppConfig, config_path: Path) -> AppConfig:
+    print_section(t("startup.language"))
     selected_language = select_option(
         t("language.choose"),
         [(language, LANGUAGE_LABELS[language]) for language in SUPPORTED_LANGUAGES],
@@ -194,6 +196,8 @@ def build_interactive_draft(args: argparse.Namespace, *, config: AppConfig,confi
 
     bangumi, subgroup = run_interactive_selection(initial_keyword=args.keyword)
 
+    if not args.include or not args.exclude or args.min_episode is None:
+        print_section(t("ui.filters"))
     include_words = tuple(args.include) or prompt_word_list(
         t("filters.include_prompt")
     )
@@ -206,6 +210,7 @@ def build_interactive_draft(args: argparse.Namespace, *, config: AppConfig,confi
             t("filters.min_episode_prompt"),
             field_name=t("filters.min_episode_field"),
         )
+    print_section(t("ui.save_path"))
     save_path = resolve_save_path(
         args.save_path,
         config,

{mikancli-0.2.0 → mikancli-0.2.2}/mikancli/cli/input_parsing.py

@@ -6,9 +6,9 @@ from mikancli.display import print_message
 from mikancli.i18n import t
 
 
-def prompt_required_text(prompt: str) -> str:
+def prompt_required_text(prompt: str, *, boxed: bool = False) -> str:
     while True:
-        entered = collapse_spaces(prompt_text(prompt, allow_exit=True))
+        entered = collapse_spaces(prompt_text(prompt, allow_exit=True, boxed=boxed))
         if entered:
             return entered
         print_message(t("common.value_required"), style="warning")

{mikancli-0.2.0 → mikancli-0.2.2}/mikancli/cli/prompts.py

@@ -4,12 +4,12 @@ from collections.abc import Iterable
 from typing import Any, TypeVar
 
 from mikancli.core.normalize import collapse_spaces
+from mikancli.display import PRIMARY_COLOR, console
 from mikancli.i18n import t
 
 T = TypeVar("T")
 EXIT_OPTION = "__exit_cli__"
 EXIT_TEXT_VALUES = {"exit", "quit"}
-PROMPT_SEPARATOR = "----------------------------------------"
 MENU_SEPARATOR_LABEL = ""
 
 
@@ -39,8 +39,18 @@ def get_separator_class():
     return Separator
 
 
+def get_prompt_style():
+    from InquirerPy import get_style
+
+    return get_style({
+        "questionmark": PRIMARY_COLOR, "question": "bold",
+        "answermark": PRIMARY_COLOR, "answer": PRIMARY_COLOR, "input": PRIMARY_COLOR,
+        "pointer": f"bold {PRIMARY_COLOR}", "fuzzy_border": PRIMARY_COLOR,
+    }, style_override=False)
+
+
 def prepare_prompt_message(message: str) -> str:
-    print(PROMPT_SEPARATOR)
+    console.print()
     return message.strip("\n")
 
 
@@ -86,6 +96,8 @@ def select_option(
         pointer=">",
         instruction=t("common.use_arrow_keys"),
         max_height="70%",
+        style=get_prompt_style(),
+        border=len(options) > 2,
         cycle=True,
     )
     selected = prompt.execute()
@@ -94,14 +106,18 @@ def select_option(
     return selected
 
 
-def prompt_text(message: str, *, default: str | None = None, allow_exit: bool = False) -> str:
+def prompt_text(message: str, *, default: str | None = None, allow_exit: bool = False, boxed: bool = False) -> str:
 
     inquirer = get_inquirer()
 
     prompt = inquirer.text(
         message=prepare_prompt_message(message),
         default=default or "",
+        style=get_prompt_style(),
     )
+    if boxed and console.is_terminal:
+        # InquirerPy wraps PromptSession; its native frame preserves input editing.
+        prompt._session.show_frame = True
     entered = collapse_spaces(prompt.execute())
     if allow_exit and entered.casefold() in EXIT_TEXT_VALUES:
         raise ExitRequested()
@@ -113,9 +129,9 @@ def prompt_password(message: str, *, allow_exit: bool = False) -> str:
     inquirer = get_inquirer()
     prompt_factory = getattr(inquirer, "secret", None)
     if prompt_factory is not None:
-        prompt = prompt_factory(message=prepare_prompt_message(message))
+        prompt = prompt_factory(message=prepare_prompt_message(message), style=get_prompt_style())
     else:  # pragma: no cover - fallback for alternate InquirerPy versions
-        prompt = inquirer.text(message=prepare_prompt_message(message), secret=True)
+        prompt = inquirer.text(message=prepare_prompt_message(message), secret=True, style=get_prompt_style())
 
     entered = prompt.execute()
     if allow_exit and entered.strip().casefold() in EXIT_TEXT_VALUES:

{mikancli-0.2.0 → mikancli-0.2.2}/mikancli/cli/qbittorrent_flow.py

@@ -6,7 +6,7 @@ from mikancli.cli.prompts import confirm_choice, prompt_password, prompt_text
 from mikancli.config import save_config
 from mikancli.core.models import AppConfig, QBittorrentSettings, RuleDraft
 from mikancli.core.normalize import collapse_spaces, sanitize_folder_name
-from mikancli.display import loading, print_message
+from mikancli.display import loading, print_message, print_section
 from mikancli.i18n import t
 from mikancli.integrations.qbittorrent import (
     MIN_RSS_ARTICLES_FOR_EPISODE_FILTER,
@@ -28,15 +28,10 @@ QBITTORRENT_ERROR = 3
 
 def setup_qbittorrent(config: AppConfig, config_path: Path) -> int:
     """Prompt for qBittorrent WebUI settings, verify the connection, and save them on success. Returns QBITTORRENT_SETUP_SUCCESS when verification succeeds and QBITTORRENT_ERROR when qBittorrent rejects or cannot be reached."""
-    print()
-    print(t("qb.setup.title"))
-    print(t("qb.setup.step1"))
-    print(t("qb.setup.step2"))
-    print(t("qb.setup.step3"))
-    print(t("qb.setup.step4"))
-    print(t("qb.setup.step5"))
-    print("------------------------------------------")
-    print()
+    print_section(
+        t("qb.setup.title").strip("- "),
+        "\n".join(t(f"qb.setup.step{step}") for step in range(1, 6)),
+    )
 
     default_url = config.qbittorrent_url or "http://localhost:8080"
     entered_url = (
@@ -208,6 +203,7 @@ def prompt_to_submit_rule_to_qbittorrent(config: AppConfig, draft: RuleDraft,) -
     if not config.qbittorrent_url:
         return QBITTORRENT_NOT_CONFIGURED
 
+    print_section("qBittorrent")
     should_submit = confirm_choice(
         t("qb.submit.continue"),
         default=True,

{mikancli-0.2.0 → mikancli-0.2.2}/mikancli/cli/search_flow.py

@@ -14,6 +14,7 @@ from mikancli.display import (
     loading,
     print_feed_preview_page,
     print_message,
+    print_section,
 )
 from mikancli.i18n import t
 from mikancli.integrations.mikan import (
@@ -36,8 +37,13 @@ def search_prompt(*, retry: bool = False) -> str:
     return t("search.prompt_retry" if retry else "search.prompt")
 
 
+def prompt_search_keyword(*, retry: bool = False) -> str:
+    return prompt_required_text(search_prompt(retry=retry), boxed=True)
+
+
 def select_candidate_or_search_again(candidates: tuple[MikanBangumi, ...], *, keyword: str) -> MikanBangumi | str:
 
+    print_section(t("ui.search_results"), keyword)
     options: list[tuple[int | str, str]] = [
         (index, f"{candidate.title} (Bangumi {candidate.bangumi_id})")
         for index, candidate in enumerate(candidates)
@@ -60,6 +66,7 @@ def select_candidate_or_search_again(candidates: tuple[MikanBangumi, ...], *, ke
 def select_subgroup_or_navigate(subgroups: tuple[MikanSubgroup, ...], *, bangumi_title: str) -> MikanSubgroup | str:
     """Ask the user to choose a subgroup RSS feed or navigate back through the search flow. Returns a MikanSubgroup, BACK_TO_CANDIDATES, or SEARCH_AGAIN based on the user's decision."""
 
+    print_section(t("ui.subgroups"), bangumi_title)
     options: list[tuple[int | str, str]] = [
         (index, f"{subgroup.title} (Subgroup {subgroup.subgroup_id})")
         for index, subgroup in enumerate(subgroups)
@@ -176,7 +183,7 @@ def run_interactive_selection(*, initial_keyword: str | None) -> tuple[MikanBang
     
     keyword = collapse_spaces(initial_keyword or "")
     if not keyword:
-        keyword = prompt_required_text(search_prompt())
+        keyword = prompt_search_keyword()
 
     while True:
         try:
@@ -184,17 +191,17 @@ def run_interactive_selection(*, initial_keyword: str | None) -> tuple[MikanBang
                 candidates = search_mikan_bangumi(keyword)
         except MikanLookupError as exc:
             print_message(str(exc), style="error")
-            keyword = prompt_required_text(search_prompt(retry=True))
+            keyword = prompt_search_keyword(retry=True)
             continue
 
         if not candidates:
             print_message(t("search.no_results", keyword=keyword), style="warning")
-            keyword = prompt_required_text(search_prompt(retry=True))
+            keyword = prompt_search_keyword(retry=True)
             continue
 
         selected_candidate = select_candidate_or_search_again(candidates, keyword=keyword)
         if selected_candidate == SEARCH_AGAIN:
-            keyword = prompt_required_text(search_prompt(retry=True))
+            keyword = prompt_search_keyword(retry=True)
             continue
 
         bangumi = selected_candidate
@@ -219,7 +226,7 @@ def run_interactive_selection(*, initial_keyword: str | None) -> tuple[MikanBang
             if selected_subgroup == BACK_TO_CANDIDATES:
                 break
             if selected_subgroup == SEARCH_AGAIN:
-                keyword = prompt_required_text(search_prompt(retry=True))
+                keyword = prompt_search_keyword(retry=True)
                 break
 
             subgroup = selected_subgroup
@@ -235,7 +242,7 @@ def run_interactive_selection(*, initial_keyword: str | None) -> tuple[MikanBang
             if decision == BACK_TO_SUBGROUPS:
                 continue
             if decision == REJECT_SUBGROUP:
-                keyword = prompt_required_text(search_prompt(retry=True))
+                keyword = prompt_search_keyword(retry=True)
                 break
 
             return bangumi, subgroup

{mikancli-0.2.0 → mikancli-0.2.2}/mikancli/display.py

@@ -3,7 +3,9 @@ from __future__ import annotations
 from contextlib import AbstractContextManager, nullcontext
 from datetime import datetime
 
-from rich.console import Console
+from rich.console import Console, Group
+from rich.panel import Panel
+from rich.rule import Rule
 from rich.table import Table
 from rich.text import Text
 from rich.theme import Theme
@@ -11,11 +13,12 @@ from rich.theme import Theme
 from mikancli.core.models import MikanFeedItem, MikanSubgroup, RuleDraft
 from mikancli.i18n import t
 
+PRIMARY_COLOR = "#ffb454"
 FEED_PREVIEW_PAGE_SIZE = 12
 console = Console(
     markup=False, highlight=False, emoji=False,
     theme=Theme({
-        "heading": "bold cyan", "label": "cyan", "note": "dim",
+        "heading": f"bold {PRIMARY_COLOR}", "label": PRIMARY_COLOR, "note": "dim",
         "success": "green", "warning": "yellow", "error": "bold red",
     }),
 )
@@ -26,10 +29,24 @@ def print_message(message: str, *, style: str = "note") -> None:
     console.print(Text(message), style=style, soft_wrap=not console.is_terminal)
 
 
+def print_section(title: str, *paragraphs: str) -> None:
+    """Give each interactive stage a wrapping heading and optional context."""
+    content = Text()
+    content.append(title, style="heading")
+    for paragraph in paragraphs:
+        content.append("\n\n" + paragraph)
+    console.print()
+    if console.is_terminal:
+        console.print(Panel(content, border_style="heading", padding=(0, 1),
+                            width=min(console.width, 100)))
+    else:
+        console.print(content, soft_wrap=True)
+
+
 def loading(message: str) -> AbstractContextManager[object]:
     """Animate terminal requests, or print one static message when redirected."""
     if console.is_terminal and console.is_interactive:
-        return console.status(Text(message), spinner="line")
+        return console.status(Text(message), spinner="dots", spinner_style=PRIMARY_COLOR)
     print_message(message)
     return nullcontext()
 
@@ -53,10 +70,17 @@ def print_text_summary(draft: RuleDraft) -> int:
     table.add_column(style="label")
     table.add_column(overflow="fold")
     for key, value in fields.items():
+        if console.is_terminal and key in {"must_contain", "save_path"}:
+            table.add_row()
         table.add_row(Text(t(f"display.{key}", value="").rstrip()), Text(str(value)))
     console.print()
-    console.rule(Text(t("display.rule_header").strip("- ")), style="heading")
-    console.print(table)
+    heading = Text(t("display.rule_header").strip("- "))
+    if console.is_terminal:
+        console.print(Panel(table, title=heading, border_style="heading",
+                            padding=(1, 2), width=min(console.width, 100)))
+    else:
+        console.rule(heading, style="heading")
+        console.print(table)
     console.print()
     for note in draft.notes:
         console.print(Text(t("display.next_step", value=note)), style="note")
@@ -117,13 +141,23 @@ def print_feed_preview_page(
         console.print(Text(content), soft_wrap=True)
         return
 
-    preview = Text()
-    for index, line in enumerate(content.splitlines(keepends=True)):
-        style = "heading" if index == 0 else ""
-        if index in (1, 2) or line.startswith("   "):
-            style = "note"
-        preview.append(line, style=style)
-    console.print(preview, overflow="fold")
+    sections = []
+    for index, line in enumerate(content.splitlines()):
+        if not line:
+            sections.append(Rule(style="note"))
+            continue
+        if line.startswith("   "):
+            details = Text(line.lstrip())
+            if details.cell_len <= min(console.width, 100) - 8:
+                sections.append(Rule(details, align="left", style="note"))
+            else:
+                sections.append(details)
+            continue
+        style = "heading" if index == 0 else "bold" if index >= 4 else ""
+        sections.append(Text(line, style=style))
+    console.print()
+    console.print(Panel(Group(*sections), border_style="heading",
+                        padding=(0, 1), width=min(console.width, 100)))
 
 
 def build_feed_preview_page_text(

{mikancli-0.2.0 → mikancli-0.2.2}/mikancli/i18n.py

@@ -36,6 +36,10 @@ TRANSLATIONS: dict[str, dict[str, str]] = {
         "common.not_set": "(not set)",
         "common.unknown": "(unknown)",
         "common.value_required": "A value is required.",
+        "ui.search_results": "Search results",
+        "ui.subgroups": "Subgroup feeds",
+        "ui.filters": "Download filters",
+        "ui.save_path": "Download location",
         "startup.choose_action": "Choose what you want to do",
         "startup.search": "Search anime",
         "startup.qbittorrent": "Modify qBittorrent configurations",
@@ -150,6 +154,10 @@ TRANSLATIONS: dict[str, dict[str, str]] = {
         "common.not_set": "（未设置）",
         "common.unknown": "（未知）",
         "common.value_required": "必须输入一个值。",
+        "ui.search_results": "搜索结果",
+        "ui.subgroups": "字幕组订阅",
+        "ui.filters": "下载过滤条件",
+        "ui.save_path": "下载位置",
         "startup.choose_action": "选择你想执行的操作",
         "startup.search": "搜索动画",
         "startup.qbittorrent": "修改 qBittorrent 配置",

{mikancli-0.2.0 → mikancli-0.2.2}/mikancli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mikancli
-Version: 0.2.0
+Version: 0.2.2
 Summary: CLI foundation for building qBittorrent RSS rules from anime search input.
 Author: metails
 Project-URL: Repository, https://github.com/JianHua-Deng/MikanCli
@@ -20,11 +20,12 @@ Classifier: Topic :: Utilities
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: InquirerPy>=0.3
+Requires-Dist: prompt-toolkit<4,>=3.0.52
 Requires-Dist: rich>=14.0
 
 # MikanCli
 
-Language: [English](README.md) | [简体中文](README.zh-CN.md)
+Language: [简体中文](README.md) | [English](README.en.md)
 
 MikanCli is a Python command-line tool for finding bangumi/anime on Mikanani.me, choosing the correct Bangumi and subgroup RSS feed, and turning that selection into a qBittorrent RSS download rule.
 
@@ -43,6 +44,12 @@ It supports both a guided interactive flow and a JSON preview mode for scripting
 - Submit RSS feeds and auto-download rules to qBittorrent, then verify that qBittorrent saved them
 - Print rule drafts as JSON without submitting anything
 
+## Screenshots
+
+![Search input (demo data)](docs/images/search-input.png)
+
+![RSS feed preview (demo data)](docs/images/feed-preview.png)
+
 ## Requirements
 
 - Python 3.10 or newer

{mikancli-0.2.0 → mikancli-0.2.2}/mikancli.egg-info/SOURCES.txt

@@ -1,3 +1,4 @@
+README.en.md
 README.md
 pyproject.toml
 mikancli/__init__.py
@@ -31,4 +32,5 @@ mikancli/integrations/qbittorrent_client.py
 tests/test_cli_json.py
 tests/test_display.py
 tests/test_feed_preview.py
-tests/test_qbittorrent_episode_filter.py
+tests/test_qbittorrent_episode_filter.py
+tests/test_search_prompt.py

{mikancli-0.2.0 → mikancli-0.2.2}/mikancli.egg-info/requires.txt

@@ -1,2 +1,3 @@
 InquirerPy>=0.3
+prompt-toolkit<4,>=3.0.52
 rich>=14.0

{mikancli-0.2.0 → mikancli-0.2.2}/pyproject.toml

@@ -4,9 +4,9 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "mikancli"
-version = "0.2.0"
+version = "0.2.2"
 description = "CLI foundation for building qBittorrent RSS rules from anime search input."
-readme = "README.md"
+readme = "README.en.md"
 requires-python = ">=3.10"
 authors = [
     { name = "metails" },
@@ -27,6 +27,7 @@ classifiers = [
 ]
 dependencies = [
     "InquirerPy>=0.3",
+    "prompt-toolkit>=3.0.52,<4",
     "rich>=14.0",
 ]
 

{mikancli-0.2.0 → mikancli-0.2.2}/tests/test_display.py

@@ -7,11 +7,28 @@ from rich.console import Console
 from rich.theme import Theme
 
 from mikancli.core.models import RuleDraft
-from mikancli.display import loading, print_message, print_text_summary
+from mikancli.display import loading, print_message, print_section, print_text_summary
 from mikancli.i18n import get_language, set_language
 
 
 class DisplayTests(TestCase):
+    def test_sections_wrap_literal_context_and_stay_plain_when_redirected(self) -> None:
+        title = "[bold]动画[/bold]"
+        context = "https://example.test/rss?title=[literal]&padding=" + "x" * 60
+        for interactive in (False, True):
+            with self.subTest(interactive=interactive):
+                output = StringIO()
+                terminal = Console(file=output, width=40, height=40, force_terminal=interactive,
+                                   color_system=None, theme=Theme({"heading": "cyan"}))
+                with patch("mikancli.display.console", terminal):
+                    print_section(title, context)
+                rendered = output.getvalue()
+                compact = "".join(c for c in rendered if not c.isspace() and c not in "╭╮╰╯┌┐└┘│─")
+                self.assertIn(title, compact)
+                self.assertIn(context, compact)
+                if not interactive:
+                    self.assertEqual(rendered, f"\n{title}\n\n{context}\n")
+
     def test_loading_gates_animation_and_cleans_up_when_requests_fail(self) -> None:
         literal = "[bold]正在加载[/bold] :smile:"
         for terminal, interactive in ((False, False), (False, True), (True, False), (True, True)):
@@ -23,6 +40,7 @@ class DisplayTests(TestCase):
                         raise failure
                 if terminal and interactive:
                     target.status.assert_called_once()
+                    self.assertEqual(target.status.call_args.kwargs["spinner"], "dots")
                     self.assertEqual(target.status.call_args.args[0].plain, literal)
                     target.status.return_value.__exit__.assert_called_once_with(ValueError, failure, ANY)
                     message.assert_not_called()

{mikancli-0.2.0 → mikancli-0.2.2}/tests/test_feed_preview.py

@@ -26,11 +26,14 @@ class FeedPreviewTests(TestCase):
                 for page in (1, 2):
                     with self.subTest(language=language, width=width, page=page):
                         output = StringIO()
-                        terminal = Console(file=output, width=width, force_terminal=True,
+                        terminal = Console(file=output, width=width, height=40, force_terminal=True,
                                            color_system=None, theme=theme)
                         with patch("mikancli.display.console", terminal):
                             print_feed_preview_page(subgroup, items, page=page)
-                        rendered = "".join(output.getvalue().split())
+                        framed = output.getvalue()
+                        self.assertIn("│", framed)
+                        rendered = "".join(char for char in framed
+                                           if not char.isspace() and char not in "╭╮╰╯┌┐└┘│─")
                         expected = build_feed_preview_page_text(subgroup, items, page=page)
                         self.assertEqual(rendered, "".join(expected.split()))
                         self.assertEqual("[13]" in rendered, page == 2)

mikancli-0.2.2/tests/test_search_prompt.py

@@ -0,0 +1,35 @@
+from unittest import TestCase
+from unittest.mock import MagicMock, patch
+
+from InquirerPy import inquirer
+from prompt_toolkit.application import create_app_session
+from prompt_toolkit.input import DummyInput
+from prompt_toolkit.output import DummyOutput
+
+from mikancli.cli import input_parsing, prompts, search_flow
+
+
+class SearchPromptTests(TestCase):
+    def test_search_frame_survives_empty_retry_and_exit(self) -> None:
+        answers = iter(["", "  One   Piece  ", "quit", "other", "redirected"])
+        frames = []
+
+        def execute(widget):
+            frames.append(widget._session.show_frame)
+            return next(answers)
+
+        terminal = MagicMock(is_terminal=True)
+        with (
+            create_app_session(input=DummyInput(), output=DummyOutput()),
+            patch.object(inquirer.text, "execute", autospec=True, side_effect=execute),
+            patch.object(prompts, "console", terminal),
+            patch.object(input_parsing, "print_message") as warning,
+        ):
+            self.assertEqual(search_flow.prompt_search_keyword(), "One Piece")
+            with self.assertRaises(prompts.ExitRequested):
+                search_flow.prompt_search_keyword(retry=True)
+            self.assertEqual(prompts.prompt_text("Other"), "other")
+            terminal.is_terminal = False
+            self.assertEqual(search_flow.prompt_search_keyword(), "redirected")
+        self.assertEqual(frames, [True, True, True, False, False])
+        warning.assert_called_once()