From 0679a32659873a4f6ed7ec44f9c34564f055bcac Mon Sep 17 00:00:00 2001 From: jxxghp Date: Fri, 19 Apr 2024 12:31:38 +0800 Subject: [PATCH] fix --- app/api/endpoints/login.py | 1 - app/api/endpoints/message.py | 1 - app/core/meta/metabase.py | 13 +++++-------- app/db/models/sitestatistic.py | 2 +- app/utils/string.py | 11 +++++++++-- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/app/api/endpoints/login.py b/app/api/endpoints/login.py index 4e7031d6..d182d507 100644 --- a/app/api/endpoints/login.py +++ b/app/api/endpoints/login.py @@ -15,7 +15,6 @@ from app.db import get_db from app.db.models.user import User from app.log import logger from app.utils.web import WebUtils -from app.utils.otp import OtpUtils router = APIRouter() diff --git a/app/api/endpoints/message.py b/app/api/endpoints/message.py index 96ec71c3..a25b0cbe 100644 --- a/app/api/endpoints/message.py +++ b/app/api/endpoints/message.py @@ -1,4 +1,3 @@ -import json from typing import Union, Any, List from fastapi import APIRouter, BackgroundTasks, Depends diff --git a/app/core/meta/metabase.py b/app/core/meta/metabase.py index 36175526..17870721 100644 --- a/app/core/meta/metabase.py +++ b/app/core/meta/metabase.py @@ -550,16 +550,13 @@ class MetaBase(object): self.year = meta.year # 季 if (self.type == MediaType.TV - and not self.begin_season): - if self.begin_season is None and meta.begin_season is not None: - self.begin_season = meta.begin_season - if self.end_season is None and meta.end_season is not None: - self.end_season = meta.end_season - if self.total_season is None and meta.total_season is not None: - self.total_season = meta.total_season + and self.begin_season is None): + self.begin_season = meta.begin_season + self.end_season = meta.end_season + self.total_season = meta.total_season # 开始集 if (self.type == MediaType.TV - and not self.begin_episode): + and self.begin_episode is None): self.begin_episode = meta.begin_episode self.end_episode = meta.end_episode self.total_episode = meta.total_episode diff --git a/app/db/models/sitestatistic.py b/app/db/models/sitestatistic.py index 44a27b1d..a8983f71 100644 --- a/app/db/models/sitestatistic.py +++ b/app/db/models/sitestatistic.py @@ -1,6 +1,6 @@ from datetime import datetime -from sqlalchemy import Boolean, Column, Integer, String, Sequence +from sqlalchemy import Column, Integer, String, Sequence from sqlalchemy.orm import Session from app.db import db_query, db_update, Base diff --git a/app/utils/string.py b/app/utils/string.py index 9ea53920..bc1cb05d 100644 --- a/app/utils/string.py +++ b/app/utils/string.py @@ -13,6 +13,12 @@ import dateutil.parser from app.schemas.types import MediaType +_special_domains = [ + 'u2.dmhy.org', + 'pt.ecust.pp.ua', +] + + class StringUtils: @staticmethod @@ -257,8 +263,9 @@ class StringUtils: """ if not url: return "" - if 'u2.dmhy.org' in url: - return 'u2.dmhy.org' + for domain in _special_domains: + if domain in url: + return domain _, netloc = StringUtils.get_url_netloc(url) if netloc: locs = netloc.split(".")