From 37b6776bdb5537a80b9c6c5dfa0448ea6d71499c Mon Sep 17 00:00:00 2001 From: Untone Date: Sun, 28 Jan 2024 14:20:22 +0300 Subject: [PATCH] viewed-service-fix --- services/viewed.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/services/viewed.py b/services/viewed.py index c6c70674..c2cf0dc1 100644 --- a/services/viewed.py +++ b/services/viewed.py @@ -44,7 +44,7 @@ class ViewedStorage: analytics_client = None auth_result = None disabled = False - date_range = '' + start_date = '' @staticmethod async def init(): @@ -59,16 +59,12 @@ class ViewedStorage: self.load_precounted_views() # Установка диапазона дат на основе времени создания файла views.json - views_json_path = '/dump/views.json' - creation_time = datetime.fromtimestamp(os.path.getctime(views_json_path)) - end_date = datetime.now(timezone.utc).strftime('%Y-%m-%d') - start_date = creation_time.strftime('%Y-%m-%d') - self.date_range = f'{start_date},{end_date}' + self.start_date = datetime.fromtimestamp(os.path.getctime('/dump/views.json')) - _views_stat_task = asyncio.create_task(self.worker()) - # logger.info(views_stat_task) + # Запуск фоновой задачи + asyncio.create_task(self.worker()) else: - logger.info(' * Пожалуйста, добавьте ключевой файл Google Analytics  и задайте ') + logger.info(' * Пожалуйста, добавьте ключевой файл Google Analytics и задайте переменную GOOGLE_GA_VIEW_ID') self.disabled = True @staticmethod @@ -94,6 +90,7 @@ class ViewedStorage: try: start = time.time() async with self.lock: + now_date = datetime.now(timezone.utc).strftime('%Y-%m-%d') if self.analytics_client: data = ( self.analytics_client.reports() @@ -102,7 +99,7 @@ class ViewedStorage: 'reportRequests': [ { 'viewId': GOOGLE_GA_VIEW_ID, - 'dateRanges': self.date_range, + 'dateRanges': f'{self.start_date},{now_date}', 'metrics': [{'expression': 'ga:pageviews'}], 'dimensions': [{'name': 'ga:pagePath'}], }