feat(weibo): 展示 CK 导入重复账号明细
This commit is contained in:
@@ -27,6 +27,14 @@ class WeiboImportIssue:
|
||||
message: str
|
||||
|
||||
|
||||
@dataclass(frozen=True, slots=True)
|
||||
class WeiboImportDuplicate:
|
||||
line: int
|
||||
uid: str
|
||||
nickname: str
|
||||
message: str
|
||||
|
||||
|
||||
def _now() -> datetime:
|
||||
return datetime.now(UTC)
|
||||
|
||||
@@ -64,15 +72,21 @@ def import_weibo_cookies(
|
||||
update_existing: bool = False,
|
||||
current_user_id: int | None = None,
|
||||
can_update_all: bool = False,
|
||||
) -> tuple[list[WeiboAccount], list[WeiboImportIssue], int]:
|
||||
) -> tuple[
|
||||
list[WeiboAccount],
|
||||
list[WeiboImportIssue],
|
||||
int,
|
||||
list[WeiboImportDuplicate],
|
||||
]:
|
||||
"""逐行验证并导入微博 CK。
|
||||
|
||||
返回 ``(成功账号, 错误列表, 跳过数)``。单行 CK 失效或网络失败只记录该行,
|
||||
不阻断其余账号导入。
|
||||
返回 ``(成功账号, 错误列表, 跳过数, 重复明细)``。单行 CK 失效或网络失败
|
||||
只记录该行,不阻断其余账号导入。
|
||||
"""
|
||||
|
||||
accounts: list[WeiboAccount] = []
|
||||
errors: list[WeiboImportIssue] = []
|
||||
duplicates: list[WeiboImportDuplicate] = []
|
||||
skipped = 0
|
||||
seen_uids: set[str] = set()
|
||||
clean_tag = (tag or "").strip()
|
||||
@@ -92,6 +106,14 @@ def import_weibo_cookies(
|
||||
|
||||
if snapshot.uid in seen_uids:
|
||||
skipped += 1
|
||||
duplicates.append(
|
||||
WeiboImportDuplicate(
|
||||
line=line_no,
|
||||
uid=snapshot.uid,
|
||||
nickname=snapshot.nickname,
|
||||
message="本次粘贴内容中该 UID 重复",
|
||||
)
|
||||
)
|
||||
continue
|
||||
seen_uids.add(snapshot.uid)
|
||||
|
||||
@@ -126,6 +148,14 @@ def import_weibo_cookies(
|
||||
continue
|
||||
if account is not None and not update_existing:
|
||||
skipped += 1
|
||||
duplicates.append(
|
||||
WeiboImportDuplicate(
|
||||
line=line_no,
|
||||
uid=snapshot.uid,
|
||||
nickname=account.nickname or snapshot.nickname,
|
||||
message="账号池中已存在,未勾选更新 CK",
|
||||
)
|
||||
)
|
||||
continue
|
||||
if account is None:
|
||||
account = WeiboAccount(uid=snapshot.uid, cookie=cookie)
|
||||
@@ -139,7 +169,7 @@ def import_weibo_cookies(
|
||||
db.commit()
|
||||
for account in accounts:
|
||||
db.refresh(account)
|
||||
return accounts, errors, skipped
|
||||
return accounts, errors, skipped, duplicates
|
||||
|
||||
|
||||
def refresh_weibo_account(
|
||||
|
||||
Reference in New Issue
Block a user