From e72329a8350de40ec03be73462be1df5e78a6143 Mon Sep 17 00:00:00 2001 From: a76yyyy Date: Wed, 31 Aug 2022 09:52:38 +0800 Subject: [PATCH] Fix time not change --- db/task.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/db/task.py b/db/task.py index 01c2aeeef0d..b68dc321fc2 100644 --- a/db/task.py +++ b/db/task.py @@ -87,7 +87,7 @@ async def get(self, id, fields=None, one_or_none=False, first=True, to_dict=True return self.to_dict(result,fields) return result - async def list(self, userid=None, fields=None, limit=1000, to_dict=True, scan=False, scan_time=time.time(), sql_session=None, **kwargs): + async def list(self, userid=None, fields=None, limit=1000, to_dict=True, scan=False, scan_time=None, sql_session=None, **kwargs): if fields is None: _fields = Task else: @@ -97,7 +97,7 @@ async def list(self, userid=None, fields=None, limit=1000, to_dict=True, scan=Fa if userid is not None: smtm = smtm.where(Task.userid == userid) - if scan: + if scan and scan_time is not None: smtm = smtm.where(Task.next <= scan_time) for key, value in kwargs.items(): @@ -114,5 +114,7 @@ async def list(self, userid=None, fields=None, limit=1000, to_dict=True, scan=Fa def delete(self, id, sql_session=None): return self._delete(delete(Task).where(Task.id == id), sql_session=sql_session) - async def scan(self, now=time.time(), fields=None, sql_session=None): + async def scan(self, now=None, fields=None, sql_session=None): + if now is None: + now = time.time() return await self.list(fields=fields, scan=True, scan_time=now, limit=None, sql_session=sql_session)