Merge branch 'devel' into pure-py

Author: Ljzd-PRO

CHANGELOG.md

@@ -15,6 +15,17 @@
   # Method 3: Combined filtering (most flexible)
   ktoolbox sync_creator --url="https://kemono.cr/fanbox/user/32165989" --keywords="ブルアカ" --keywords_exclude="全体公開,結果発表"
   ```
+- The `--keywords` and `--keywords-exclude` features for keyword filtering and exclusion can now also be set in the configuration
+  - New configuration options:
+    - `job.keywords`: Keyword filtering (default is empty)
+    - `job.keywords_exclude`: Keyword exclusion (default is empty)
+  - You can edit these configurations by running `ktoolbox config-editor` (`Job -> ...`)
+  - Or manually edit them in the `.env` file or environment variables
+    ```dotenv
+    KTOOLBOX_JOB__KEYWORDS='["expression", "sound effect variation"]'
+    KTOOLBOX_JOB__KEYWORDS_EXCLUDE='["public", "result announcement"]'
+    ```
+  - 📖More information: [Configuration-Reference-JobConfiguration](https://ktoolbox.readthedocs.io/latest/configuration/reference/#ktoolbox.configuration.JobConfiguration)
 - Add **year/month** **grouping** functionality for post organization - #306
   - You can group downloaded posts by year and month with customizable directory naming formats
   - New configuration options:
@@ -26,12 +37,12 @@
   - Or manually edit them in `.env` file or environment variables
     ```dotenv
     # Environment variables (Defaults to False)
-    export KTOOLBOX_JOB__GROUP_BY_YEAR=True
-    export KTOOLBOX_JOB__GROUP_BY_MONTH=True
+    KTOOLBOX_JOB__GROUP_BY_YEAR=True
+    KTOOLBOX_JOB__GROUP_BY_MONTH=True
   
     # Custom style naming
-    export KTOOLBOX_JOB__YEAR_DIRNAME_FORMAT="Year {year}"
-    export KTOOLBOX_JOB__MONTH_DIRNAME_FORMAT="Month {month:02d}"
+    KTOOLBOX_JOB__YEAR_DIRNAME_FORMAT="Year {year}"
+    KTOOLBOX_JOB__MONTH_DIRNAME_FORMAT="Month {month:02d}"
     ```
     Resulting directory structure:
     ```
@@ -48,7 +59,9 @@
   - 📖More information: [Configuration-Reference-JobConfiguration](https://ktoolbox.readthedocs.io/latest/configuration/reference/#ktoolbox.configuration.JobConfiguration)
 
 
-[//]: # (### 🪲 Fix)
+### 🪲 Fix
+
+- Fixed the issue where the `--keywords` parameter could not be parsed correctly in the `sync-creator` command
 
 - - -
 
@@ -65,6 +78,17 @@
   # 方法3：组合筛选（最灵活）
   ktoolbox sync_creator --url="https://kemono.cr/fanbox/user/32165989" --keywords="ブルアカ" --keywords_exclude="全体公開,結果発表"
   ```
+- 关键词筛选和关键词排除的 `--keywords` 和 `--keywords-exclude` 功能现在也可以在配置中设置
+  - 新配置项：
+    - `job.keywords`：关键词筛选（默认为空）
+    - `job.keywords_exclude`：关键词排除（默认为空）
+  - 可通过运行 `ktoolbox config-editor` 编辑这些配置（`Job -> ...`）
+  - 或手动在 `.env` 文件或环境变量中编辑
+    ```dotenv
+    KTOOLBOX_JOB__KEYWORDS='["表情", "効果音差分"]'
+    KTOOLBOX_JOB__KEYWORDS_EXCLUDE='["全体公開", "結果発表"]'
+    ```
+  - 📖更多信息：[配置参考-JobConfiguration](https://ktoolbox.readthedocs.io/latest/configuration/reference/#ktoolbox.configuration.JobConfiguration)
 - 新增按**年份/月**分组功能用于帖子整理 - #306
   - 可按年份和月份分组下载的帖子，支持自定义目录命名格式
   - 新配置项：
@@ -75,13 +99,13 @@
   - 可通过运行 `ktoolbox config-editor` 编辑这些配置（`Job -> ...`）
   - 或手动在 `.env` 文件或环境变量中编辑
     ```dotenv
-    # 环境变量（默认 False）
-    export KTOOLBOX_JOB__GROUP_BY_YEAR=True
-    export KTOOLBOX_JOB__GROUP_BY_MONTH=True
+    # 是否启用（默认 False）
+    KTOOLBOX_JOB__GROUP_BY_YEAR=True
+    KTOOLBOX_JOB__GROUP_BY_MONTH=True
   
     # 自定义目录命名
-    export KTOOLBOX_JOB__YEAR_DIRNAME_FORMAT="{year}年"
-    export KTOOLBOX_JOB__MONTH_DIRNAME_FORMAT="{month:02d}月"
+    KTOOLBOX_JOB__YEAR_DIRNAME_FORMAT="{year}年"
+    KTOOLBOX_JOB__MONTH_DIRNAME_FORMAT="{month:02d}月"
     ```
     目录结构示例：
     ```
@@ -97,7 +121,9 @@
     ```
   - 📖更多信息：[配置参考-JobConfiguration](https://ktoolbox.readthedocs.io/latest/configuration/reference/#ktoolbox.configuration.JobConfiguration)
 
-[//]: # (### 🪲 修复)
+### 🪲 修复
+
+- 修复 `--keywords` 参数在 `sync-creator` 命令中无法正确解析的问题
 
 ## Upgrade
 

ktoolbox/cli.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 from pathlib import Path
-from typing import Union, overload, Set, Optional
+from typing import Union, overload, Tuple
 
 import aiofiles
 from loguru import logger
@@ -194,34 +194,35 @@ async def download_post(
         )
         if ret:
             post_path = path / generate_post_path_name(ret.data.post)
-            
+
             # For revision posts, create a revision subfolder
             if revision_id:
                 post_path = post_path / "revision" / revision_id
-                
+
             # Download the main post
             job_list = await create_job_from_post(
                 post=ret.data.post,
                 post_path=post_path,
                 dump_post_data=dump_post_data
             )
-            
+
             # If include_revisions is enabled and we have revisions data
             if (config.job.include_revisions and
-                ret.data.props and 
-                ret.data.props.revisions and 
-                not revision_id):  # Don't process revisions if we're already downloading a specific revision
-                
+                    ret.data.props and
+                    ret.data.props.revisions and
+                    not revision_id):  # Don't process revisions if we're already downloading a specific revision
+
                 for revision_order, revision_data in ret.data.props.revisions:
                     if revision_data.revision_id:  # Only process actual revisions, not the main post
-                        revision_path = post_path / config.job.post_structure.revisions / generate_post_path_name(revision_data)
+                        revision_path = post_path / config.job.post_structure.revisions / generate_post_path_name(
+                            revision_data)
                         revision_jobs = await create_job_from_post(
                             post=revision_data,
                             post_path=revision_path,
                             dump_post_data=dump_post_data
                         )
                         job_list.extend(revision_jobs)
-            
+
             job_runner = JobRunner(job_list=job_list)
             await job_runner.start()
         else:
@@ -271,8 +272,8 @@ async def sync_creator(
             end_time: str = None,
             offset: int = 0,
             length: int = None,
-            keywords: str = None,
-            keywords_exclude: str = None
+            keywords: Tuple[str] = None,
+            keywords_exclude: Tuple[str] = None
     ):
         """
         Sync posts from a creator
@@ -338,23 +339,18 @@ async def sync_creator(
             return creator_ret.message
 
         creator_path = path / sanitize_filename(creator_name)
-
         creator_path.mkdir(exist_ok=True)
-        
-        # Parse keywords
-        keyword_set: Optional[Set[str]] = None
+
+        keywords = [keywords] if isinstance(keywords, str) else keywords
+        keyword_set = set(keywords) if keywords else config.job.keywords
         if keywords:
-            keyword_set = set(kw.strip() for kw in keywords.split(',') if kw.strip())
-            if keyword_set:
-                logger.info(f"Filtering posts by keywords: {', '.join(keyword_set)}")
-        
-        # Parse exclude keywords
-        keyword_exclude_set: Optional[Set[str]] = None
+            logger.info(f"Filtering posts by keywords: {', '.join(keyword_set)}")
+
+        keywords_exclude = [keywords_exclude] if isinstance(keywords_exclude, str) else keywords_exclude
+        keyword_exclude_set = set(keywords_exclude) if keywords_exclude else config.job.keywords_exclude
         if keywords_exclude:
-            keyword_exclude_set = set(kw.strip() for kw in keywords_exclude.split(',') if kw.strip())
-            if keyword_exclude_set:
-                logger.info(f"Excluding posts by keywords: {', '.join(keyword_exclude_set)}")
-        
+            logger.info(f"Excluding posts by keywords: {', '.join(keyword_exclude_set)}")
+
         ret = await create_job_from_creator(
             service=service,
             creator_id=creator_id,

ktoolbox/configuration.py

@@ -206,6 +206,8 @@ class JobConfiguration(BaseModel):
     e.g. ``{year}`` > ``2024``, ``Year_{year}`` > ``Year_2024``
     :ivar month_dirname_format: Customize the month directory name format. Available properties: ``year``, ``month``. \
     e.g. ``{year}-{month}`` > ``2024-01``, ``{year}_{month}`` > ``2024_01``
+    :ivar keywords: keywords to filter posts by title (case-insensitive)
+    :ivar keywords_exclude: keywords to exclude posts by title (case-insensitive)
     """
     count: int = 4
     include_revisions: bool = False
@@ -270,6 +272,8 @@ class JobConfiguration(BaseModel):
     group_by_month: bool = False
     year_dirname_format: str = "{year}"
     month_dirname_format: str = "{year}-{month:02d}"
+    keywords: Set[str] = Field(default_factory=set)
+    keywords_exclude: Set[str] = Field(default_factory=set)
 
     @validator("allow_list", "block_list", pre=True)
     def allow_block_list_validator(cls, v):