From 1b3056a7937308c38507f1d49073e4e72a05298e Mon Sep 17 00:00:00 2001 From: jxxghp Date: Tue, 25 Aug 2026 21:08:25 +0800 Subject: [PATCH] =?UTF-8?q?fix(ci):=20=E4=BF=AE=E6=AD=A3=E9=9F=B3=E4=B9=90?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=B8=8E=E5=AF=BC=E5=85=A5=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E9=97=A8=E7=A6=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/application/plugin/identity.py | 1 - app/db/adapters/pluginidentity.py | 4 ++-- tests/test_music_scrape.py | 2 +- tests/test_plugin_identity.py | 3 +-- tests/test_plugin_identity_migration.py | 1 - tests/test_transfer_history_retransfer.py | 9 +++------ 6 files changed, 7 insertions(+), 13 deletions(-) diff --git a/app/application/plugin/identity.py b/app/application/plugin/identity.py index c1131a3eb..9f1a725d9 100644 --- a/app/application/plugin/identity.py +++ b/app/application/plugin/identity.py @@ -8,7 +8,6 @@ from datetime import datetime from enum import StrEnum from typing import Protocol - _PLUGIN_ID_PATTERN = re.compile(r"^[A-Za-z][A-Za-z0-9]{0,127}$") _ONLINE_SOURCE_KEY_PATTERN = re.compile( r"^github:[a-z0-9](?:[a-z0-9-]{0,38})/" diff --git a/app/db/adapters/pluginidentity.py b/app/db/adapters/pluginidentity.py index 9e76bab6c..4f47518ce 100644 --- a/app/db/adapters/pluginidentity.py +++ b/app/db/adapters/pluginidentity.py @@ -3,14 +3,14 @@ from collections.abc import Callable from datetime import datetime -from sqlalchemy.orm import Session from sqlalchemy.exc import IntegrityError +from sqlalchemy.orm import Session from app.application.plugin.identity import ( PluginBindingBasis, - PluginPayloadSourceType, PluginIdentity, PluginIdentityConflictError, + PluginPayloadSourceType, TrustedPluginSourceType, WritePluginIdentityCommand, normalize_physical_plugin_id, diff --git a/tests/test_music_scrape.py b/tests/test_music_scrape.py index 663907a5b..701a65927 100644 --- a/tests/test_music_scrape.py +++ b/tests/test_music_scrape.py @@ -5,7 +5,7 @@ from app.chain.scraping import ScrapingChain, ScrapingConfig, _MusicScrapeFileRe from app.domain.context import MUSIC_ENTITY_ALBUM, MusicAlbumInfo, MusicInfo, MusicLyrics from app.runtime.events import Event from app.domain.meta.metamusic import MetaMusic -from app.schemas import FileItem +from app.schemas.file import FileItem from app.schemas.types import EventType, ScrapingPolicy diff --git a/tests/test_plugin_identity.py b/tests/test_plugin_identity.py index 2d3ef94f7..4f2fd73c3 100644 --- a/tests/test_plugin_identity.py +++ b/tests/test_plugin_identity.py @@ -1,9 +1,9 @@ """插件身份事实、条件写和存量迁移决策测试。""" +import threading from concurrent.futures import ThreadPoolExecutor from dataclasses import replace from datetime import datetime, timedelta, timezone -import threading import pytest import sqlalchemy as sa @@ -23,7 +23,6 @@ from app.db.adapters.pluginidentity import TransactionalPluginIdentityStore from app.db.models import load_all_models from app.db.models.pluginidentity import PluginIdentity as PluginIdentityModel - NOW = datetime(2026, 8, 25, 12, 0, tzinfo=timezone.utc) OFFICIAL_SOURCE = "github:jxxghp/moviepilot-plugins" THIRD_PARTY_SOURCE = "github:example/moviepilot-plugins" diff --git a/tests/test_plugin_identity_migration.py b/tests/test_plugin_identity_migration.py index 8309fd85f..d01b944ac 100644 --- a/tests/test_plugin_identity_migration.py +++ b/tests/test_plugin_identity_migration.py @@ -22,7 +22,6 @@ except ModuleNotFoundError: from app.db.models.pluginidentity import PluginIdentity - MIGRATION = "database.versions.d2e4f6a8b0c1_3_0_9" diff --git a/tests/test_transfer_history_retransfer.py b/tests/test_transfer_history_retransfer.py index ef9619762..897a3c4ca 100644 --- a/tests/test_transfer_history_retransfer.py +++ b/tests/test_transfer_history_retransfer.py @@ -6,12 +6,9 @@ from app.api.endpoints.transfer import ( match_manual_transfer_target_path, recommend_episode_format, ) -from app.schemas import ( - EpisodeFormatRecommendItem, - FileItem, - ManualTransferItem, - TransferDirectoryConf, -) +from app.schemas.file import FileItem +from app.schemas.system import TransferDirectoryConf +from app.schemas.transfer import EpisodeFormatRecommendItem, ManualTransferItem def test_manual_music_transfer_forwards_entity_namespace(monkeypatch):