diff --git a/alembic/versions/1e169250e949_1_0_4.py b/alembic/versions/1e169250e949_1_0_4.py new file mode 100644 index 00000000..1fce336a --- /dev/null +++ b/alembic/versions/1e169250e949_1_0_4.py @@ -0,0 +1,30 @@ +"""1.0.4 + +Revision ID: 1e169250e949 +Revises: 52ab4930be04 +Create Date: 2023-09-01 09:56:33.907661 + +""" +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision = '1e169250e949' +down_revision = '52ab4930be04' +branch_labels = None +depends_on = None + + +def upgrade() -> None: + # ### commands auto generated by Alembic - please adjust! ### + try: + with op.batch_alter_table("subscribe") as batch_op: + batch_op.add_column(sa.Column('date', sa.String, nullable=True)) + except Exception as e: + pass + # ### end Alembic commands ### + + +def downgrade() -> None: + pass \ No newline at end of file diff --git a/app/chain/subscribe.py b/app/chain/subscribe.py index 6a0e5639..3e109b09 100644 --- a/app/chain/subscribe.py +++ b/app/chain/subscribe.py @@ -185,6 +185,13 @@ class SubscribeChain(ChainBase): subscribes = self.subscribeoper.list(state) # 遍历订阅 for subscribe in subscribes: + # 校验当前时间减订阅创建时间是否大于1分钟,否则跳过先,留出编辑订阅的时间 + if subscribe.date: + now = datetime.now() + subscribe_time = datetime.strptime(subscribe.date, '%Y-%m-%d %H:%M:%S') + if (now - subscribe_time).total_seconds() < 60: + logger.debug(f"订阅标题:{subscribe.name} 新增小于1分钟,暂不搜索...") + continue logger.info(f'开始搜索订阅,标题:{subscribe.name} ...') # 如果状态为N则更新为R if subscribe.state == 'N': diff --git a/app/db/models/subscribe.py b/app/db/models/subscribe.py index b911fb4f..0add658e 100644 --- a/app/db/models/subscribe.py +++ b/app/db/models/subscribe.py @@ -49,6 +49,8 @@ class Subscribe(Base): state = Column(String, nullable=False, index=True, default='N') # 最后更新时间 last_update = Column(String) + # 创建时间 + date = Column(String) # 订阅用户 username = Column(String) # 订阅站点 diff --git a/app/db/subscribe_oper.py b/app/db/subscribe_oper.py index ff13f6e5..574f2791 100644 --- a/app/db/subscribe_oper.py +++ b/app/db/subscribe_oper.py @@ -1,3 +1,4 @@ +import time from typing import Tuple, List from app.core.context import MediaInfo @@ -26,6 +27,7 @@ class SubscribeOper(DbOper): backdrop=mediainfo.get_backdrop_image(), vote=mediainfo.vote_average, description=mediainfo.overview, + date=time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()), **kwargs) subscribe.create(self._db) return subscribe.id, "新增订阅成功" diff --git a/app/plugins/speedlimiter/__init__.py b/app/plugins/speedlimiter/__init__.py index e81b82d1..f8030e12 100644 --- a/app/plugins/speedlimiter/__init__.py +++ b/app/plugins/speedlimiter/__init__.py @@ -268,7 +268,7 @@ class SpeedLimiter(_PluginBase): 'props': { 'model': 'bandwidth', 'label': '智能限速上行带宽', - 'placeholder': 'MB/s' + 'placeholder': 'Mbps' } } ]