Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upstream two more improvements to italy_yaml #1263

Merged
merged 2 commits into from
Oct 5, 2024
Merged

Upstream two more improvements to italy_yaml #1263

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
24b48c2
Speedup by ~50x team and user import
edomora97 Nov 13, 2022
87d1fc1
parse iso datetime in constest.yaml for start/stop
Virv12 May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 17 additions & 5 deletions cmscontrib/loaders/italy_yaml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,8 @@
import os
import os.path
import sys
from datetime import timedelta
from datetime import datetime, timedelta, timezone
from copy import deepcopy

import yaml

Expand All @@ -39,7 +40,6 @@
from cmscommon.constants import \
SCORE_MODE_MAX, SCORE_MODE_MAX_SUBTASK, SCORE_MODE_MAX_TOKENED_LAST
from cmscommon.crypto import build_password
from cmscommon.datetime import make_datetime
from cmscontrib import touch
from .base_loader import ContestLoader, TaskLoader, UserLoader, TeamLoader, LANGUAGE_MAP

Expand All @@ -61,9 +61,15 @@ def getmtime(fname):
return os.stat(fname).st_mtime


yaml_cache = {}

def load_yaml_from_path(path):
if path in yaml_cache:
return yaml_cache[path]
with open(path, "rt", encoding="utf-8") as f:
return yaml.safe_load(f)
value = yaml.safe_load(f)
yaml_cache[path] = value
return deepcopy(value)


def load(src, dst, src_name, dst_name=None, conv=lambda i: i):
Expand Down Expand Up @@ -118,6 +124,12 @@ def load(src, dst, src_name, dst_name=None, conv=lambda i: i):
return conv(res)


def parse_datetime(val):
if isinstance(val, (int, float)):
return datetime.fromtimestamp(val, timezone.utc)
return datetime.fromisoformat(val)


def make_timedelta(t):
return timedelta(seconds=t)

Expand Down Expand Up @@ -207,8 +219,8 @@ def get_contest(self):
if args["token_gen_interval"].total_seconds() == 0:
args["token_gen_interval"] = timedelta(minutes=1)

load(conf, args, ["start", "inizio"], conv=make_datetime)
load(conf, args, ["stop", "fine"], conv=make_datetime)
load(conf, args, ["start", "inizio"], conv=parse_datetime)
load(conf, args, ["stop", "fine"], conv=parse_datetime)
load(conf, args, ["per_user_time"], conv=make_timedelta)
load(conf, args, ["timezone"])

Expand Down
Loading