refactor: unify constants and add cover caching

Author: GEMILUXVII

core/auth.py

@@ -4,16 +4,14 @@
 提供登录、登出、会话管理等认证功能，支持 cookies 持久化。
 """
 
+import importlib.util
 import json
 
 from astrbot.api import logger
 
 from .base import JMClientMixin, JMConfigManager
 
-try:
-    JMCOMIC_AVAILABLE = True
-except ImportError:
-    JMCOMIC_AVAILABLE = False
+JMCOMIC_AVAILABLE = importlib.util.find_spec("jmcomic") is not None
 
 
 class JMAuthManager(JMClientMixin):

core/browser.py

@@ -16,6 +16,11 @@
     JMCOMIC_AVAILABLE = False
 
 from .base import JMClientMixin, JMConfigManager
+from .constants import (
+    get_category_list,
+    get_order_list,
+    get_time_list,
+)
 
 
 class JMBrowser(JMClientMixin):
@@ -221,6 +226,10 @@ def _get_album_cover_sync(
             # 封面保存路径
             cover_path = save_dir / f"{parsed_id}.jpg"
 
+            # 如果封面已存在，直接返回（缓存）
+            if cover_path.exists():
+                return cover_path
+
             # 下载封面
             client.download_album_cover(parsed_id, str(cover_path))
 
@@ -325,34 +334,7 @@ def _get_month_ranking_sync(self, page: int, option) -> list[dict]:
 
     # ==================== 分类浏览功能 ====================
 
-    # 分类常量映射
-    CATEGORY_MAP = {
-        "all": "0",
-        "doujin": "doujin",
-        "single": "single",
-        "short": "short",
-        "hanman": "hanman",
-        "meiman": "meiman",
-        "3d": "3D",
-        "cosplay": "doujin_cosplay",
-        "another": "another",
-    }
-
-    # 排序常量映射
-    ORDER_MAP = {
-        "new": "mr",  # 最新
-        "hot": "mv",  # 最热（观看数）
-        "pic": "mp",  # 图片多
-        "like": "tf",  # 点赞多
-    }
-
-    # 时间常量映射
-    TIME_MAP = {
-        "day": "t",  # 今日
-        "week": "w",  # 本周
-        "month": "m",  # 本月
-        "all": "a",  # 全部时间
-    }
+    # 常量映射已移至 constants.py
 
     async def get_category_albums(
         self,
@@ -422,20 +404,10 @@ def _get_category_albums_sync(
             logger.error(f"获取分类浏览失败: {e}")
             return []
 
-    @classmethod
-    def get_category_list(cls) -> list[str]:
-        """获取所有支持的分类"""
-        return list(cls.CATEGORY_MAP.keys())
-
-    @classmethod
-    def get_order_list(cls) -> list[str]:
-        """获取所有支持的排序方式"""
-        return list(cls.ORDER_MAP.keys())
-
-    @classmethod
-    def get_time_list(cls) -> list[str]:
-        """获取所有支持的时间范围"""
-        return list(cls.TIME_MAP.keys())
+    # 辅助方法：使用 constants 模块中的函数
+    get_category_list = staticmethod(get_category_list)
+    get_order_list = staticmethod(get_order_list)
+    get_time_list = staticmethod(get_time_list)
 
     # ==================== 收藏夹功能 ====================
 

utils/formatter.py

@@ -2,6 +2,8 @@
 消息格式化工具
 """
 
+from ..core.constants import CATEGORY_NAMES, ORDER_NAMES, TIME_NAMES
+
 
 class MessageFormatter:
     """消息格式化器"""
@@ -138,45 +140,10 @@ def format_ranking_results(
 
         return "\n".join(lines)
 
-    # 分类名称映射（用于显示）
-    CATEGORY_NAMES = {
-        "all": "全部",
-        "0": "全部",
-        "doujin": "同人",
-        "single": "单本",
-        "short": "短篇",
-        "hanman": "韩漫",
-        "meiman": "美漫",
-        "3d": "3D",
-        "3D": "3D",
-        "cosplay": "Cosplay",
-        "doujin_cosplay": "Cosplay",
-        "another": "其他",
-    }
-
-    # 排序名称映射（用于显示）
-    ORDER_NAMES = {
-        "new": "最新",
-        "mr": "最新",
-        "hot": "热门",
-        "mv": "热门",
-        "pic": "图多",
-        "mp": "图多",
-        "like": "点赞",
-        "tf": "点赞",
-    }
-
-    # 时间名称映射（用于显示）
-    TIME_NAMES = {
-        "day": "今日",
-        "t": "今日",
-        "week": "本周",
-        "w": "本周",
-        "month": "本月",
-        "m": "本月",
-        "all": "全部时间",
-        "a": "全部时间",
-    }
+    # 常量映射已移至 core/constants.py，这里保留引用以保持兼容性
+    CATEGORY_NAMES = CATEGORY_NAMES
+    ORDER_NAMES = ORDER_NAMES
+    TIME_NAMES = TIME_NAMES
 
     @classmethod
     def format_recommend_results(
@@ -381,7 +348,7 @@ def format_help() -> str:
 
 【基本命令】
 /jm <ID>     - 下载指定ID的本子
-/jmc <ID>    - 下载指定ID的章节
+/jmc <ID> <章节> - 下载指定本子的指定章节
 /jms <关键词> - 搜索漫画
 /jmi <ID>    - 查看本子详情
 /jmrank      - 查看排行榜