JOJ/Joint-Teapot
11
0
Fork 1
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: repo name in scoreboard
All checks were successful
build / trigger-build-image (push) Successful in 13s
Details

Browse Source
This commit is contained in:
张泊明518370910136 2025-07-27 02:42:00 -07:00
parent 353797323d
commit 0b45898b91
Signed by: 张泊明518370910136
GPG Key ID: CA088E6D9284F870
2 changed files with 24 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
joint_teapot/app.py
View File

@ -408,6 +408,7 @@ def joj3_all_env(
env.github_actor, env.github_actor,
os.path.join(repo_path, scoreboard_filename), os.path.join(repo_path, scoreboard_filename),
env.joj3_conf_name, env.joj3_conf_name,
submitter_repo_name,
) )
tea.pot.git.add_commit( tea.pot.git.add_commit(
grading_repo_name, grading_repo_name,

32
joint_teapot/utils/joj3.py
View File

@ -40,6 +40,7 @@ def generate_scoreboard(
submitter: str, submitter: str,
scoreboard_file_path: str, scoreboard_file_path: str,
exercise_name: str, exercise_name: str,
submitter_repo_name: str,
) -> None: ) -> None:
if not scoreboard_file_path.endswith(".csv"): if not scoreboard_file_path.endswith(".csv"):
logger.error( logger.error(
@ -48,18 +49,25 @@ def generate_scoreboard(
return return
os.makedirs(os.path.dirname(scoreboard_file_path), exist_ok=True) os.makedirs(os.path.dirname(scoreboard_file_path), exist_ok=True)
# Load the csv file if it already exists # Load the csv file if it already exists
fixed_headers = ["", "repo_name", "last_edit", "total"]
fixed_defaults = [submitter, submitter_repo_name, "", "0"]
if os.path.exists(scoreboard_file_path): if os.path.exists(scoreboard_file_path):
with open(scoreboard_file_path, newline="") as file: with open(scoreboard_file_path, newline="") as file:
reader = csv.reader(file) reader = csv.reader(file)
rows = list(reader) rows = list(reader)
columns = rows[0] columns = rows[0]
data = rows[1:] data = rows[1:]
def migrate_scoreboard() -> None:
if "repo_name" in columns:
return
columns.insert(1, "repo_name")
for row in data:
row.insert(1, "")
migrate_scoreboard()
else: else:
columns = [ columns = fixed_headers
"",
"last_edit",
"total",
]
data = [] data = []
submitter_found = False submitter_found = False
@ -69,8 +77,7 @@ def generate_scoreboard(
submitter_found = True submitter_found = True
break break
if not submitter_found: if not submitter_found:
fixed_columns = [submitter, "", "0"] submitter_row = fixed_defaults + [""] * (len(columns) - len(fixed_headers))
submitter_row = fixed_columns + [""] * (len(columns) - len(fixed_columns))
data.append(submitter_row) data.append(submitter_row)
# Update data # Update data
@ -85,9 +92,9 @@ def generate_scoreboard(
exercise_name = comment.split("-")[0] exercise_name = comment.split("-")[0]
# Find if exercise in table: # Find if exercise in table:
if exercise_name not in columns: if exercise_name not in columns:
column_tail = columns[3:] column_tail = columns[len(fixed_headers) :]
bisect.insort(column_tail, exercise_name) bisect.insort(column_tail, exercise_name)
columns[3:] = column_tail columns[len(fixed_headers) :] = column_tail
index = columns.index(exercise_name) index = columns.index(exercise_name)
for row in data: for row in data:
row.insert(index, "") row.insert(index, "")
@ -101,17 +108,22 @@ def generate_scoreboard(
total = 0 total = 0
for col in columns: for col in columns:
if col in ["", "total", "last_edit"]: if col in fixed_headers:
continue continue
idx = columns.index(col) idx = columns.index(col)
if (submitter_row[idx] is not None) and (submitter_row[idx] != ""): if (submitter_row[idx] is not None) and (submitter_row[idx] != ""):
try:
total += int(submitter_row[idx]) total += int(submitter_row[idx])
except ValueError:
pass
submitter_row[columns.index("total")] = str(total) submitter_row[columns.index("total")] = str(total)
now = datetime.now().strftime("%Y-%m-%d %H:%M:%S") now = datetime.now().strftime("%Y-%m-%d %H:%M:%S")
submitter_row[columns.index("last_edit")] = now submitter_row[columns.index("last_edit")] = now
submitter_row[columns.index("repo")] = submitter_repo_name
# Sort data by total, from low to high # Sort data by total, from low to high
data.sort(key=lambda x: int(x[columns.index("total")])) data.sort(key=lambda x: int(x[columns.index("total")]))