From ca855666d60e55bef0d4740ce631fe5dc26fd472 Mon Sep 17 00:00:00 2001 From: Filippo Casarin Date: Sun, 15 Nov 2026 22:23:45 +0100 Subject: [PATCH] Reuse FileCacher in ImportUser and ImportTeam do_import_all --- cmscontrib/ImportTeam.py | 12 +++++++++--- cmscontrib/ImportUser.py | 13 ++++++++++--- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/cmscontrib/ImportTeam.py b/cmscontrib/ImportTeam.py index 6ab87b83e4..ef955cb4fd 100755 --- a/cmscontrib/ImportTeam.py +++ b/cmscontrib/ImportTeam.py @@ -51,8 +51,13 @@ class TeamImporter: """Script to create a team in the database.""" - def __init__(self, path: str, loader_class: type[TeamLoader]): - self.file_cacher = FileCacher() + def __init__( + self, + path: str, + loader_class: type[TeamLoader], + file_cacher: FileCacher | None = None, + ): + self.file_cacher = file_cacher if file_cacher is not None else FileCacher() self.loader = loader_class(os.path.realpath(path), self.file_cacher) def do_import(self): @@ -96,7 +101,8 @@ def do_import_all( added.add(team_path) importer = TeamImporter( path=team_path, - loader_class=get_loader(team_path) + loader_class=get_loader(team_path), + file_cacher=self.file_cacher, ) importer.do_import() diff --git a/cmscontrib/ImportUser.py b/cmscontrib/ImportUser.py index a7477cc47d..23376bfcd1 100755 --- a/cmscontrib/ImportUser.py +++ b/cmscontrib/ImportUser.py @@ -58,8 +58,14 @@ class UserImporter: """ - def __init__(self, path: str, contest_id: int, loader_class: type[UserLoader]): - self.file_cacher = FileCacher() + def __init__( + self, + path: str, + contest_id: int, + loader_class: type[UserLoader], + file_cacher: FileCacher | None = None, + ): + self.file_cacher = file_cacher if file_cacher is not None else FileCacher() self.contest_id = contest_id self.loader = loader_class(os.path.abspath(path), self.file_cacher) @@ -107,7 +113,8 @@ def do_import_all( importer = UserImporter( path=user_path, contest_id=self.contest_id, - loader_class=get_loader(user_path) + loader_class=get_loader(user_path), + file_cacher=self.file_cacher, ) importer.do_import()