formatting
This commit is contained in:
@@ -9,9 +9,12 @@ from rq import Queue, Retry
|
||||
from rq.job import Job
|
||||
from rq.job import JobStatus
|
||||
from rq.registry import (
|
||||
StartedJobRegistry, DeferredJobRegistry,
|
||||
FinishedJobRegistry, FailedJobRegistry,
|
||||
ScheduledJobRegistry)
|
||||
StartedJobRegistry,
|
||||
DeferredJobRegistry,
|
||||
FinishedJobRegistry,
|
||||
FailedJobRegistry,
|
||||
ScheduledJobRegistry,
|
||||
)
|
||||
from utils.rip_background import bulk_download
|
||||
from lyric_search.sources import private
|
||||
from typing import Literal
|
||||
@@ -87,7 +90,9 @@ class RIP(FastAPI):
|
||||
"started_at": job.started_at,
|
||||
"ended_at": job.ended_at,
|
||||
"progress": progress,
|
||||
"tracks": f"{tracks_out} / {tracks_in}" if isinstance(tracks_in, int) else tracks_out,
|
||||
"tracks": f"{tracks_out} / {tracks_in}"
|
||||
if isinstance(tracks_in, int)
|
||||
else tracks_out,
|
||||
"target": job.meta.get("target"),
|
||||
"quality": job.meta.get("quality", "Unknown"),
|
||||
}
|
||||
@@ -111,8 +116,11 @@ class RIP(FastAPI):
|
||||
return JSONResponse(content=albums)
|
||||
|
||||
async def tracks_by_album_id_handler(
|
||||
self, album_id: int, request: Request, user=Depends(get_current_user),
|
||||
quality: str = "FLAC"
|
||||
self,
|
||||
album_id: int,
|
||||
request: Request,
|
||||
user=Depends(get_current_user),
|
||||
quality: str = "FLAC",
|
||||
) -> Response:
|
||||
"""Get tracks by album id"""
|
||||
tracks = await self.trip_util.get_tracks_by_album_id(album_id, quality)
|
||||
@@ -131,7 +139,11 @@ class RIP(FastAPI):
|
||||
return JSONResponse(content=tracks)
|
||||
|
||||
async def track_by_id_handler(
|
||||
self, track_id: int, quality: str, request: Request, user=Depends(get_current_user)
|
||||
self,
|
||||
track_id: int,
|
||||
quality: str,
|
||||
request: Request,
|
||||
user=Depends(get_current_user),
|
||||
) -> Response:
|
||||
"""Get track by ID"""
|
||||
track = await self.trip_util.get_stream_url_by_track_id(track_id, quality)
|
||||
@@ -157,19 +169,21 @@ class RIP(FastAPI):
|
||||
target = data.target
|
||||
job = self.task_queue.enqueue(
|
||||
bulk_download,
|
||||
args=(track_ids, data.quality,),
|
||||
args=(
|
||||
track_ids,
|
||||
data.quality,
|
||||
),
|
||||
job_timeout=14400,
|
||||
failure_ttl=86400,
|
||||
result_ttl=-1,
|
||||
retry=Retry(max=1, interval=[30]),
|
||||
meta={
|
||||
'progress': 0,
|
||||
'status': 'queued',
|
||||
'target': target,
|
||||
'tracks_in': len(track_ids),
|
||||
'quality': data.quality,
|
||||
}
|
||||
|
||||
"progress": 0,
|
||||
"status": "queued",
|
||||
"target": target,
|
||||
"tracks_in": len(track_ids),
|
||||
"quality": data.quality,
|
||||
},
|
||||
)
|
||||
self.redis_conn.lpush("enqueued_job_ids", job.id)
|
||||
return JSONResponse(
|
||||
@@ -181,7 +195,9 @@ class RIP(FastAPI):
|
||||
}
|
||||
)
|
||||
|
||||
async def job_status_handler(self, job_id: str, request: Request, user=Depends(get_current_user)):
|
||||
async def job_status_handler(
|
||||
self, job_id: str, request: Request, user=Depends(get_current_user)
|
||||
):
|
||||
"""Get status and result of a single job"""
|
||||
|
||||
job = None
|
||||
@@ -209,7 +225,7 @@ class RIP(FastAPI):
|
||||
return JSONResponse({"error": "Job not found"}, status_code=404)
|
||||
|
||||
return self._format_job(job)
|
||||
|
||||
|
||||
async def job_list_handler(self, request: Request, user=Depends(get_current_user)):
|
||||
"""List all jobs across all registries (queued, started, finished, failed, etc)."""
|
||||
jobs_info = []
|
||||
|
Reference in New Issue
Block a user