Merge remote-tracking branch 'origin/v2' into v2

Author: noone

app/actions/invoke_plugin.py

@@ -56,7 +56,7 @@ def execute(self, workflow_id: int, params: dict, context: ActionContext) -> Act
                 logger.error(f"插件不存在: {params.plugin_id}")
                 return context
             actions = plugin_actions[0].get("actions", [])
-            action = next((action for action in actions if action.action_id == params.action_id), None)
+            action = next((action for action in actions if action.get("action_id") == params.action_id), None)
             if not action or not action.get("func"):
                 logger.error(f"插件动作不存在: {params.plugin_id} - {params.action_id}")
                 return context

app/actions/scan_file.py

@@ -67,14 +67,8 @@ def execute(self, workflow_id: int, params: dict, context: ActionContext) -> Act
                 break
             if not file.extension or f".{file.extension.lower()}" not in settings.RMT_MEDIAEXT:
                 continue
-            # 检查缓存
-            cache_key = f"{file.path}"
-            if self.check_cache(workflow_id, cache_key):
-                logger.info(f"{file.path} 已处理过，跳过")
-                continue
-            self._fileitems.append(fileitem)
-            # 保存缓存
-            self.save_cache(workflow_id, cache_key)
+            # 添加文件到队列，而不是目录
+            self._fileitems.append(file)
 
         if self._fileitems:
             context.fileitems.extend(self._fileitems)

app/api/apiv1.py

@@ -2,7 +2,7 @@
 
 from app.api.endpoints import login, user, webhook, message, site, subscribe, \
     media, douban, search, plugin, tmdb, history, system, download, dashboard, \
-    transfer, mediaserver, bangumi, storage, discover, recommend, workflow, torrent, monitoring
+    transfer, mediaserver, bangumi, storage, discover, recommend, workflow, torrent
 
 api_router = APIRouter()
 api_router.include_router(login.router, prefix="/login", tags=["login"])
@@ -28,4 +28,3 @@
 api_router.include_router(recommend.router, prefix="/recommend", tags=["recommend"])
 api_router.include_router(workflow.router, prefix="/workflow", tags=["workflow"])
 api_router.include_router(torrent.router, prefix="/torrent", tags=["torrent"])
-api_router.include_router(monitoring.router, prefix="/monitoring", tags=["monitoring"])

app/api/endpoints/dashboard.py

@@ -123,7 +123,7 @@ async def schedule2(_: Annotated[str, Depends(verify_apitoken)]) -> Any:
     """
     查询下载器信息 API_TOKEN认证（?token=xxx）
     """
-    return schedule()
+    return await schedule()
 
 
 @router.get("/transfer", summary="文件整理统计", response_model=List[int])

app/api/endpoints/login.py

@@ -8,8 +8,10 @@
 from app.chain.user import UserChain
 from app.core import security
 from app.core.config import settings
+from app.db.systemconfig_oper import SystemConfigOper
 from app.helper.sites import SitesHelper  # noqa
 from app.helper.wallpaper import WallpaperHelper
+from app.schemas.types import SystemConfigKey
 
 router = APIRouter()
 
@@ -29,7 +31,10 @@ def login_access_token(
     if not success:
         raise HTTPException(status_code=401, detail=user_or_message)
 
+    # 用户等级
     level = SitesHelper().auth_level
+    # 是否显示配置向导
+    show_wizard = not SystemConfigOper().get(SystemConfigKey.SetupWizardState) and not settings.ADVANCED_MODE
     return schemas.Token(
         access_token=security.create_access_token(
             userid=user_or_message.id,
@@ -45,6 +50,7 @@ def login_access_token(
         avatar=user_or_message.avatar,
         level=level,
         permissions=user_or_message.permissions or {},
+        widzard=show_wizard
     )