From 3bebd597e39a437d4e52f9d7d074fad4d1b26e91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20K=C3=BCnzel?= <simonk@fsmpi.rwth-aachen.de>
Date: Wed, 16 Apr 2025 23:50:39 +0200
Subject: [PATCH] Fix small bugs
---
api/src/api/routes/media_process.py | 4 +++-
job_controller/jobs/source_file_sorter/job.py | 1 +
job_controller/src/job_controller/job_controller.py | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/api/src/api/routes/media_process.py b/api/src/api/routes/media_process.py
index 7d22825..cf04c04 100644
--- a/api/src/api/routes/media_process.py
+++ b/api/src/api/routes/media_process.py
@@ -22,7 +22,7 @@ api_register_non_stored_object("video_slide_row", jnode.video_slide_jnode.VideoS
("entries_per_page", "?int", "Must be between 10 and 100"),
("page", "?int", "Zero-indexed. Must not be negative. If this is bigger than the page count, an empty "
"page is returned"),
- ("include_sorted", "boolean", f"Default is false"),
+ ("include_sorted", "?boolean", f"Default is false"),
],
response_objects=[
("page_count", "int"),
@@ -38,6 +38,7 @@ def api_route_get_sorter_files():
def _trans(session: SessionDb):
query = SorterFile.select(api_user_ac(), [
+ SorterFile.designated_medium_file,
SorterFile.lecture,
Lecture.course,
])
@@ -64,6 +65,7 @@ def api_route_get_sorter_files():
is_mod=True,
course_context=course_context,
lecture_context=lecture_context,
+ medium_file_context=NoSerializationContext(),
include_lectures=False,
include_chapters=False,
include_media=False,
diff --git a/job_controller/jobs/source_file_sorter/job.py b/job_controller/jobs/source_file_sorter/job.py
index f9d5dcd..bb6ac1a 100644
--- a/job_controller/jobs/source_file_sorter/job.py
+++ b/job_controller/jobs/source_file_sorter/job.py
@@ -60,6 +60,7 @@ def _check_file(
file = files_in_sorter_dir[db_path]
if status == SorterFileStatus.SORTING_UPCOMING and file.status == SorterFileStatus.ERROR:
status = SorterFileStatus.ERROR
+ error_message = file.sorter_error_message
else:
file = SorterFile(
file_path=db_path,
diff --git a/job_controller/src/job_controller/job_controller.py b/job_controller/src/job_controller/job_controller.py
index d8733ce..d5f8f7a 100644
--- a/job_controller/src/job_controller/job_controller.py
+++ b/job_controller/src/job_controller/job_controller.py
@@ -197,7 +197,7 @@ class JobController:
if is_success is None:
# Not finished yet
return
- if job.run_start_time is None:
+ if is_success and job.run_start_time is None:
raise ValueError(f"Job has finished successfully but start time is missing")
failed = not is_success
--
GitLab