mikancli 0.1.7__tar.gz → 0.2.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mikancli
-Version: 0.1.7
+Version: 0.2.0
 Summary: CLI foundation for building qBittorrent RSS rules from anime search input.
 Author: metails
 Project-URL: Repository, https://github.com/JianHua-Deng/MikanCli
@@ -20,6 +20,7 @@ Classifier: Topic :: Utilities
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: InquirerPy>=0.3
+Requires-Dist: rich>=14.0
 
 # MikanCli
 
@@ -33,7 +34,8 @@ It supports both a guided interactive flow and a JSON preview mode for scripting
 
 - Search Mikan by anime title or keyword
 - Choose from matching Bangumi results and subgroup-specific RSS feeds
-- Preview recent RSS feed items before confirming a feed
+- Preview recent RSS feed items with pagination before confirming a feed
+- Read Rich-formatted rule summaries, feed previews, and status messages, with loading indicators for network requests
 - Build qBittorrent RSS rules with include and exclude filters
 - Filter anime-style episode numbers at or above a minimum episode
 - Choose and save a default download folder
@@ -88,7 +90,26 @@ python -m pip install -e .
 python -m mikancli
 ```
 
-Dependencies are declared in `pyproject.toml` and installed by `pip` or `pipx`. MikanCli does not install packages at runtime.
+Dependencies, including Rich for output and InquirerPy for prompts, are declared in `pyproject.toml` and installed by `pip` or `pipx`. MikanCli does not install packages at runtime.
+
+After pulling dependency changes into an existing editable `pip` installation, rerun `python -m pip install -e .` in that environment. Update `pipx` installations through `pipx` so dependencies stay in the app's environment.
+
+## Terminal Output
+
+Rich formats rule summaries, feed previews, and feedback. InquirerPy handles menus and text input. Release titles containing brackets are displayed literally, and long titles, URLs, and paths wrap to fit the terminal.
+
+Interactive terminals show loading indicators during network requests. Indicators stop before prompts and after failures. Redirected output uses static status messages, and feed previews retain their plain-text layout.
+
+To disable Rich colors in PowerShell:
+
+```powershell
+$env:NO_COLOR = "1"
+mikancli
+```
+
+Remove that setting with `Remove-Item Env:NO_COLOR`. Bold or dim text and loading animations may remain; InquirerPy manages menu styling separately.
+
+The `--json` draft mode prints one JSON document without Rich formatting or progress messages.
 
 ## Guided Flow
 
@@ -169,7 +190,7 @@ mikancli/
   core/            dataclasses, normalization, and rule-building logic
   integrations/    Mikan and qBittorrent adapters
   config.py        user config and folder selection helpers
-  display.py       text summaries and feed previews
+  display.py       Rich summaries, feed previews, feedback, and loading indicators
 ```
 
 The console command is declared in `pyproject.toml`:
@@ -215,7 +236,9 @@ For example:
 mikancli "one piece" --include SubsPlease --min-episode 1126
 ```
 
-MikanCli converts the minimum episode into a qBittorrent regular expression in the rule's `mustContain` field and enables `useRegex`. Normal `--include` and `--exclude` values still behave as literal words or phrases.
+MikanCli converts the minimum episode into a qBittorrent regular expression in the rule's `mustContain` field and enables `useRegex`. Normal `--include` and `--exclude` values still behave as literal words or phrases, and every include value must also be present in a title before qBittorrent treats it as a match.
+
+When submitting a minimum-episode rule, MikanCli checks qBittorrent's RSS article retention limit. If qBittorrent is keeping fewer than 500 articles per feed, MikanCli offers to increase that setting so qBittorrent can see enough of Mikan's feed to match newer episodes.
 
 ## Release
 

{mikancli-0.1.7 → mikancli-0.2.0}/README.md

@@ -10,7 +10,8 @@ It supports both a guided interactive flow and a JSON preview mode for scripting
 
 - Search Mikan by anime title or keyword
 - Choose from matching Bangumi results and subgroup-specific RSS feeds
-- Preview recent RSS feed items before confirming a feed
+- Preview recent RSS feed items with pagination before confirming a feed
+- Read Rich-formatted rule summaries, feed previews, and status messages, with loading indicators for network requests
 - Build qBittorrent RSS rules with include and exclude filters
 - Filter anime-style episode numbers at or above a minimum episode
 - Choose and save a default download folder
@@ -65,7 +66,26 @@ python -m pip install -e .
 python -m mikancli
 ```
 
-Dependencies are declared in `pyproject.toml` and installed by `pip` or `pipx`. MikanCli does not install packages at runtime.
+Dependencies, including Rich for output and InquirerPy for prompts, are declared in `pyproject.toml` and installed by `pip` or `pipx`. MikanCli does not install packages at runtime.
+
+After pulling dependency changes into an existing editable `pip` installation, rerun `python -m pip install -e .` in that environment. Update `pipx` installations through `pipx` so dependencies stay in the app's environment.
+
+## Terminal Output
+
+Rich formats rule summaries, feed previews, and feedback. InquirerPy handles menus and text input. Release titles containing brackets are displayed literally, and long titles, URLs, and paths wrap to fit the terminal.
+
+Interactive terminals show loading indicators during network requests. Indicators stop before prompts and after failures. Redirected output uses static status messages, and feed previews retain their plain-text layout.
+
+To disable Rich colors in PowerShell:
+
+```powershell
+$env:NO_COLOR = "1"
+mikancli
+```
+
+Remove that setting with `Remove-Item Env:NO_COLOR`. Bold or dim text and loading animations may remain; InquirerPy manages menu styling separately.
+
+The `--json` draft mode prints one JSON document without Rich formatting or progress messages.
 
 ## Guided Flow
 
@@ -146,7 +166,7 @@ mikancli/
   core/            dataclasses, normalization, and rule-building logic
   integrations/    Mikan and qBittorrent adapters
   config.py        user config and folder selection helpers
-  display.py       text summaries and feed previews
+  display.py       Rich summaries, feed previews, feedback, and loading indicators
 ```
 
 The console command is declared in `pyproject.toml`:
@@ -192,7 +212,9 @@ For example:
 mikancli "one piece" --include SubsPlease --min-episode 1126
 ```
 
-MikanCli converts the minimum episode into a qBittorrent regular expression in the rule's `mustContain` field and enables `useRegex`. Normal `--include` and `--exclude` values still behave as literal words or phrases.
+MikanCli converts the minimum episode into a qBittorrent regular expression in the rule's `mustContain` field and enables `useRegex`. Normal `--include` and `--exclude` values still behave as literal words or phrases, and every include value must also be present in a title before qBittorrent treats it as a match.
+
+When submitting a minimum-episode rule, MikanCli checks qBittorrent's RSS article retention limit. If qBittorrent is keeping fewer than 500 articles per feed, MikanCli offers to increase that setting so qBittorrent can see enough of Mikan's feed to match newer episodes.
 
 ## Release
 

{mikancli-0.1.7 → mikancli-0.2.0}/mikancli/__init__.py

@@ -4,4 +4,4 @@ __all__ = [
     "__version__",
 ]
 
-__version__ = "0.1.7"
+__version__ = "0.2.0"

{mikancli-0.1.7 → mikancli-0.2.0}/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_text_summary
+from mikancli.display import print_message, print_text_summary
 from mikancli.i18n import (
     LANGUAGE_LABELS,
     SUPPORTED_LANGUAGES,
@@ -165,7 +165,7 @@ def run_language_configuration_flow(config: AppConfig, config_path: Path) -> App
     set_language(selected_language)
     updated_config = replace(config, language=selected_language)
     save_config(config_path, updated_config)
-    print(t("language.saved", language=LANGUAGE_LABELS[selected_language]))
+    print_message(t("language.saved", language=LANGUAGE_LABELS[selected_language]), style="success")
     return updated_config
 
 
@@ -220,6 +220,7 @@ def build_interactive_draft(args: argparse.Namespace, *, config: AppConfig,confi
         include_words=include_words,
         exclude_words=exclude_words,
         min_episode=min_episode,
+        rule_name=content_folder_name,
         save_path=final_save_path,
     )
     return build_rule_draft(
@@ -246,7 +247,7 @@ def main(argv: list[str] | None = None) -> int:
         try:
             return setup_qbittorrent(config, config_path)
         except ExitRequested:
-            print(t("common.exited"))
+            print_message(t("common.exited"))
             return 0
 
     if args.json:
@@ -306,7 +307,7 @@ def main(argv: list[str] | None = None) -> int:
                 config_path=config_path,
             )
         except ExitRequested:
-            print(t("common.exited"))
+            print_message(t("common.exited"))
             return 0
 
         summary_exit_code = print_text_summary(draft)
@@ -315,7 +316,7 @@ def main(argv: list[str] | None = None) -> int:
         try:
             submission_exit_code = prompt_to_submit_rule_to_qbittorrent(config, draft)
             if submission_exit_code == QBITTORRENT_NOT_CONFIGURED:
-                print(t("qb.submit.not_configured"))
+                print_message(t("qb.submit.not_configured"), style="warning")
                 setup_exit_code = prompt_for_qbittorrent_setup_if_needed(config, config_path)
                 if setup_exit_code not in {
                     QBITTORRENT_SETUP_SUCCESS,
@@ -330,7 +331,7 @@ def main(argv: list[str] | None = None) -> int:
                     continue
 
         except ExitRequested:
-            print(t("common.exited"))
+            print_message(t("common.exited"))
             return 0
 
         if has_startup_menu and submission_exit_code == QBITTORRENT_SUBMISSION_SKIPPED:

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

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 from mikancli.cli.prompts import prompt_text
 from mikancli.core.normalize import collapse_spaces
+from mikancli.display import print_message
 from mikancli.i18n import t
 
 
@@ -10,7 +11,7 @@ def prompt_required_text(prompt: str) -> str:
         entered = collapse_spaces(prompt_text(prompt, allow_exit=True))
         if entered:
             return entered
-        print(t("common.value_required"))
+        print_message(t("common.value_required"), style="warning")
 
 
 def parse_word_list(value: str) -> tuple[str, ...]:
@@ -62,4 +63,4 @@ def prompt_optional_positive_int(prompt: str, *, field_name: str) -> int | None:
         try:
             return parse_optional_positive_int(entered, field_name=field_name)
         except ValueError as exc:
-            print(exc)
+            print_message(str(exc), style="warning")

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

@@ -6,13 +6,17 @@ 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.i18n import t
 from mikancli.integrations.qbittorrent import (
+    MIN_RSS_ARTICLES_FOR_EPISODE_FILTER,
     QBittorrentError,
     build_default_feed_path,
     check_connection,
+    get_rss_max_articles_per_feed,
     normalize_qbittorrent_url,
     qbittorrent_rule_exists,
+    set_rss_max_articles_per_feed,
     submit_rule_draft,
 )
 
@@ -46,7 +50,7 @@ def setup_qbittorrent(config: AppConfig, config_path: Path) -> int:
         or "http://localhost:8080"
     )
 
-    print(t("qb.setup.auth_hint"))
+    print_message(t("qb.setup.auth_hint"))
     username = (
         collapse_spaces(
             prompt_text(
@@ -69,10 +73,10 @@ def setup_qbittorrent(config: AppConfig, config_path: Path) -> int:
     )
 
     try:
-        print(t("qb.setup.verifying"))
-        version = check_connection(settings)
+        with loading(t("qb.setup.verifying")):
+            version = check_connection(settings)
     except QBittorrentError as exc:
-        print(str(exc))
+        print_message(str(exc), style="error")
         return QBITTORRENT_ERROR
 
     save_config(
@@ -87,7 +91,7 @@ def setup_qbittorrent(config: AppConfig, config_path: Path) -> int:
             qbittorrent_add_paused=config.qbittorrent_add_paused,
         ),
     )
-    print(t("qb.setup.verified", version=version))
+    print_message(t("qb.setup.verified", version=version), style="success")
     return QBITTORRENT_SETUP_SUCCESS
 
 
@@ -149,6 +153,55 @@ def prompt_for_rss_feed_name(draft: RuleDraft) -> str:
     return sanitize_folder_name(entered or default_feed_path) or default_feed_path
 
 
+def prompt_to_raise_rss_article_limit_if_needed(
+    settings: QBittorrentSettings,
+    draft: RuleDraft,
+) -> None:
+    """Offer to raise qBittorrent's RSS retention limit for minimum-episode rules."""
+    if draft.min_episode is None:
+        return
+
+    with loading(t("qb.submit.checking")):
+        current_limit = get_rss_max_articles_per_feed(settings)
+    if (
+        current_limit is None
+        or current_limit >= MIN_RSS_ARTICLES_FOR_EPISODE_FILTER
+    ):
+        return
+
+    should_update = confirm_choice(
+        t(
+            "qb.submit.rss_limit_offer",
+            current=current_limit,
+            minimum=MIN_RSS_ARTICLES_FOR_EPISODE_FILTER,
+        ),
+        default=True,
+        allow_exit=True,
+    )
+    if not should_update:
+        print_message(
+            t(
+                "qb.submit.rss_limit_skipped",
+                current=current_limit,
+            ),
+            style="warning",
+        )
+        return
+
+    with loading(t("qb.submit.updating_limit")):
+        set_rss_max_articles_per_feed(
+            settings,
+            MIN_RSS_ARTICLES_FOR_EPISODE_FILTER,
+        )
+    print_message(
+        t(
+            "qb.submit.rss_limit_updated",
+            minimum=MIN_RSS_ARTICLES_FOR_EPISODE_FILTER,
+        ),
+        style="success",
+    )
+
+
 def prompt_to_submit_rule_to_qbittorrent(config: AppConfig, draft: RuleDraft,) -> int:
     """Ask whether to submit a confirmed rule draft to qBittorrent and report the result. Returns QBITTORRENT_SETUP_SUCCESS on success, QBITTORRENT_NOT_CONFIGURED when no WebUI URL is saved, QBITTORRENT_SUBMISSION_SKIPPED when declined, or QBITTORRENT_ERROR on submission failure."""
     
@@ -170,7 +223,9 @@ def prompt_to_submit_rule_to_qbittorrent(config: AppConfig, draft: RuleDraft,) -
     )
 
     try:
-        if qbittorrent_rule_exists(settings, draft.rule_name):
+        with loading(t("qb.submit.checking")):
+            rule_exists = qbittorrent_rule_exists(settings, draft.rule_name)
+        if rule_exists:
             should_replace = confirm_choice(
                 t("qb.submit.replace_existing", rule_name=draft.rule_name),
                 default=False,
@@ -179,18 +234,19 @@ def prompt_to_submit_rule_to_qbittorrent(config: AppConfig, draft: RuleDraft,) -
             if not should_replace:
                 return QBITTORRENT_SUBMISSION_SKIPPED
 
+        prompt_to_raise_rss_article_limit_if_needed(settings, draft)
         feed_path = prompt_for_rss_feed_name(draft)
-        print(t("qb.submit.submitting"))
-        submit_rule_draft(
-            settings,
-            draft,
-            add_paused=config.qbittorrent_add_paused,
-            assigned_category=config.qbittorrent_category,
-            feed_path=feed_path,
-        )
+        with loading(t("qb.submit.submitting")):
+            submit_rule_draft(
+                settings,
+                draft,
+                add_paused=config.qbittorrent_add_paused,
+                assigned_category=config.qbittorrent_category,
+                feed_path=feed_path,
+            )
     except QBittorrentError as exc:
-        print(t("qb.submit.failed", error=str(exc)))
+        print_message(t("qb.submit.failed", error=str(exc)), style="error")
         return QBITTORRENT_ERROR
 
-    print(t("qb.submit.success"))
+    print_message(t("qb.submit.success"), style="success")
     return QBITTORRENT_SETUP_SUCCESS

{mikancli-0.1.7 → mikancli-0.2.0}/mikancli/cli/save_path_flow.py

@@ -10,6 +10,7 @@ from mikancli.config import (
 )
 from mikancli.core.models import AppConfig
 from mikancli.core.normalize import collapse_spaces, sanitize_folder_name
+from mikancli.display import print_message
 from mikancli.i18n import t
 
 
@@ -61,7 +62,7 @@ def prompt_for_content_folder_name(default_name: str, base_path: str | None) ->
         ):
             return folder_name
 
-        print(t("save.choose_different"))
+        print_message(t("save.choose_different"), style="warning")
 
 
 def build_content_save_path(base_path: str | None, folder_name: str) -> str | None:
@@ -104,12 +105,12 @@ def prompt_for_save_path(config: AppConfig, config_path: Path) -> str:
                 initial_dir=config.default_save_path or downloads_path
             )
             if not selected_path:
-                print(t("save.no_folder_selected"))
+                print_message(t("save.no_folder_selected"), style="warning")
                 continue
         else:
             selected_path = prompt_for_manual_save_path()
             if not selected_path:
-                print(t("save.no_path_entered"))
+                print_message(t("save.no_path_entered"), style="warning")
                 continue
 
         if should_save_as_default(selected_path, config):

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

@@ -2,9 +2,19 @@ from __future__ import annotations
 
 from mikancli.cli.input_parsing import prompt_required_text
 from mikancli.cli.prompts import select_option
-from mikancli.core.models import MikanBangumi, MikanSubgroup, SearchRequest
+from mikancli.core.models import (
+    MikanBangumi,
+    MikanFeedItem,
+    MikanSubgroup,
+    SearchRequest,
+)
 from mikancli.core.normalize import collapse_spaces
-from mikancli.display import build_feed_preview_text
+from mikancli.display import (
+    FEED_PREVIEW_PAGE_SIZE,
+    loading,
+    print_feed_preview_page,
+    print_message,
+)
 from mikancli.i18n import t
 from mikancli.integrations.mikan import (
     MikanLookupError,
@@ -18,6 +28,8 @@ BACK_TO_CANDIDATES = "__back_to_candidates__"
 BACK_TO_SUBGROUPS = "__back_to_subgroups__"
 CONFIRM_SUBGROUP = "__confirm_subgroup__"
 REJECT_SUBGROUP = "__reject_subgroup__"
+NEXT_PREVIEW_PAGE = "__next_preview_page__"
+PREVIOUS_PREVIEW_PAGE = "__previous_preview_page__"
 
 
 def search_prompt(*, retry: bool = False) -> str:
@@ -74,22 +86,48 @@ def select_subgroup_or_navigate(subgroups: tuple[MikanSubgroup, ...], *, bangumi
     return subgroups[selected]
 
 
-def confirm_subgroup_selection(preview_text: str) -> str:
-    """Show a feed preview and ask whether to use that subgroup feed. Returns CONFIRM_SUBGROUP, REJECT_SUBGROUP, or BACK_TO_SUBGROUPS based on the user's decision"""
-    print(preview_text)
-    return select_option(
-        t("search.use_subgroup"),
-        [
-            (CONFIRM_SUBGROUP, t("common.yes")),
-            (REJECT_SUBGROUP, t("search.no_search_again")),
-            (BACK_TO_SUBGROUPS, t("search.back_to_subgroups")),
-        ],
-        default=CONFIRM_SUBGROUP,
-        allow_exit=True,
-        separator_before_values=(BACK_TO_SUBGROUPS,),
-        separator_before_exit=False,
+def confirm_subgroup_selection(
+    subgroup: MikanSubgroup,
+    feed_items: tuple[MikanFeedItem, ...],
+) -> str:
+    """Show a paginated feed preview and ask whether to use that subgroup feed."""
+    page = 1
+    total_pages = max(
+        1,
+        (len(feed_items) + FEED_PREVIEW_PAGE_SIZE - 1) // FEED_PREVIEW_PAGE_SIZE,
     )
 
+    while True:
+        print_feed_preview_page(subgroup, feed_items, page=page)
+
+        options = [(CONFIRM_SUBGROUP, t("common.yes"))]
+        if page < total_pages:
+            options.append((NEXT_PREVIEW_PAGE, t("search.next_page")))
+        if page > 1:
+            options.append((PREVIOUS_PREVIEW_PAGE, t("search.previous_page")))
+        options.extend(
+            [
+                (REJECT_SUBGROUP, t("search.no_search_again")),
+                (BACK_TO_SUBGROUPS, t("search.back_to_subgroups")),
+            ]
+        )
+
+        selected = select_option(
+            t("search.use_subgroup"),
+            options,
+            default=CONFIRM_SUBGROUP,
+            allow_exit=True,
+            separator_before_values=(REJECT_SUBGROUP,),
+            separator_before_exit=False,
+        )
+        if selected == NEXT_PREVIEW_PAGE:
+            page = min(page + 1, total_pages)
+            continue
+        if selected == PREVIOUS_PREVIEW_PAGE:
+            page = max(page - 1, 1)
+            continue
+        return selected
+
 
 def resolve_mikan_selection(request: SearchRequest,) -> tuple[MikanBangumi | None, MikanSubgroup | None, tuple[str, ...]]:
     """Resolve the first matching Bangumi and subgroup for non-interactive JSON mode. Returns optional selected objects plus notes describing missing data or JSON-mode limitations"""
@@ -142,14 +180,15 @@ def run_interactive_selection(*, initial_keyword: str | None) -> tuple[MikanBang
 
     while True:
         try:
-            candidates = search_mikan_bangumi(keyword)
+            with loading(t("search.searching")):
+                candidates = search_mikan_bangumi(keyword)
         except MikanLookupError as exc:
-            print(str(exc))
+            print_message(str(exc), style="error")
             keyword = prompt_required_text(search_prompt(retry=True))
             continue
 
         if not candidates:
-            print(t("search.no_results", keyword=keyword))
+            print_message(t("search.no_results", keyword=keyword), style="warning")
             keyword = prompt_required_text(search_prompt(retry=True))
             continue
 
@@ -162,13 +201,14 @@ def run_interactive_selection(*, initial_keyword: str | None) -> tuple[MikanBang
 
         while True:
             try:
-                subgroups = fetch_mikan_subgroups(bangumi.bangumi_id)
+                with loading(t("search.loading_subgroups")):
+                    subgroups = fetch_mikan_subgroups(bangumi.bangumi_id)
             except MikanLookupError as exc:
-                print(str(exc))
+                print_message(str(exc), style="error")
                 break
 
             if not subgroups:
-                print(t("search.no_subgroup"))
+                print_message(t("search.no_subgroup"), style="warning")
                 break
 
             selected_subgroup = select_subgroup_or_navigate(
@@ -185,13 +225,13 @@ def run_interactive_selection(*, initial_keyword: str | None) -> tuple[MikanBang
             subgroup = selected_subgroup
 
             try:
-                feed_items = fetch_mikan_feed_items(subgroup.feed_url)
+                with loading(t("search.loading_feed")):
+                    feed_items = fetch_mikan_feed_items(subgroup.feed_url)
             except MikanLookupError as exc:
-                print(str(exc))
+                print_message(str(exc), style="error")
                 continue
 
-            preview_text = build_feed_preview_text(subgroup, feed_items)
-            decision = confirm_subgroup_selection(preview_text)
+            decision = confirm_subgroup_selection(subgroup, feed_items)
             if decision == BACK_TO_SUBGROUPS:
                 continue
             if decision == REJECT_SUBGROUP:

{mikancli-0.1.7 → mikancli-0.2.0}/mikancli/core/models.py

@@ -27,6 +27,7 @@ class SearchRequest:
     include_words: tuple[str, ...] = ()
     exclude_words: tuple[str, ...] = ()
     min_episode: int | None = None
+    rule_name: str | None = None
     save_path: str | None = None
 
 

{mikancli-0.1.7 → mikancli-0.2.0}/mikancli/core/rules.py

@@ -30,6 +30,7 @@ def build_rule_draft(request: SearchRequest, *, bangumi: MikanBangumi | None = N
     Example: SearchRequest(keyword=" Solo ", include_words=("HEVC", "")) returns a draft with rule_name="Solo" and must_contain=("HEVC",).
     """
     collapsed_keyword = collapse_spaces(request.keyword)
+    rule_name = collapse_spaces(request.rule_name or collapsed_keyword)
 
     must_contain = dedupe_nonempty(list(request.include_words))
     must_not_contain = dedupe_nonempty(list(request.exclude_words))
@@ -37,7 +38,7 @@ def build_rule_draft(request: SearchRequest, *, bangumi: MikanBangumi | None = N
     return RuleDraft(
         keyword=collapsed_keyword,
         normalized_keyword=normalize_keyword(request.keyword),
-        rule_name=collapsed_keyword,
+        rule_name=rule_name,
         must_contain=must_contain,
         must_not_contain=must_not_contain,
         min_episode=request.min_episode,