From 8845148cce1d8a60892a59f97570c585a16d7476 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B6=B5=E6=9B=A6?= Date: Wed, 30 Oct 2024 00:13:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B0=B7=E6=AD=8C?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=AF=BC=E8=87=B4=E7=9A=84=E5=8D=A1=E9=A1=BF?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xiaomusic/analytics.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/xiaomusic/analytics.py b/xiaomusic/analytics.py index fb9b5c4..34ccc11 100644 --- a/xiaomusic/analytics.py +++ b/xiaomusic/analytics.py @@ -11,7 +11,6 @@ class Analytics: self.gtag = None self.current_date = None self.log = log - self.task = None self.init() def init(self): @@ -30,10 +29,7 @@ class Analytics: async def run_with_cancel(self, func, *args, **kwargs): try: - if self.task: - self.log.warning(f"analytics run_with_cancel old : {self.task}") - self.task.cancel() - self.task = asyncio.create_task(func(*args, **kwargs)) + asyncio.ensure_future(asyncio.to_thread(func, *args, **kwargs)) except Exception as e: self.log.warning(f"analytics run_with_cancel failed {e}") return None @@ -45,7 +41,7 @@ class Analytics: self.log.warning(f"analytics send_startup_event failed {e}") self.init() - async def _send_startup_event(self): + def _send_startup_event(self): event = self.gtag.create_new_event(name="startup") event.set_event_param(name="version", value=__version__) event_list = [event] @@ -58,7 +54,7 @@ class Analytics: self.log.warning(f"analytics send_daily_event failed {e}") self.init() - async def _send_daily_event(self): + def _send_daily_event(self): current_date = datetime.now().strftime("%Y-%m-%d") if self.current_date == current_date: return @@ -77,7 +73,7 @@ class Analytics: self.log.warning(f"analytics send_play_event failed {e}") self.init() - async def _send_play_event(self, name, sec): + def _send_play_event(self, name, sec): event = self.gtag.create_new_event(name="play") event.set_event_param(name="version", value=__version__) event.set_event_param(name="music", value=name)