From f63cd46d1221ad81cc520bdb4cffec8a098428de Mon Sep 17 00:00:00 2001 From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com> Date: Tue, 8 Jul 2025 15:47:31 +1200 Subject: [PATCH] Store task name in task and statusdb --- sbysrc/sby.py | 2 +- sbysrc/sby_core.py | 3 ++- sbysrc/sby_status.py | 11 ++++++----- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/sbysrc/sby.py b/sbysrc/sby.py index dc02971..8748ffe 100644 --- a/sbysrc/sby.py +++ b/sbysrc/sby.py @@ -467,7 +467,7 @@ def start_task(taskloop, taskname): else: junit_filename = "junit" - task = SbyTask(sbyconfig, my_workdir, early_logmsgs, reusedir, taskloop) + task = SbyTask(sbyconfig, my_workdir, early_logmsgs, reusedir, taskloop, name=taskname) for k, v in exe_paths.items(): task.exe_paths[k] = v diff --git a/sbysrc/sby_core.py b/sbysrc/sby_core.py index 6e14d6d..5ac0bc0 100644 --- a/sbysrc/sby_core.py +++ b/sbysrc/sby_core.py @@ -825,12 +825,13 @@ class SbySummary: class SbyTask(SbyConfig): - def __init__(self, sbyconfig, workdir, early_logs, reusedir, taskloop=None, logfile=None): + def __init__(self, sbyconfig, workdir, early_logs, reusedir, taskloop=None, logfile=None, name=None): super().__init__() self.used_options = set() self.models = dict() self.workdir = workdir self.reusedir = reusedir + self.name = name self.status = "UNKNOWN" self.total_time = 0 self.expect = list() diff --git a/sbysrc/sby_status.py b/sbysrc/sby_status.py index 41990b6..12eb64f 100644 --- a/sbysrc/sby_status.py +++ b/sbysrc/sby_status.py @@ -18,6 +18,7 @@ SQLSCRIPT = """\ CREATE TABLE task ( id INTEGER PRIMARY KEY, workdir TEXT, + name TEXT, mode TEXT, created REAL ); @@ -124,7 +125,7 @@ class SbyStatusDb: self._setup() if task is not None: - self.task_id = self.create_task(workdir=task.workdir, mode=task.opt_mode) + self.task_id = self.create_task(workdir=task.workdir, name=task.name, mode=task.opt_mode) def log_debug(self, *args): if self.debug: @@ -147,13 +148,13 @@ class SbyStatusDb: return schema_script != SQLSCRIPT @transaction - def create_task(self, workdir: str, mode: str) -> int: + def create_task(self, workdir: str, name: str, mode: str) -> int: return self.db.execute( """ - INSERT INTO task (workdir, mode, created) - VALUES (:workdir, :mode, :now) + INSERT INTO task (workdir, name, mode, created) + VALUES (:workdir, :name, :mode, :now) """, - dict(workdir=workdir, mode=mode, now=time.time()), + dict(workdir=workdir, name=name, mode=mode, now=time.time()), ).lastrowid @transaction