discours.io/core
5
0
Fork 0
Code Pull Requests Actions Projects Activity

viewed-service-fix
Some checks are pending
Deploy to core / deploy (push) Waiting to run
Details

Browse Source
This commit is contained in:
Untone 2024-01-28 14:20:22 +03:00
parent 38645d063a
commit 37b6776bdb
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
services/viewed.py
View File

@ -44,7 +44,7 @@ class ViewedStorage:
analytics_client = None analytics_client = None
auth_result = None auth_result = None
disabled = False disabled = False
date_range = '' start_date = ''
@staticmethod @staticmethod
async def init(): async def init():
@ -59,16 +59,12 @@ class ViewedStorage:
self.load_precounted_views() self.load_precounted_views()
# Установка диапазона дат на основе времени создания файла views.json # Установка диапазона дат на основе времени создания файла views.json
views_json_path = '/dump/views.json' self.start_date = datetime.fromtimestamp(os.path.getctime('/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}'
_views_stat_task = asyncio.create_task(self.worker()) # Запуск фоновой задачи
# logger.info(views_stat_task) asyncio.create_task(self.worker())
else: else:
logger.info(' * Пожалуйста, добавьте ключевой файл Google Analytics  и задайте ') logger.info(' * Пожалуйста, добавьте ключевой файл Google Analytics и задайте переменную GOOGLE_GA_VIEW_ID')
self.disabled = True self.disabled = True
@staticmethod @staticmethod
@ -94,6 +90,7 @@ class ViewedStorage:
try: try:
start = time.time() start = time.time()
async with self.lock: async with self.lock:
now_date = datetime.now(timezone.utc).strftime('%Y-%m-%d')
if self.analytics_client: if self.analytics_client:
data = ( data = (
self.analytics_client.reports() self.analytics_client.reports()
@ -102,7 +99,7 @@ class ViewedStorage:
'reportRequests': [ 'reportRequests': [
{ {
'viewId': GOOGLE_GA_VIEW_ID, 'viewId': GOOGLE_GA_VIEW_ID,
'dateRanges': self.date_range, 'dateRanges': f'{self.start_date},{now_date}',
'metrics': [{'expression': 'ga:pageviews'}], 'metrics': [{'expression': 'ga:pageviews'}],
'dimensions': [{'name': 'ga:pagePath'}], 'dimensions': [{'name': 'ga:pagePath'}],
} }