TRip: capitalize RQ job statuses in related endpoints, order job list, other: minor/typing
This commit is contained in:
@@ -76,14 +76,14 @@ class RIP(FastAPI):
|
||||
job_status: str | JobStatus = job.get_status()
|
||||
progress = job.meta.get("progress", 0)
|
||||
if progress == 100 and not job.meta.get("tarball"):
|
||||
job_status = "compressing"
|
||||
job_status = "Compressing"
|
||||
|
||||
tracks_in = job.meta.get("tracks_in")
|
||||
tracks_out = len(job.meta.get("tracks", []))
|
||||
|
||||
return {
|
||||
"id": job.id,
|
||||
"status": job_status,
|
||||
"status": job_status.title(),
|
||||
"result": job.result,
|
||||
"tarball": job.meta.get("tarball"),
|
||||
"enqueued_at": job.enqueued_at,
|
||||
@@ -179,7 +179,7 @@ class RIP(FastAPI):
|
||||
retry=Retry(max=1, interval=[30]),
|
||||
meta={
|
||||
"progress": 0,
|
||||
"status": "queued",
|
||||
"status": "Queued",
|
||||
"target": target,
|
||||
"tracks_in": len(track_ids),
|
||||
"quality": data.quality,
|
||||
@@ -189,7 +189,7 @@ class RIP(FastAPI):
|
||||
return JSONResponse(
|
||||
content={
|
||||
"job_id": job.id,
|
||||
"status": "queued",
|
||||
"status": "Queued",
|
||||
"target": job.meta.get("target", None),
|
||||
"quality": job.meta.get("quality", "Unknown"),
|
||||
}
|
||||
@@ -267,4 +267,10 @@ class RIP(FastAPI):
|
||||
except Exception:
|
||||
continue
|
||||
|
||||
# ---- Sort newest first ----
|
||||
def job_sort_key(job):
|
||||
return job.get("ended_at") or job.get("started_at") or job.get("enqueued_at") or 0
|
||||
|
||||
jobs_info.sort(key=job_sort_key, reverse=True)
|
||||
|
||||
return {"jobs": jobs_info}
|
||||
|
Reference in New Issue
Block a user