Fixes
This commit is contained in:
@@ -131,7 +131,7 @@ def review_task(task_id):
|
|||||||
|
|
||||||
@app.route("/video/<int:video_id>")
|
@app.route("/video/<int:video_id>")
|
||||||
def serve_video(video_id):
|
def serve_video(video_id):
|
||||||
"""Stream video from NFS-mounted /data/input; supports HTTP range requests."""
|
"""Stream video from NFS-mounted /data; supports HTTP range requests."""
|
||||||
# Resolve video path via the API first
|
# Resolve video path via the API first
|
||||||
try:
|
try:
|
||||||
vid_data = api_get(f"video/{video_id}")
|
vid_data = api_get(f"video/{video_id}")
|
||||||
@@ -142,18 +142,15 @@ def serve_video(video_id):
|
|||||||
if not file_path or file_path == "unknown":
|
if not file_path or file_path == "unknown":
|
||||||
return "Video file path unknown", 404
|
return "Video file path unknown", 404
|
||||||
|
|
||||||
# Try multiple base paths for video files (NFS mounts may vary)
|
# The NFS share is mounted at /data inside the container.
|
||||||
nfs_input = os.environ.get("NAS_INPUT_PATH", "/data/input")
|
# DB stores absolute paths starting with /data/... which should work directly.
|
||||||
nfs_output = os.environ.get("NAS_OUTPUT_PATH", "/mnt/nas/output")
|
# Also try env-var overrides in case mounts differ from the default.
|
||||||
|
|
||||||
candidates = []
|
candidates = []
|
||||||
if os.path.isabs(file_path):
|
if os.path.isabs(file_path):
|
||||||
candidates.append(file_path)
|
candidates.append(file_path)
|
||||||
candidates.append(os.path.join(nfs_input, file_path.lstrip('/')))
|
|
||||||
candidates.append(os.path.join(nfs_output, file_path.lstrip('/')))
|
|
||||||
else:
|
else:
|
||||||
candidates.append(os.path.join(nfs_input, file_path))
|
nfs_base = os.environ.get("NAS_INPUT_PATH", "/data")
|
||||||
candidates.append(os.path.join(nfs_output, file_path))
|
candidates.append(os.path.join(nfs_base, file_path))
|
||||||
|
|
||||||
for full_path in candidates:
|
for full_path in candidates:
|
||||||
try:
|
try:
|
||||||
|
|||||||
Reference in New Issue
Block a user