From f676050575a81c8804d44a90d86bf7735c75c963 Mon Sep 17 00:00:00 2001 From: jon-lee Date: Sun, 2 Mar 2025 10:41:18 +0800 Subject: [PATCH] fix: deadline -> end_time --- joj3_config_generator/convert.py | 6 +++--- joj3_config_generator/models/task.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/joj3_config_generator/convert.py b/joj3_config_generator/convert.py index c287e64..792413e 100644 --- a/joj3_config_generator/convert.py +++ b/joj3_config_generator/convert.py @@ -25,8 +25,8 @@ def convert(repo_conf: repo.Config, task_conf: task.Config) -> result.Config: # exact folder difference specified by type log_path=f"/home/tt/.cache/joj3/{task_conf.task.type_}.log", expire_unix_timestamp=( - int(task_conf.release.deadline.timestamp()) - if task_conf.release.deadline + int(task_conf.release.end_time.timestamp()) + if task_conf.release.end_time else -1 ), actor_csv_path="/home/tt/.config/joj/students.csv", # students.csv position @@ -66,6 +66,6 @@ def convert_joj1(joj1_conf: joj1.Config) -> task.Config: task=task.Task( name=(""), ), - release=task.Release(deadline=None, begin_time=None), + release=task.Release(end_time=None, begin_time=None), stages=stages, ) diff --git a/joj3_config_generator/models/task.py b/joj3_config_generator/models/task.py index bcc59c7..aab3d48 100644 --- a/joj3_config_generator/models/task.py +++ b/joj3_config_generator/models/task.py @@ -96,7 +96,7 @@ class Stage(BaseModel): class Release(BaseModel): - deadline: Optional[datetime] = None # RFC 3339 formatted date-time with offset + end_time: Optional[datetime] = None # RFC 3339 formatted date-time with offset begin_time: Optional[datetime] = None