hotfix: log any update and use index for excels
All checks were successful
Build and Run VSTU Public TG bot / build_and_run (push) Successful in 27s
All checks were successful
Build and Run VSTU Public TG bot / build_and_run (push) Successful in 27s
This commit is contained in:
@@ -4,11 +4,13 @@ import logging
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
class DataManager:
|
||||
def __init__(self, facultets_url, groups_url):
|
||||
def __init__(self, facultets_url, groups_url, parser_url):
|
||||
self.facultets_url = facultets_url
|
||||
self.groups_url = groups_url
|
||||
self.parser_url = parser_url
|
||||
self.facs = {} # {id: {name: ...}}
|
||||
self.groups = {} # {id: {real_name: ..., facultet_tech: ..., ...}}
|
||||
self.parser = {}
|
||||
|
||||
async def refresh_cache(self, connector):
|
||||
async with aiohttp.ClientSession(connector=connector) as session:
|
||||
@@ -17,6 +19,8 @@ class DataManager:
|
||||
try:
|
||||
self.facs = await fetch(self.facultets_url)
|
||||
self.groups = (await fetch(self.groups_url))['groups']
|
||||
self.parser = (await fetch(self.parser_url))
|
||||
|
||||
logger.info(f"Loaded {len(self.facs)} facs and {len(self.groups)} groups")
|
||||
except Exception as e:
|
||||
logger.error(f"Cache refresh failed: {e}")
|
||||
@@ -29,11 +33,12 @@ class DataManager:
|
||||
|
||||
def get_files_by_fac(self, fac_id):
|
||||
files = {} # {uniqpath*: display_name}
|
||||
for g in self.groups.values():
|
||||
if g.get('facultet_tech') == fac_id or g.get('facultet_recognized') == fac_id:
|
||||
for ex in g.get('excels', []):
|
||||
fn = ex['uniqpath'].replace("vstu.ru/rasp?dep=", "")
|
||||
files[fn] = ex['display_filename']
|
||||
i = -1
|
||||
for ex in self.parser['all_files']:
|
||||
i += 1
|
||||
if ex.get('facultet') == fac_id:
|
||||
files[i] = ex['display_filename']
|
||||
|
||||
return list(files.items())
|
||||
|
||||
def get_excel_by_uniqpath(self, uniqid):
|
||||
|
||||
Reference in New Issue
Block a user