Compare commits
26 Commits
v0.9.0
...
cd0331d4ce
| Author | SHA1 | Date | |
|---|---|---|---|
| cd0331d4ce | |||
| 38c6174f83 | |||
| 5b22bceed2 | |||
| 80f21915e3 | |||
| b09ba3fa9e | |||
| 5b7a55a05d | |||
| 2200da491f | |||
| 3d6469c60c | |||
| 6a4ac8b8ed | |||
| 1f6906c946 | |||
| dfba88a601 | |||
| e94c088df0 | |||
| 9569103edd | |||
| 079afeee7c | |||
| fbbfa6fdce | |||
| 56920a5247 | |||
| 08c1dd8b33 | |||
| 2b63ad1857 | |||
| 72f6a4e8f5 | |||
| 799a2ab353 | |||
| 066f4431ba | |||
| 97f9ef7073 | |||
| 592e40c1a6 | |||
| 73dd7a1569 | |||
| 7abf0b4d4c | |||
| 9e5bd4a8ec |
@@ -0,0 +1,36 @@
|
|||||||
|
name: Docker Image
|
||||||
|
|
||||||
|
on:
|
||||||
|
workflow_dispatch: # manual only — build locally and push to ghcr.io
|
||||||
|
|
||||||
|
permissions:
|
||||||
|
contents: read
|
||||||
|
packages: write
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- uses: docker/login-action@v3
|
||||||
|
with:
|
||||||
|
registry: ghcr.io
|
||||||
|
username: ${{ github.actor }}
|
||||||
|
password: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
|
- uses: docker/metadata-action@v5
|
||||||
|
id: meta
|
||||||
|
with:
|
||||||
|
images: ghcr.io/${{ github.repository }}-server
|
||||||
|
tags: |
|
||||||
|
type=ref,event=branch
|
||||||
|
type=semver,pattern={{version}}
|
||||||
|
type=sha,prefix=
|
||||||
|
|
||||||
|
- uses: docker/build-push-action@v6
|
||||||
|
with:
|
||||||
|
context: .
|
||||||
|
push: true
|
||||||
|
tags: ${{ steps.meta.outputs.tags }}
|
||||||
|
labels: ${{ steps.meta.outputs.labels }}
|
||||||
+13
@@ -0,0 +1,13 @@
|
|||||||
|
FROM nvidia/cuda:12.6.3-runtime-ubuntu24.04
|
||||||
|
|
||||||
|
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||||
|
python3 python3-pip ffmpeg \
|
||||||
|
&& rm -rf /var/lib/apt/lists/*
|
||||||
|
|
||||||
|
WORKDIR /app
|
||||||
|
COPY core/ core/
|
||||||
|
COPY server/ server/
|
||||||
|
RUN pip install --no-cache-dir --break-system-packages fastapi uvicorn[standard]
|
||||||
|
|
||||||
|
EXPOSE 8000
|
||||||
|
CMD ["uvicorn", "server.app:app", "--host", "0.0.0.0", "--port", "8000"]
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
import json
|
||||||
|
import os
|
||||||
|
|
||||||
|
|
||||||
|
def build_annotation_json_path(folder: str) -> str:
|
||||||
|
return os.path.join(folder, "dataset.json")
|
||||||
|
|
||||||
|
|
||||||
|
def remove_clip_annotation(folder: str, clip_path: str) -> None:
|
||||||
|
"""Remove the entry for *clip_path* from <folder>/dataset.json if present."""
|
||||||
|
json_path = build_annotation_json_path(folder)
|
||||||
|
if not os.path.exists(json_path):
|
||||||
|
return
|
||||||
|
abs_path = os.path.abspath(clip_path)
|
||||||
|
with open(json_path, "r", encoding="utf-8") as f:
|
||||||
|
try:
|
||||||
|
entries = json.load(f)
|
||||||
|
except (json.JSONDecodeError, ValueError):
|
||||||
|
return
|
||||||
|
entries = [e for e in entries if e.get("path") != abs_path]
|
||||||
|
with open(json_path, "w", encoding="utf-8") as f:
|
||||||
|
json.dump(entries, f, indent=2, ensure_ascii=False)
|
||||||
|
f.write("\n")
|
||||||
|
|
||||||
|
|
||||||
|
def upsert_clip_annotation(folder: str, clip_path: str, label: str) -> None:
|
||||||
|
"""Insert or update one entry in <folder>/dataset.json.
|
||||||
|
|
||||||
|
Each entry stores a path relative to *folder* and the sound label.
|
||||||
|
Matches on ``path``; if an entry for the same clip already exists it is
|
||||||
|
replaced (overwrite-export case). Nothing is written when *label* is
|
||||||
|
empty.
|
||||||
|
"""
|
||||||
|
if not label.strip():
|
||||||
|
return
|
||||||
|
os.makedirs(folder, exist_ok=True)
|
||||||
|
json_path = build_annotation_json_path(folder)
|
||||||
|
entries: list[dict] = []
|
||||||
|
if os.path.exists(json_path):
|
||||||
|
with open(json_path, "r", encoding="utf-8") as f:
|
||||||
|
try:
|
||||||
|
entries = json.load(f)
|
||||||
|
except (json.JSONDecodeError, ValueError):
|
||||||
|
entries = []
|
||||||
|
abs_path = os.path.abspath(clip_path)
|
||||||
|
entry: dict = {"path": abs_path, "label": label}
|
||||||
|
for i, e in enumerate(entries):
|
||||||
|
if e.get("path") == abs_path:
|
||||||
|
entries[i] = entry
|
||||||
|
break
|
||||||
|
else:
|
||||||
|
entries.append(entry)
|
||||||
|
with open(json_path, "w", encoding="utf-8") as f:
|
||||||
|
json.dump(entries, f, indent=2, ensure_ascii=False)
|
||||||
|
f.write("\n")
|
||||||
+235
@@ -0,0 +1,235 @@
|
|||||||
|
import sqlite3
|
||||||
|
from datetime import datetime, timezone
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
from .paths import _log
|
||||||
|
|
||||||
|
|
||||||
|
class ProcessedDB:
|
||||||
|
_SCHEMA_VERSION = 3 # bump when schema changes
|
||||||
|
|
||||||
|
def __init__(self, db_path: str | None = None):
|
||||||
|
if db_path is None:
|
||||||
|
db_path = str(Path.home() / ".8cut.db")
|
||||||
|
self._path = db_path
|
||||||
|
try:
|
||||||
|
self._con = sqlite3.connect(db_path, check_same_thread=False)
|
||||||
|
self._migrate()
|
||||||
|
self._enabled = True
|
||||||
|
_log(f"DB opened: {db_path}")
|
||||||
|
except Exception as e:
|
||||||
|
_log(f"DB unavailable: {e}")
|
||||||
|
self._con = None
|
||||||
|
self._enabled = False
|
||||||
|
|
||||||
|
def _migrate(self) -> None:
|
||||||
|
"""Create table if missing, then add any new columns for old DBs."""
|
||||||
|
cols = {
|
||||||
|
row[1]
|
||||||
|
for row in self._con.execute("PRAGMA table_info(processed)").fetchall()
|
||||||
|
}
|
||||||
|
if not cols:
|
||||||
|
# Fresh DB — create from scratch
|
||||||
|
self._con.execute(
|
||||||
|
"CREATE TABLE IF NOT EXISTS processed ("
|
||||||
|
" id INTEGER PRIMARY KEY AUTOINCREMENT,"
|
||||||
|
" filename TEXT NOT NULL,"
|
||||||
|
" start_time REAL NOT NULL,"
|
||||||
|
" output_path TEXT NOT NULL,"
|
||||||
|
" label TEXT NOT NULL DEFAULT '',"
|
||||||
|
" category TEXT NOT NULL DEFAULT '',"
|
||||||
|
" short_side INTEGER DEFAULT 512,"
|
||||||
|
" portrait_ratio TEXT NOT NULL DEFAULT '',"
|
||||||
|
" crop_center REAL NOT NULL DEFAULT 0.5,"
|
||||||
|
" format TEXT NOT NULL DEFAULT 'MP4',"
|
||||||
|
" clip_count INTEGER NOT NULL DEFAULT 3,"
|
||||||
|
" spread REAL NOT NULL DEFAULT 3.0,"
|
||||||
|
" profile TEXT NOT NULL DEFAULT 'default',"
|
||||||
|
" processed_at TEXT NOT NULL"
|
||||||
|
")"
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
# Add missing columns to legacy tables
|
||||||
|
new_cols = {
|
||||||
|
"label": "TEXT NOT NULL DEFAULT ''",
|
||||||
|
"category": "TEXT NOT NULL DEFAULT ''",
|
||||||
|
"short_side": "INTEGER DEFAULT 512",
|
||||||
|
"portrait_ratio": "TEXT NOT NULL DEFAULT ''",
|
||||||
|
"crop_center": "REAL NOT NULL DEFAULT 0.5",
|
||||||
|
"format": "TEXT NOT NULL DEFAULT 'MP4'",
|
||||||
|
"clip_count": "INTEGER NOT NULL DEFAULT 3",
|
||||||
|
"spread": "REAL NOT NULL DEFAULT 3.0",
|
||||||
|
"profile": "TEXT NOT NULL DEFAULT 'default'",
|
||||||
|
}
|
||||||
|
for col, typedef in new_cols.items():
|
||||||
|
if col not in cols:
|
||||||
|
self._con.execute(
|
||||||
|
f"ALTER TABLE processed ADD COLUMN {col} {typedef}"
|
||||||
|
)
|
||||||
|
self._con.execute(
|
||||||
|
"CREATE INDEX IF NOT EXISTS idx_filename ON processed(filename)"
|
||||||
|
)
|
||||||
|
self._con.execute(
|
||||||
|
"CREATE TABLE IF NOT EXISTS hidden_files ("
|
||||||
|
" filename TEXT NOT NULL,"
|
||||||
|
" profile TEXT NOT NULL DEFAULT 'default',"
|
||||||
|
" PRIMARY KEY (filename, profile)"
|
||||||
|
")"
|
||||||
|
)
|
||||||
|
self._con.commit()
|
||||||
|
|
||||||
|
def add(self, filename: str, start_time: float, output_path: str,
|
||||||
|
label: str = "", category: str = "",
|
||||||
|
short_side: int | None = None, portrait_ratio: str = "",
|
||||||
|
crop_center: float = 0.5, fmt: str = "MP4",
|
||||||
|
clip_count: int = 3, spread: float = 3.0,
|
||||||
|
profile: str = "default") -> None:
|
||||||
|
if not self._enabled:
|
||||||
|
return
|
||||||
|
self._con.execute(
|
||||||
|
"INSERT INTO processed"
|
||||||
|
" (filename, start_time, output_path, label, category,"
|
||||||
|
" short_side, portrait_ratio, crop_center, format,"
|
||||||
|
" clip_count, spread, profile, processed_at)"
|
||||||
|
" VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
|
||||||
|
(filename, start_time, output_path, label, category,
|
||||||
|
short_side, portrait_ratio, crop_center, fmt,
|
||||||
|
clip_count, spread, profile,
|
||||||
|
datetime.now(timezone.utc).isoformat()),
|
||||||
|
)
|
||||||
|
self._con.commit()
|
||||||
|
|
||||||
|
def get_labels(self) -> list[str]:
|
||||||
|
"""Return distinct non-empty labels ordered by most recently used."""
|
||||||
|
if not self._enabled:
|
||||||
|
return []
|
||||||
|
rows = self._con.execute(
|
||||||
|
"SELECT DISTINCT label FROM processed"
|
||||||
|
" WHERE label != '' ORDER BY processed_at DESC"
|
||||||
|
).fetchall()
|
||||||
|
# Deduplicate while preserving order (DISTINCT on processed_at DESC
|
||||||
|
# may return duplicates if the same label was used multiple times).
|
||||||
|
seen: set[str] = set()
|
||||||
|
result = []
|
||||||
|
for (lbl,) in rows:
|
||||||
|
if lbl not in seen:
|
||||||
|
seen.add(lbl)
|
||||||
|
result.append(lbl)
|
||||||
|
return result
|
||||||
|
|
||||||
|
def get_by_output_path(self, output_path: str) -> dict | None:
|
||||||
|
"""Return config dict for an output_path, or None."""
|
||||||
|
if not self._enabled:
|
||||||
|
return None
|
||||||
|
cur = self._con.cursor()
|
||||||
|
cur.row_factory = sqlite3.Row
|
||||||
|
row = cur.execute(
|
||||||
|
"SELECT label, category, short_side, portrait_ratio, crop_center, format,"
|
||||||
|
" clip_count, spread"
|
||||||
|
" FROM processed WHERE output_path = ?",
|
||||||
|
(output_path,),
|
||||||
|
).fetchone()
|
||||||
|
return dict(row) if row else None
|
||||||
|
|
||||||
|
def delete_by_output_path(self, output_path: str) -> None:
|
||||||
|
if not self._enabled:
|
||||||
|
return
|
||||||
|
self._con.execute("DELETE FROM processed WHERE output_path = ?", (output_path,))
|
||||||
|
self._con.commit()
|
||||||
|
|
||||||
|
def get_group(self, output_path: str) -> list[str]:
|
||||||
|
"""Return all output_paths sharing the same (filename, start_time) as *output_path*."""
|
||||||
|
if not self._enabled:
|
||||||
|
return []
|
||||||
|
row = self._con.execute(
|
||||||
|
"SELECT filename, start_time FROM processed WHERE output_path = ?",
|
||||||
|
(output_path,),
|
||||||
|
).fetchone()
|
||||||
|
if not row:
|
||||||
|
return []
|
||||||
|
rows = self._con.execute(
|
||||||
|
"SELECT output_path FROM processed"
|
||||||
|
" WHERE filename = ? AND start_time = ? ORDER BY output_path",
|
||||||
|
(row[0], row[1]),
|
||||||
|
).fetchall()
|
||||||
|
return [r[0] for r in rows]
|
||||||
|
|
||||||
|
def delete_group(self, output_path: str) -> list[str]:
|
||||||
|
"""Delete all rows sharing the same (filename, start_time) as *output_path*.
|
||||||
|
Returns list of deleted output_paths."""
|
||||||
|
if not self._enabled:
|
||||||
|
return []
|
||||||
|
row = self._con.execute(
|
||||||
|
"SELECT filename, start_time FROM processed WHERE output_path = ?",
|
||||||
|
(output_path,),
|
||||||
|
).fetchone()
|
||||||
|
if not row:
|
||||||
|
return []
|
||||||
|
filename, start_time = row
|
||||||
|
paths = [r[0] for r in self._con.execute(
|
||||||
|
"SELECT output_path FROM processed WHERE filename = ? AND start_time = ?",
|
||||||
|
(filename, start_time),
|
||||||
|
).fetchall()]
|
||||||
|
self._con.execute(
|
||||||
|
"DELETE FROM processed WHERE filename = ? AND start_time = ?",
|
||||||
|
(filename, start_time),
|
||||||
|
)
|
||||||
|
self._con.commit()
|
||||||
|
return paths
|
||||||
|
|
||||||
|
def _get_markers_for(self, match: str, profile: str = "default") -> list[tuple[float, int, str]]:
|
||||||
|
rows = self._con.execute(
|
||||||
|
"SELECT start_time, output_path FROM processed"
|
||||||
|
" WHERE filename = ? AND profile = ? ORDER BY start_time",
|
||||||
|
(match, profile),
|
||||||
|
).fetchall()
|
||||||
|
# Deduplicate by start_time — batch exports share the same cursor.
|
||||||
|
seen_times: dict[float, tuple[float, int, str]] = {}
|
||||||
|
n = 0
|
||||||
|
for t, p in rows:
|
||||||
|
if t not in seen_times:
|
||||||
|
n += 1
|
||||||
|
seen_times[t] = (t, n, p)
|
||||||
|
return list(seen_times.values())
|
||||||
|
|
||||||
|
def get_markers(self, filename: str, profile: str = "default") -> list[tuple[float, int, str]]:
|
||||||
|
"""Return [(start_time, marker_number, output_path), ...] for exact
|
||||||
|
filename match, sorted by start_time. Empty list if no match."""
|
||||||
|
if not self._enabled:
|
||||||
|
return []
|
||||||
|
return self._get_markers_for(filename, profile)
|
||||||
|
|
||||||
|
def get_profiles(self) -> list[str]:
|
||||||
|
"""Return distinct profile names, ordered alphabetically."""
|
||||||
|
if not self._enabled:
|
||||||
|
return []
|
||||||
|
rows = self._con.execute(
|
||||||
|
"SELECT DISTINCT profile FROM processed ORDER BY profile"
|
||||||
|
).fetchall()
|
||||||
|
return [r[0] for r in rows]
|
||||||
|
|
||||||
|
def hide_file(self, filename: str, profile: str = "default") -> None:
|
||||||
|
if not self._enabled:
|
||||||
|
return
|
||||||
|
self._con.execute(
|
||||||
|
"INSERT OR IGNORE INTO hidden_files (filename, profile) VALUES (?, ?)",
|
||||||
|
(filename, profile),
|
||||||
|
)
|
||||||
|
self._con.commit()
|
||||||
|
|
||||||
|
def unhide_file(self, filename: str, profile: str = "default") -> None:
|
||||||
|
if not self._enabled:
|
||||||
|
return
|
||||||
|
self._con.execute(
|
||||||
|
"DELETE FROM hidden_files WHERE filename = ? AND profile = ?",
|
||||||
|
(filename, profile),
|
||||||
|
)
|
||||||
|
self._con.commit()
|
||||||
|
|
||||||
|
def get_hidden_files(self, profile: str = "default") -> set[str]:
|
||||||
|
if not self._enabled:
|
||||||
|
return set()
|
||||||
|
rows = self._con.execute(
|
||||||
|
"SELECT filename FROM hidden_files WHERE profile = ?", (profile,)
|
||||||
|
).fetchall()
|
||||||
|
return {r[0] for r in rows}
|
||||||
+124
@@ -0,0 +1,124 @@
|
|||||||
|
import os
|
||||||
|
import subprocess
|
||||||
|
import threading
|
||||||
|
from concurrent.futures import ThreadPoolExecutor, as_completed
|
||||||
|
from typing import Callable
|
||||||
|
|
||||||
|
from .ffmpeg import build_ffmpeg_command, build_audio_extract_command
|
||||||
|
from .paths import _log
|
||||||
|
|
||||||
|
|
||||||
|
class ExportRunner:
|
||||||
|
"""Run ffmpeg export jobs in a background thread pool.
|
||||||
|
|
||||||
|
Callbacks:
|
||||||
|
on_clip_done(path: str)
|
||||||
|
on_all_done()
|
||||||
|
on_error(msg: str)
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
input_path: str,
|
||||||
|
jobs: list[tuple[float, str, str | None, float]],
|
||||||
|
short_side: int | None = None,
|
||||||
|
image_sequence: bool = False,
|
||||||
|
max_workers: int | None = None,
|
||||||
|
encoder: str = "libx264",
|
||||||
|
on_clip_done: Callable[[str], None] | None = None,
|
||||||
|
on_all_done: Callable[[], None] | None = None,
|
||||||
|
on_error: Callable[[str], None] | None = None,
|
||||||
|
):
|
||||||
|
self._input = input_path
|
||||||
|
self._jobs = jobs
|
||||||
|
self._short_side = short_side
|
||||||
|
self._image_sequence = image_sequence
|
||||||
|
self._max_workers = max_workers
|
||||||
|
self._encoder = encoder
|
||||||
|
self._on_clip_done = on_clip_done
|
||||||
|
self._on_all_done = on_all_done
|
||||||
|
self._on_error = on_error
|
||||||
|
self._cancel = False
|
||||||
|
self._procs: list[subprocess.Popen] = []
|
||||||
|
self._procs_lock = threading.Lock()
|
||||||
|
self._thread: threading.Thread | None = None
|
||||||
|
|
||||||
|
def start(self):
|
||||||
|
self._thread = threading.Thread(target=self._run, daemon=True)
|
||||||
|
self._thread.start()
|
||||||
|
|
||||||
|
def cancel(self):
|
||||||
|
self._cancel = True
|
||||||
|
with self._procs_lock:
|
||||||
|
for proc in self._procs:
|
||||||
|
try:
|
||||||
|
proc.kill()
|
||||||
|
except OSError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
def is_running(self) -> bool:
|
||||||
|
return self._thread is not None and self._thread.is_alive()
|
||||||
|
|
||||||
|
def _run_one(self, start: float, output: str,
|
||||||
|
portrait_ratio: str | None, crop_center: float) -> str:
|
||||||
|
if self._cancel:
|
||||||
|
raise RuntimeError("cancelled")
|
||||||
|
if self._image_sequence:
|
||||||
|
os.makedirs(output, exist_ok=True)
|
||||||
|
cmd = build_ffmpeg_command(
|
||||||
|
self._input, start, output,
|
||||||
|
short_side=self._short_side,
|
||||||
|
portrait_ratio=portrait_ratio,
|
||||||
|
crop_center=crop_center,
|
||||||
|
image_sequence=self._image_sequence,
|
||||||
|
encoder=self._encoder,
|
||||||
|
)
|
||||||
|
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||||
|
with self._procs_lock:
|
||||||
|
self._procs.append(proc)
|
||||||
|
try:
|
||||||
|
_, stderr = proc.communicate(timeout=120)
|
||||||
|
except subprocess.TimeoutExpired:
|
||||||
|
proc.kill()
|
||||||
|
raise RuntimeError("ffmpeg timed out")
|
||||||
|
finally:
|
||||||
|
with self._procs_lock:
|
||||||
|
self._procs.remove(proc)
|
||||||
|
if self._cancel:
|
||||||
|
raise RuntimeError("cancelled")
|
||||||
|
if proc.returncode != 0:
|
||||||
|
msg = stderr.decode(errors='replace')[-500:] if stderr else "ffmpeg failed"
|
||||||
|
raise RuntimeError(msg)
|
||||||
|
if self._image_sequence:
|
||||||
|
audio_cmd = build_audio_extract_command(self._input, start, output)
|
||||||
|
subprocess.run(audio_cmd, capture_output=True, text=True, timeout=60)
|
||||||
|
return output
|
||||||
|
|
||||||
|
def _run(self):
|
||||||
|
cap = self._max_workers or (os.cpu_count() or 2)
|
||||||
|
workers = min(len(self._jobs), cap)
|
||||||
|
try:
|
||||||
|
with ThreadPoolExecutor(max_workers=workers) as pool:
|
||||||
|
futures = {
|
||||||
|
pool.submit(self._run_one, s, o, pr, cc): o
|
||||||
|
for s, o, pr, cc in self._jobs
|
||||||
|
}
|
||||||
|
for fut in as_completed(futures):
|
||||||
|
if self._cancel:
|
||||||
|
break
|
||||||
|
try:
|
||||||
|
path = fut.result()
|
||||||
|
if self._on_clip_done:
|
||||||
|
self._on_clip_done(path)
|
||||||
|
except Exception as e:
|
||||||
|
if "cancelled" not in str(e) and self._on_error:
|
||||||
|
self._on_error(str(e))
|
||||||
|
return
|
||||||
|
except Exception as e:
|
||||||
|
if self._on_error:
|
||||||
|
self._on_error(str(e))
|
||||||
|
return
|
||||||
|
if self._cancel:
|
||||||
|
return
|
||||||
|
if self._on_all_done:
|
||||||
|
self._on_all_done()
|
||||||
+160
@@ -0,0 +1,160 @@
|
|||||||
|
import os
|
||||||
|
import re
|
||||||
|
import subprocess
|
||||||
|
|
||||||
|
from .paths import _bin, _log
|
||||||
|
|
||||||
|
|
||||||
|
_RATIOS: dict[str, tuple[int, int]] = {
|
||||||
|
"9:16": (9, 16),
|
||||||
|
"4:5": (4, 5),
|
||||||
|
"1:1": (1, 1),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def _portrait_crop_filter(ratio: str, crop_center: float) -> str:
|
||||||
|
"""Return an ffmpeg crop= filter expression for the given portrait ratio.
|
||||||
|
|
||||||
|
Uses ffmpeg expression syntax so source dimensions are resolved at runtime.
|
||||||
|
Commas inside min()/max() are escaped with \\, to prevent ffmpeg's
|
||||||
|
filtergraph parser from treating them as filter-chain separators.
|
||||||
|
"""
|
||||||
|
num, den = _RATIOS[ratio]
|
||||||
|
cw = f"ih*{num}/{den}"
|
||||||
|
x = f"max(0\\,min((iw-{cw})*{crop_center}\\,iw-{cw}))"
|
||||||
|
return f"crop={cw}:ih:{x}:0"
|
||||||
|
|
||||||
|
|
||||||
|
def resolve_keyframe(
|
||||||
|
keyframes: list[tuple[float, float, str | None, bool, bool]],
|
||||||
|
t: float,
|
||||||
|
tolerance: float = 0.05,
|
||||||
|
) -> tuple[float, float, str | None, bool, bool] | None:
|
||||||
|
"""Return the latest keyframe at or before *t*, or None."""
|
||||||
|
result = None
|
||||||
|
for kf in keyframes:
|
||||||
|
if kf[0] <= t + tolerance:
|
||||||
|
result = kf
|
||||||
|
else:
|
||||||
|
break
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
def apply_keyframes_to_jobs(
|
||||||
|
jobs: list[tuple[float, str, str | None, float]],
|
||||||
|
keyframes: list[tuple[float, float, str | None, bool, bool]],
|
||||||
|
base_center: float,
|
||||||
|
base_ratio: str | None,
|
||||||
|
base_rand_p: bool,
|
||||||
|
base_rand_s: bool,
|
||||||
|
) -> list[tuple[float, str, str | None, float, bool, bool]]:
|
||||||
|
"""Resolve each job's crop state from keyframes, returning widened tuples.
|
||||||
|
|
||||||
|
Returns list of (start, path, ratio, center, rand_portrait, rand_square).
|
||||||
|
"""
|
||||||
|
result = []
|
||||||
|
for s, o, _r, _c in jobs:
|
||||||
|
kf = resolve_keyframe(keyframes, s)
|
||||||
|
if kf is not None:
|
||||||
|
_, center, ratio, rp, rs = kf
|
||||||
|
else:
|
||||||
|
center, ratio, rp, rs = base_center, base_ratio, base_rand_p, base_rand_s
|
||||||
|
result.append((s, o, ratio, center, rp, rs))
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
def build_ffmpeg_command(
|
||||||
|
input_path: str, start: float, output_path: str,
|
||||||
|
short_side: int | None = None,
|
||||||
|
portrait_ratio: str | None = None,
|
||||||
|
crop_center: float = 0.5,
|
||||||
|
image_sequence: bool = False,
|
||||||
|
encoder: str = "libx264",
|
||||||
|
) -> list[str]:
|
||||||
|
# -ss before -i: fast input-seeking. Safe here because we always re-encode,
|
||||||
|
# so there is no keyframe-alignment issue from pre-input seek.
|
||||||
|
# Image sequences always use libwebp, so skip HW encoder setup.
|
||||||
|
use_hw_vaapi = encoder == "h264_vaapi" and not image_sequence
|
||||||
|
cmd = [_bin("ffmpeg"), "-y"]
|
||||||
|
|
||||||
|
# VAAPI needs a device for hardware context.
|
||||||
|
if use_hw_vaapi:
|
||||||
|
cmd += ["-hwaccel", "vaapi", "-hwaccel_output_format", "vaapi",
|
||||||
|
"-vaapi_device", "/dev/dri/renderD128"]
|
||||||
|
|
||||||
|
cmd += [
|
||||||
|
"-threads", "0",
|
||||||
|
"-ss", str(start),
|
||||||
|
"-i", input_path,
|
||||||
|
"-t", "8",
|
||||||
|
]
|
||||||
|
|
||||||
|
filters: list[str] = []
|
||||||
|
if portrait_ratio is not None:
|
||||||
|
filters.append(_portrait_crop_filter(portrait_ratio, crop_center))
|
||||||
|
if short_side is not None:
|
||||||
|
# Scale so the shorter dimension equals short_side.
|
||||||
|
filters.append(
|
||||||
|
f"scale='if(lt(iw,ih),{short_side},-2)':'if(lt(iw,ih),-2,{short_side})':flags=lanczos"
|
||||||
|
)
|
||||||
|
|
||||||
|
# VAAPI: decoded frames are GPU surfaces. CPU filters need hwdownload first.
|
||||||
|
if use_hw_vaapi:
|
||||||
|
if filters:
|
||||||
|
filters.insert(0, "hwdownload")
|
||||||
|
filters.insert(1, "format=nv12")
|
||||||
|
filters.append("format=nv12")
|
||||||
|
filters.append("hwupload")
|
||||||
|
|
||||||
|
if filters:
|
||||||
|
cmd += ["-vf", ",".join(filters)]
|
||||||
|
|
||||||
|
if image_sequence:
|
||||||
|
cmd += [
|
||||||
|
"-an",
|
||||||
|
"-c:v", "libwebp",
|
||||||
|
"-quality", "92",
|
||||||
|
"-compression_level", "1",
|
||||||
|
os.path.join(output_path, "frame_%04d.webp"),
|
||||||
|
]
|
||||||
|
else:
|
||||||
|
cmd += ["-c:v", encoder, "-c:a", "pcm_s16le", output_path]
|
||||||
|
return cmd
|
||||||
|
|
||||||
|
|
||||||
|
def build_audio_extract_command(input_path: str, start: float, sequence_dir: str) -> list[str]:
|
||||||
|
"""Return an ffmpeg command that extracts audio to <sequence_dir>.wav."""
|
||||||
|
audio_path = sequence_dir + ".wav"
|
||||||
|
return [
|
||||||
|
_bin("ffmpeg"), "-y",
|
||||||
|
"-ss", str(start),
|
||||||
|
"-i", input_path,
|
||||||
|
"-t", "8",
|
||||||
|
"-vn",
|
||||||
|
"-c:a", "pcm_s16le",
|
||||||
|
audio_path,
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
def detect_hw_encoders() -> list[str]:
|
||||||
|
"""Probe ffmpeg for available H.264 hardware encoders."""
|
||||||
|
_HW_ENCODERS = ["h264_nvenc", "h264_vaapi", "h264_qsv", "h264_amf", "h264_videotoolbox"]
|
||||||
|
try:
|
||||||
|
result = subprocess.run(
|
||||||
|
[_bin("ffmpeg"), "-hide_banner", "-encoders"],
|
||||||
|
capture_output=True, text=True, timeout=5,
|
||||||
|
)
|
||||||
|
if result.returncode != 0:
|
||||||
|
return []
|
||||||
|
output = result.stdout
|
||||||
|
except Exception:
|
||||||
|
return []
|
||||||
|
available = []
|
||||||
|
for enc in _HW_ENCODERS:
|
||||||
|
if re.search(rf'\b{enc}\b', output):
|
||||||
|
available.append(enc)
|
||||||
|
if available:
|
||||||
|
_log(f"HW encoders detected: {', '.join(available)}")
|
||||||
|
else:
|
||||||
|
_log("No HW encoders detected — GPU export unavailable")
|
||||||
|
return available
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
import os
|
||||||
|
import sys
|
||||||
|
from datetime import datetime
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
|
||||||
|
def _frozen_path() -> Path:
|
||||||
|
if getattr(sys, "frozen", False):
|
||||||
|
return Path(sys._MEIPASS)
|
||||||
|
return Path(__file__).resolve().parent.parent
|
||||||
|
|
||||||
|
|
||||||
|
def _bin(name: str) -> str:
|
||||||
|
"""Resolve a binary name (e.g. 'ffmpeg') to its full path in frozen builds."""
|
||||||
|
p = _frozen_path() / name
|
||||||
|
if p.exists():
|
||||||
|
return str(p)
|
||||||
|
return name # fall back to PATH
|
||||||
|
|
||||||
|
|
||||||
|
def _log(*args) -> None:
|
||||||
|
"""Print a timestamped log line to stderr."""
|
||||||
|
ts = datetime.now().strftime("%H:%M:%S")
|
||||||
|
print(f"[8-cut {ts}]", *args, file=sys.stderr)
|
||||||
|
|
||||||
|
|
||||||
|
def build_export_path(folder: str, basename: str, counter: int, sub: int | None = None) -> str:
|
||||||
|
group = f"{basename}_{counter:03d}"
|
||||||
|
name = f"{group}_{sub}" if sub is not None else group
|
||||||
|
return os.path.join(folder, group, name + ".mp4")
|
||||||
|
|
||||||
|
|
||||||
|
def build_sequence_dir(folder: str, basename: str, counter: int, sub: int | None = None) -> str:
|
||||||
|
group = f"{basename}_{counter:03d}"
|
||||||
|
name = f"{group}_{sub}" if sub is not None else group
|
||||||
|
return os.path.join(folder, group, name)
|
||||||
|
|
||||||
|
|
||||||
|
def format_time(seconds: float) -> str:
|
||||||
|
m = int(seconds // 60)
|
||||||
|
# Floor-truncate to 1 dp (not round) — prevents "X:60.0" rollover when
|
||||||
|
# seconds is e.g. 59.95.
|
||||||
|
s = int(seconds % 60 * 10) / 10
|
||||||
|
return f"{m}:{s:04.1f}"
|
||||||
@@ -0,0 +1,104 @@
|
|||||||
|
import os
|
||||||
|
import subprocess
|
||||||
|
import tempfile
|
||||||
|
|
||||||
|
from .paths import _bin, _log
|
||||||
|
|
||||||
|
_yolo_model = None
|
||||||
|
|
||||||
|
|
||||||
|
def _get_yolo():
|
||||||
|
"""Lazy-load YOLOv8-nano. Returns None if ultralytics is not installed."""
|
||||||
|
global _yolo_model
|
||||||
|
if _yolo_model is None:
|
||||||
|
try:
|
||||||
|
from ultralytics import YOLO
|
||||||
|
_yolo_model = YOLO("yolov8n.pt")
|
||||||
|
_log("YOLO model loaded")
|
||||||
|
except ImportError:
|
||||||
|
_log("ultralytics not installed — tracking disabled")
|
||||||
|
return None
|
||||||
|
except Exception as e:
|
||||||
|
_log(f"YOLO load failed: {e}")
|
||||||
|
return None
|
||||||
|
return _yolo_model
|
||||||
|
|
||||||
|
|
||||||
|
def extract_frame_cv(video_path: str, time: float):
|
||||||
|
"""Extract a single frame as a numpy array (BGR) via ffmpeg -> temp PNG -> cv2."""
|
||||||
|
try:
|
||||||
|
import cv2
|
||||||
|
import numpy as np
|
||||||
|
except ImportError:
|
||||||
|
return None
|
||||||
|
fd, tmp = tempfile.mkstemp(suffix=".png")
|
||||||
|
os.close(fd)
|
||||||
|
try:
|
||||||
|
cmd = [_bin("ffmpeg"), "-y", "-ss", str(time), "-i", video_path,
|
||||||
|
"-frames:v", "1", tmp]
|
||||||
|
result = subprocess.run(cmd, capture_output=True, timeout=10)
|
||||||
|
if result.returncode != 0:
|
||||||
|
return None
|
||||||
|
return cv2.imread(tmp)
|
||||||
|
except Exception:
|
||||||
|
return None
|
||||||
|
finally:
|
||||||
|
if os.path.exists(tmp):
|
||||||
|
os.unlink(tmp)
|
||||||
|
|
||||||
|
|
||||||
|
def detect_subject_center(
|
||||||
|
video_path: str, time: float, target_cls: int | None, last_x: float, last_y: float,
|
||||||
|
) -> tuple[int | None, float, float] | None:
|
||||||
|
"""Detect objects at *time* and return (class_id, norm_x, norm_y) of the
|
||||||
|
best match to (target_cls, last_x, last_y). Returns None on failure."""
|
||||||
|
model = _get_yolo()
|
||||||
|
if model is None:
|
||||||
|
return None
|
||||||
|
frame = extract_frame_cv(video_path, time)
|
||||||
|
if frame is None:
|
||||||
|
return None
|
||||||
|
results = model(frame, verbose=False)
|
||||||
|
if not results or len(results[0].boxes) == 0:
|
||||||
|
return None
|
||||||
|
h, w = frame.shape[:2]
|
||||||
|
dets = []
|
||||||
|
for box in results[0].boxes:
|
||||||
|
x1, y1, x2, y2 = box.xyxy[0].tolist()
|
||||||
|
cls = int(box.cls[0])
|
||||||
|
cx = (x1 + x2) / 2 / w
|
||||||
|
cy = (y1 + y2) / 2 / h
|
||||||
|
dets.append((cls, cx, cy))
|
||||||
|
# Prefer same class, nearest to last known position.
|
||||||
|
def score(d):
|
||||||
|
cls_penalty = 0 if (target_cls is None or d[0] == target_cls) else 1.0
|
||||||
|
dist = (d[1] - last_x) ** 2 + (d[2] - last_y) ** 2
|
||||||
|
return cls_penalty + dist
|
||||||
|
best = min(dets, key=score)
|
||||||
|
return best
|
||||||
|
|
||||||
|
|
||||||
|
def track_centers_for_jobs(
|
||||||
|
video_path: str, cursor: float, crop_center: float,
|
||||||
|
starts: list[float],
|
||||||
|
) -> list[float]:
|
||||||
|
"""Run detection at the cursor (to identify the target) then at each start
|
||||||
|
time. Returns a list of horizontal crop centers (one per start)."""
|
||||||
|
ref = detect_subject_center(video_path, cursor, None, crop_center, 0.5)
|
||||||
|
if ref is None:
|
||||||
|
_log("Tracking: no detection at cursor, using fixed center")
|
||||||
|
return [crop_center] * len(starts)
|
||||||
|
target_cls, last_x, last_y = ref
|
||||||
|
_log(f"Tracking: target class={target_cls} at ({last_x:.2f}, {last_y:.2f})")
|
||||||
|
centers = []
|
||||||
|
for t in starts:
|
||||||
|
det = detect_subject_center(video_path, t, target_cls, last_x, last_y)
|
||||||
|
if det is not None:
|
||||||
|
_, cx, cy = det
|
||||||
|
_log(f" t={t:.2f}s → center={cx:.3f}")
|
||||||
|
centers.append(cx)
|
||||||
|
last_x, last_y = cx, cy
|
||||||
|
else:
|
||||||
|
_log(f" t={t:.2f}s → lost, reusing {last_x:.3f}")
|
||||||
|
centers.append(last_x)
|
||||||
|
return centers
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
services:
|
||||||
|
8cut:
|
||||||
|
build: .
|
||||||
|
ports:
|
||||||
|
- "8000:8000"
|
||||||
|
volumes:
|
||||||
|
- /path/to/videos:/videos:ro
|
||||||
|
- /path/to/exports:/exports
|
||||||
|
- 8cut-data:/data
|
||||||
|
environment:
|
||||||
|
MEDIA_DIRS: /videos
|
||||||
|
EXPORT_DIR: /exports
|
||||||
|
DB_PATH: /data/8cut.db
|
||||||
|
CACHE_DIR: /data/cache
|
||||||
|
deploy:
|
||||||
|
resources:
|
||||||
|
reservations:
|
||||||
|
devices:
|
||||||
|
- driver: nvidia
|
||||||
|
count: all
|
||||||
|
capabilities: [gpu]
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
8cut-data:
|
||||||
@@ -0,0 +1,148 @@
|
|||||||
|
# 8-cut Client Design
|
||||||
|
|
||||||
|
## Goal
|
||||||
|
|
||||||
|
Build a Tauri + Svelte desktop client that connects to the 8-cut server API for remote video editing. Full feature parity with the Qt app. Targets Linux first, then Mac.
|
||||||
|
|
||||||
|
## Architecture
|
||||||
|
|
||||||
|
```
|
||||||
|
Tauri app (Rust shell + Svelte webview)
|
||||||
|
├── mpv sidecar (bundled binary)
|
||||||
|
│ ├── plays video: http://server/api/stream/{path}?quality=low
|
||||||
|
│ ├── plays audio: http://server/api/audio/{path}
|
||||||
|
│ └── controlled via JSON IPC socket
|
||||||
|
├── Svelte UI
|
||||||
|
│ ├── File browser
|
||||||
|
│ ├── Canvas timeline (markers, cursor, play region)
|
||||||
|
│ ├── Canvas crop overlay
|
||||||
|
│ ├── Export controls + WebSocket progress
|
||||||
|
│ └── Settings panel (profile, subprofiles, quality)
|
||||||
|
└── Rust backend
|
||||||
|
├── Spawn/manage mpv process + IPC
|
||||||
|
├── Proxy server API calls (avoid CORS)
|
||||||
|
└── Tauri commands exposed to Svelte frontend
|
||||||
|
```
|
||||||
|
|
||||||
|
## Playback
|
||||||
|
|
||||||
|
mpv runs as a sidecar process, controlled via JSON IPC socket. Two streams:
|
||||||
|
- Video: `http://server/api/stream/{path}?root={root}&quality={quality}` (transcoded, no audio)
|
||||||
|
- Audio: `http://server/api/audio/{path}?root={root}` (full quality WAV)
|
||||||
|
|
||||||
|
mpv's `--audio-file=` flag syncs both streams with frame-accurate seeking.
|
||||||
|
|
||||||
|
Quality presets: potato (480p), low (720p), medium (1080p), high (original).
|
||||||
|
|
||||||
|
## Features
|
||||||
|
|
||||||
|
### File management
|
||||||
|
- Browse server video roots (`GET /api/roots`, `GET /api/files`)
|
||||||
|
- Hide/unhide files per profile (`POST/DELETE /api/hidden/{filename}`)
|
||||||
|
- Sort by name/size, filter hidden
|
||||||
|
|
||||||
|
### Playback
|
||||||
|
- Play/pause/resume from pause point
|
||||||
|
- AB-loop with current spread/clips settings
|
||||||
|
- Play region adapts to spread changes without restarting
|
||||||
|
- Quality selector
|
||||||
|
|
||||||
|
### Timeline (Canvas)
|
||||||
|
- Cursor position, markers, play position indicator
|
||||||
|
- Click to seek, drag cursor
|
||||||
|
- Lock mode: cursor locked to marker, double-click jumps to end of clip span
|
||||||
|
- Autoclip: when paused, auto-adjust clip count to fit pause position
|
||||||
|
|
||||||
|
### Crop & keyframes
|
||||||
|
- Portrait ratio selector (9:16, 4:5, 1:1, off)
|
||||||
|
- Crop center slider with live canvas overlay
|
||||||
|
- Crop keyframes at arbitrary timeline positions
|
||||||
|
- Subject tracking (triggered server-side)
|
||||||
|
- Random portrait/square toggles
|
||||||
|
|
||||||
|
### Export
|
||||||
|
- Configurable: clips, spread, short side, format (MP4/WebP sequence)
|
||||||
|
- Label + category annotation
|
||||||
|
- Encoder selection (libx264 / h264_nvenc)
|
||||||
|
- Subprofiles with folder suffix routing
|
||||||
|
- Number keys 1-9 for subprofile quick export, E for main
|
||||||
|
- WebSocket progress (`WS /ws/export`), per-clip completion
|
||||||
|
- Delete/re-export from marker context menu
|
||||||
|
|
||||||
|
### Profiles
|
||||||
|
- Profile switcher, markers reload per profile
|
||||||
|
- Subprofile management (add/remove)
|
||||||
|
|
||||||
|
### Settings
|
||||||
|
- Server URL (configurable)
|
||||||
|
- Default quality preset
|
||||||
|
- All settings persisted client-side via Tauri store
|
||||||
|
|
||||||
|
## Server API endpoints used
|
||||||
|
|
||||||
|
```
|
||||||
|
GET /api/roots
|
||||||
|
GET /api/files?root={root}
|
||||||
|
GET /api/video/{path}?root={root}
|
||||||
|
GET /api/stream/{path}?root={root}&quality={quality}
|
||||||
|
GET /api/audio/{path}?root={root}
|
||||||
|
GET /api/cache/status/{path}?root={root}
|
||||||
|
GET /api/markers/{filename}?profile={profile}
|
||||||
|
GET /api/profiles
|
||||||
|
GET /api/labels
|
||||||
|
POST /api/export
|
||||||
|
GET /api/export/{job_id}
|
||||||
|
DELETE /api/export?output_path={path}
|
||||||
|
POST /api/hidden/{filename}?profile={profile}
|
||||||
|
DELETE /api/hidden/{filename}?profile={profile}
|
||||||
|
GET /api/hidden?profile={profile}
|
||||||
|
WS /ws/export
|
||||||
|
```
|
||||||
|
|
||||||
|
## Project structure
|
||||||
|
|
||||||
|
```
|
||||||
|
client/
|
||||||
|
├── src-tauri/
|
||||||
|
│ ├── src/
|
||||||
|
│ │ ├── main.rs (Tauri entry, app setup)
|
||||||
|
│ │ ├── mpv.rs (mpv sidecar spawn + IPC)
|
||||||
|
│ │ ├── commands.rs (Tauri commands for Svelte)
|
||||||
|
│ │ └── lib.rs
|
||||||
|
│ ├── Cargo.toml
|
||||||
|
│ └── tauri.conf.json
|
||||||
|
├── src/
|
||||||
|
│ ├── App.svelte
|
||||||
|
│ ├── lib/
|
||||||
|
│ │ ├── api.ts (server API client)
|
||||||
|
│ │ ├── mpv.ts (mpv IPC bridge via Tauri commands)
|
||||||
|
│ │ ├── ws.ts (WebSocket export progress)
|
||||||
|
│ │ └── stores.ts (Svelte stores: files, markers, settings)
|
||||||
|
│ ├── components/
|
||||||
|
│ │ ├── FileBrowser.svelte
|
||||||
|
│ │ ├── Timeline.svelte
|
||||||
|
│ │ ├── CropOverlay.svelte
|
||||||
|
│ │ ├── ExportPanel.svelte
|
||||||
|
│ │ ├── SettingsPanel.svelte
|
||||||
|
│ │ └── ProfileBar.svelte
|
||||||
|
│ └── main.ts
|
||||||
|
├── package.json
|
||||||
|
└── vite.config.ts
|
||||||
|
```
|
||||||
|
|
||||||
|
## Implementation order
|
||||||
|
|
||||||
|
1. Scaffold Tauri + Svelte project
|
||||||
|
2. mpv sidecar: spawn, IPC, basic play/pause/seek
|
||||||
|
3. API client module + server connection
|
||||||
|
4. File browser component
|
||||||
|
5. Video playback: load file → stream URL → mpv
|
||||||
|
6. Canvas timeline: cursor, seek, markers
|
||||||
|
7. Export panel + WebSocket progress
|
||||||
|
8. Crop overlay + keyframes
|
||||||
|
9. Lock mode, autoclip, play region
|
||||||
|
10. Profiles, subprofiles, hidden files
|
||||||
|
11. Keyboard shortcuts
|
||||||
|
12. Settings persistence
|
||||||
|
13. Package for Linux (.deb / .AppImage)
|
||||||
|
14. Package for Mac (.dmg)
|
||||||
@@ -0,0 +1,207 @@
|
|||||||
|
# 8-cut Server API Design
|
||||||
|
|
||||||
|
## Goal
|
||||||
|
|
||||||
|
Run 8-cut as a FastAPI server on Unraid (Docker) so a Tauri desktop client on Mac can edit remotely over WireGuard — no file transfers, no auth.
|
||||||
|
|
||||||
|
## Architecture
|
||||||
|
|
||||||
|
```
|
||||||
|
Unraid (Docker container):
|
||||||
|
FastAPI + ffmpeg + SQLite
|
||||||
|
├── /api/files list videos from mounted volumes
|
||||||
|
├── /api/stream/{path} transcoded video (cached, no audio)
|
||||||
|
├── /api/audio/{path} full-quality audio (cached, passthrough)
|
||||||
|
├── /api/video/{path} raw file (for reference/download)
|
||||||
|
├── /api/markers CRUD markers per profile
|
||||||
|
├── /api/profiles list/create profiles
|
||||||
|
├── /api/export trigger + manage exports
|
||||||
|
├── /api/labels label history
|
||||||
|
├── /api/hidden hidden file management
|
||||||
|
└── ws://…/ws/export real-time export progress
|
||||||
|
|
||||||
|
Mac (Tauri + Svelte + libmpv):
|
||||||
|
├── mpv plays stream URL (video) + audio URL separately
|
||||||
|
├── Canvas timeline + crop overlay + keyframes
|
||||||
|
├── Full UI: profiles, subprofiles, settings
|
||||||
|
└── Stateless — all state lives on server
|
||||||
|
```
|
||||||
|
|
||||||
|
## Docker mounts
|
||||||
|
|
||||||
|
| Mount | Purpose | Env var |
|
||||||
|
|-------------|--------------------------------|--------------|
|
||||||
|
| `/videos` | Source video files (read-only) | `MEDIA_DIRS` |
|
||||||
|
| `/exports` | Export output | `EXPORT_DIR` |
|
||||||
|
| `/data` | SQLite DB + transcode cache | `DB_PATH`, `CACHE_DIR` |
|
||||||
|
|
||||||
|
`MEDIA_DIRS` supports multiple paths: `/videos1,/videos2`.
|
||||||
|
|
||||||
|
## Video streaming with transcode cache
|
||||||
|
|
||||||
|
The client needs low-bitrate video for scrubbing over the network but full-quality audio for accurate editing.
|
||||||
|
|
||||||
|
**Flow:**
|
||||||
|
1. Client requests `/api/stream/{path}?quality=low`
|
||||||
|
2. Server checks cache: `{CACHE_DIR}/{quality}/{hash}.mp4`
|
||||||
|
3. If cached → serve with range requests (instant seeking)
|
||||||
|
4. If not → start background ffmpeg transcode, return `202 Accepted` with job ID
|
||||||
|
5. Client polls or gets WebSocket notification when ready
|
||||||
|
6. Audio: `/api/audio/{path}` extracts audio (passthrough, fast) to cache on first request
|
||||||
|
|
||||||
|
**Quality presets:**
|
||||||
|
|
||||||
|
| Preset | Resolution | Bitrate |
|
||||||
|
|----------|-----------|----------|
|
||||||
|
| `potato` | 480p | ~500 Kbps |
|
||||||
|
| `low` | 720p | ~2 Mbps |
|
||||||
|
| `medium` | 1080p | ~5 Mbps |
|
||||||
|
| `high` | original | ~10 Mbps |
|
||||||
|
|
||||||
|
Each quality level cached separately. Client can switch quality — mpv reloads the URL.
|
||||||
|
|
||||||
|
**mpv on client:**
|
||||||
|
```
|
||||||
|
video = http://server/api/stream/file.mp4?quality=low
|
||||||
|
audio = http://server/api/audio/file.mp4
|
||||||
|
```
|
||||||
|
mpv's `--audio-file=` flag plays both in sync with frame-accurate seeking.
|
||||||
|
|
||||||
|
## API endpoints
|
||||||
|
|
||||||
|
### Files
|
||||||
|
```
|
||||||
|
GET /api/files?root={root}
|
||||||
|
→ [{path, name, size, duration?, markers_count}]
|
||||||
|
|
||||||
|
GET /api/video/{path}
|
||||||
|
→ raw file with range requests
|
||||||
|
|
||||||
|
GET /api/stream/{path}?quality=low|medium|high|potato
|
||||||
|
→ cached transcoded video (no audio), range requests
|
||||||
|
→ 202 if transcode in progress
|
||||||
|
|
||||||
|
GET /api/audio/{path}
|
||||||
|
→ cached full-quality audio, range requests
|
||||||
|
→ 202 if extraction in progress
|
||||||
|
|
||||||
|
GET /api/cache/status/{path}
|
||||||
|
→ {qualities: {potato: "ready", low: "transcoding", ...}, audio: "ready"}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Markers & profiles
|
||||||
|
```
|
||||||
|
GET /api/markers/{filename}?profile=default
|
||||||
|
→ [{start_time, marker_number, output_path}]
|
||||||
|
|
||||||
|
GET /api/profiles
|
||||||
|
→ ["default", "intense", ...]
|
||||||
|
|
||||||
|
GET /api/labels
|
||||||
|
→ ["dog barking", "rain", ...]
|
||||||
|
```
|
||||||
|
|
||||||
|
### Export
|
||||||
|
```
|
||||||
|
POST /api/export
|
||||||
|
body: {input_path, cursor, folder_suffix?, name, clips, spread,
|
||||||
|
short_side?, portrait_ratio?, crop_center, format,
|
||||||
|
label?, category?, profile, crop_keyframes?,
|
||||||
|
rand_portrait?, rand_square?, track_subject?}
|
||||||
|
→ {job_id}
|
||||||
|
|
||||||
|
GET /api/export/{job_id}
|
||||||
|
→ {status, completed, total, outputs: [...]}
|
||||||
|
|
||||||
|
DELETE /api/export/{output_path}
|
||||||
|
→ delete from DB + disk
|
||||||
|
|
||||||
|
WS /ws/export
|
||||||
|
→ server pushes: {type: "clip_done", path: "..."} | {type: "all_done"} | {type: "error", msg: "..."}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Hidden files
|
||||||
|
```
|
||||||
|
POST /api/hidden/{filename}?profile=default
|
||||||
|
DELETE /api/hidden/{filename}?profile=default
|
||||||
|
GET /api/hidden?profile=default
|
||||||
|
→ ["file1.mp4", "file2.mp4"]
|
||||||
|
```
|
||||||
|
|
||||||
|
## Code reuse from main.py
|
||||||
|
|
||||||
|
**Extracted to shared module (used by both server and Qt app):**
|
||||||
|
- `ProcessedDB` — SQLite operations
|
||||||
|
- `build_ffmpeg_command` — ffmpeg command construction
|
||||||
|
- `build_audio_extract_command`
|
||||||
|
- `build_export_path` / `build_sequence_dir`
|
||||||
|
- `detect_hw_encoders`
|
||||||
|
- `upsert_clip_annotation` / `remove_clip_annotation`
|
||||||
|
- `apply_keyframes_to_jobs` / `resolve_keyframe`
|
||||||
|
- `track_centers_for_jobs` (subject tracking)
|
||||||
|
|
||||||
|
**Server-specific (new):**
|
||||||
|
- FastAPI app + route handlers
|
||||||
|
- Transcode cache manager
|
||||||
|
- Export worker (plain threading, replaces QThread-based ExportWorker)
|
||||||
|
- File listing / media root scanning
|
||||||
|
- WebSocket export progress broadcaster
|
||||||
|
|
||||||
|
**Tauri client (new, Svelte):**
|
||||||
|
- mpv integration via Tauri plugin or sidecar
|
||||||
|
- Canvas-based timeline widget
|
||||||
|
- Canvas-based crop overlay
|
||||||
|
- All UI controls
|
||||||
|
- API client module
|
||||||
|
|
||||||
|
## Dockerfile
|
||||||
|
|
||||||
|
```dockerfile
|
||||||
|
FROM python:3.12-slim
|
||||||
|
RUN apt-get update && apt-get install -y ffmpeg && rm -rf /var/lib/apt/lists/*
|
||||||
|
WORKDIR /app
|
||||||
|
COPY server/ .
|
||||||
|
RUN pip install --no-cache-dir fastapi uvicorn
|
||||||
|
EXPOSE 8000
|
||||||
|
CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "8000"]
|
||||||
|
```
|
||||||
|
|
||||||
|
## Project structure
|
||||||
|
|
||||||
|
```
|
||||||
|
8-cut/
|
||||||
|
├── main.py (existing Qt app, unchanged)
|
||||||
|
├── core/ (shared logic, extracted from main.py)
|
||||||
|
│ ├── __init__.py
|
||||||
|
│ ├── db.py (ProcessedDB)
|
||||||
|
│ ├── ffmpeg.py (build commands, detect encoders)
|
||||||
|
│ ├── export.py (ExportWorker — plain threading)
|
||||||
|
│ ├── paths.py (build_export_path, build_sequence_dir)
|
||||||
|
│ └── annotations.py (dataset.json helpers)
|
||||||
|
├── server/
|
||||||
|
│ ├── app.py (FastAPI app)
|
||||||
|
│ ├── routes/
|
||||||
|
│ │ ├── files.py
|
||||||
|
│ │ ├── stream.py
|
||||||
|
│ │ ├── markers.py
|
||||||
|
│ │ ├── export.py
|
||||||
|
│ │ └── hidden.py
|
||||||
|
│ ├── cache.py (transcode cache manager)
|
||||||
|
│ ├── ws.py (WebSocket handler)
|
||||||
|
│ └── config.py (env vars, settings)
|
||||||
|
├── client/ (Tauri + Svelte — future)
|
||||||
|
│ └── ...
|
||||||
|
├── Dockerfile
|
||||||
|
└── docker-compose.yml
|
||||||
|
```
|
||||||
|
|
||||||
|
## Implementation order
|
||||||
|
|
||||||
|
1. Extract shared logic from main.py → `core/`
|
||||||
|
2. Update main.py to import from `core/` (verify Qt app still works)
|
||||||
|
3. Build FastAPI server with file listing + video serving
|
||||||
|
4. Add transcode cache + audio extraction
|
||||||
|
5. Add markers/profiles/labels/hidden API
|
||||||
|
6. Add export endpoint + WebSocket progress
|
||||||
|
7. Dockerfile + docker-compose
|
||||||
|
8. (Later) Tauri client
|
||||||
@@ -0,0 +1,948 @@
|
|||||||
|
# Server API Implementation Plan
|
||||||
|
|
||||||
|
> **For Claude:** REQUIRED SUB-SKILL: Use superpowers:executing-plans to implement this plan task-by-task.
|
||||||
|
|
||||||
|
**Goal:** Extract shared logic from main.py into a `core/` package, then build the FastAPI server that serves video files, manages the DB, and runs exports.
|
||||||
|
|
||||||
|
**Architecture:** Shared logic (DB, ffmpeg, paths, annotations, tracking) moves to `core/`. Both `main.py` (Qt app) and `server/` import from `core/`. The server adds HTTP video streaming with transcode cache, REST endpoints, and WebSocket export progress.
|
||||||
|
|
||||||
|
**Tech Stack:** Python 3.12, FastAPI, uvicorn, SQLite, ffmpeg
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 1: Create core/ package — paths and helpers
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `core/__init__.py`
|
||||||
|
- Create: `core/paths.py`
|
||||||
|
|
||||||
|
**Step 1: Create core/__init__.py**
|
||||||
|
|
||||||
|
```python
|
||||||
|
# empty — package marker
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 2: Create core/paths.py**
|
||||||
|
|
||||||
|
Extract from main.py lines 36-74: `_frozen_path`, `_bin`, `_log`, `build_export_path`, `build_sequence_dir`, `format_time`.
|
||||||
|
|
||||||
|
```python
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
from datetime import datetime
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
|
||||||
|
def _frozen_path() -> Path:
|
||||||
|
if getattr(sys, "frozen", False):
|
||||||
|
return Path(sys._MEIPASS)
|
||||||
|
return Path(__file__).resolve().parent.parent
|
||||||
|
|
||||||
|
|
||||||
|
def _bin(name: str) -> str:
|
||||||
|
p = _frozen_path() / name
|
||||||
|
if p.exists():
|
||||||
|
return str(p)
|
||||||
|
return name
|
||||||
|
|
||||||
|
|
||||||
|
def _log(*args) -> None:
|
||||||
|
ts = datetime.now().strftime("%H:%M:%S")
|
||||||
|
print(f"[8-cut {ts}]", *args, file=sys.stderr)
|
||||||
|
|
||||||
|
|
||||||
|
def build_export_path(folder: str, basename: str, counter: int, sub: int | None = None) -> str:
|
||||||
|
group = f"{basename}_{counter:03d}"
|
||||||
|
name = f"{group}_{sub}" if sub is not None else group
|
||||||
|
return os.path.join(folder, group, name + ".mp4")
|
||||||
|
|
||||||
|
|
||||||
|
def build_sequence_dir(folder: str, basename: str, counter: int, sub: int | None = None) -> str:
|
||||||
|
group = f"{basename}_{counter:03d}"
|
||||||
|
name = f"{group}_{sub}" if sub is not None else group
|
||||||
|
return os.path.join(folder, group, name)
|
||||||
|
|
||||||
|
|
||||||
|
def format_time(seconds: float) -> str:
|
||||||
|
m = int(seconds // 60)
|
||||||
|
s = int(seconds % 60 * 10) / 10
|
||||||
|
return f"{m}:{s:04.1f}"
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 3: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add core/
|
||||||
|
git commit -m "feat: create core/paths module with shared path helpers"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 2: Create core/ffmpeg.py
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `core/ffmpeg.py`
|
||||||
|
|
||||||
|
**Step 1: Create core/ffmpeg.py**
|
||||||
|
|
||||||
|
Extract from main.py lines 77-112 and 244-289: `_RATIOS`, `_portrait_crop_filter`, `resolve_keyframe`, `apply_keyframes_to_jobs`, `build_ffmpeg_command`, `build_audio_extract_command`, `detect_hw_encoders`. (Lines 115-188 are also ffmpeg-related. Lines 191-241 are annotations — extracted separately in Task 4.)
|
||||||
|
|
||||||
|
```python
|
||||||
|
import os
|
||||||
|
import re
|
||||||
|
import subprocess
|
||||||
|
|
||||||
|
from .paths import _bin, _log
|
||||||
|
|
||||||
|
|
||||||
|
_RATIOS: dict[str, tuple[int, int]] = {
|
||||||
|
"9:16": (9, 16),
|
||||||
|
"4:5": (4, 5),
|
||||||
|
"1:1": (1, 1),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def _portrait_crop_filter(ratio: str, crop_center: float) -> str:
|
||||||
|
num, den = _RATIOS[ratio]
|
||||||
|
cw = f"ih*{num}/{den}"
|
||||||
|
x = f"max(0\\,min((iw-{cw})*{crop_center}\\,iw-{cw}))"
|
||||||
|
return f"crop={cw}:ih:{x}:0"
|
||||||
|
|
||||||
|
|
||||||
|
def resolve_keyframe(
|
||||||
|
keyframes: list[tuple[float, float, str | None, bool, bool]],
|
||||||
|
t: float,
|
||||||
|
tolerance: float = 0.05,
|
||||||
|
) -> tuple[float, float, str | None, bool, bool] | None:
|
||||||
|
result = None
|
||||||
|
for kf in keyframes:
|
||||||
|
if kf[0] <= t + tolerance:
|
||||||
|
result = kf
|
||||||
|
else:
|
||||||
|
break
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
def apply_keyframes_to_jobs(
|
||||||
|
jobs: list[tuple[float, str, str | None, float]],
|
||||||
|
keyframes: list[tuple[float, float, str | None, bool, bool]],
|
||||||
|
base_center: float,
|
||||||
|
base_ratio: str | None,
|
||||||
|
base_rand_p: bool,
|
||||||
|
base_rand_s: bool,
|
||||||
|
) -> list[tuple[float, str, str | None, float, bool, bool]]:
|
||||||
|
result = []
|
||||||
|
for s, o, _r, _c in jobs:
|
||||||
|
kf = resolve_keyframe(keyframes, s)
|
||||||
|
if kf is not None:
|
||||||
|
_, center, ratio, rp, rs = kf
|
||||||
|
else:
|
||||||
|
center, ratio, rp, rs = base_center, base_ratio, base_rand_p, base_rand_s
|
||||||
|
result.append((s, o, ratio, center, rp, rs))
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
def build_ffmpeg_command(
|
||||||
|
input_path: str, start: float, output_path: str,
|
||||||
|
short_side: int | None = None,
|
||||||
|
portrait_ratio: str | None = None,
|
||||||
|
crop_center: float = 0.5,
|
||||||
|
image_sequence: bool = False,
|
||||||
|
encoder: str = "libx264",
|
||||||
|
) -> list[str]:
|
||||||
|
use_hw_vaapi = encoder == "h264_vaapi" and not image_sequence
|
||||||
|
cmd = [_bin("ffmpeg"), "-y"]
|
||||||
|
if use_hw_vaapi:
|
||||||
|
cmd += ["-hwaccel", "vaapi", "-hwaccel_output_format", "vaapi",
|
||||||
|
"-vaapi_device", "/dev/dri/renderD128"]
|
||||||
|
cmd += ["-threads", "0", "-ss", str(start), "-i", input_path, "-t", "8"]
|
||||||
|
filters: list[str] = []
|
||||||
|
if portrait_ratio is not None:
|
||||||
|
filters.append(_portrait_crop_filter(portrait_ratio, crop_center))
|
||||||
|
if short_side is not None:
|
||||||
|
filters.append(
|
||||||
|
f"scale='if(lt(iw,ih),{short_side},-2)':'if(lt(iw,ih),-2,{short_side})':flags=lanczos"
|
||||||
|
)
|
||||||
|
if use_hw_vaapi:
|
||||||
|
if filters:
|
||||||
|
filters.insert(0, "hwdownload")
|
||||||
|
filters.insert(1, "format=nv12")
|
||||||
|
filters.append("format=nv12")
|
||||||
|
filters.append("hwupload")
|
||||||
|
if filters:
|
||||||
|
cmd += ["-vf", ",".join(filters)]
|
||||||
|
if image_sequence:
|
||||||
|
cmd += ["-an", "-c:v", "libwebp", "-quality", "92", "-compression_level", "1",
|
||||||
|
os.path.join(output_path, "frame_%04d.webp")]
|
||||||
|
else:
|
||||||
|
cmd += ["-c:v", encoder, "-c:a", "pcm_s16le", output_path]
|
||||||
|
return cmd
|
||||||
|
|
||||||
|
|
||||||
|
def build_audio_extract_command(input_path: str, start: float, sequence_dir: str) -> list[str]:
|
||||||
|
audio_path = sequence_dir + ".wav"
|
||||||
|
return [_bin("ffmpeg"), "-y", "-ss", str(start), "-i", input_path,
|
||||||
|
"-t", "8", "-vn", "-c:a", "pcm_s16le", audio_path]
|
||||||
|
|
||||||
|
|
||||||
|
def detect_hw_encoders() -> list[str]:
|
||||||
|
_HW_ENCODERS = ["h264_nvenc", "h264_vaapi", "h264_qsv", "h264_amf", "h264_videotoolbox"]
|
||||||
|
try:
|
||||||
|
result = subprocess.run(
|
||||||
|
[_bin("ffmpeg"), "-hide_banner", "-encoders"],
|
||||||
|
capture_output=True, text=True, timeout=5,
|
||||||
|
)
|
||||||
|
if result.returncode != 0:
|
||||||
|
return []
|
||||||
|
output = result.stdout
|
||||||
|
except Exception:
|
||||||
|
return []
|
||||||
|
available = []
|
||||||
|
for enc in _HW_ENCODERS:
|
||||||
|
if re.search(rf'\b{enc}\b', output):
|
||||||
|
available.append(enc)
|
||||||
|
if available:
|
||||||
|
_log(f"HW encoders detected: {', '.join(available)}")
|
||||||
|
else:
|
||||||
|
_log("No HW encoders detected — GPU export unavailable")
|
||||||
|
return available
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 2: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add core/ffmpeg.py
|
||||||
|
git commit -m "feat: create core/ffmpeg module with ffmpeg helpers"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 3: Create core/db.py
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `core/db.py`
|
||||||
|
|
||||||
|
**Step 1: Create core/db.py**
|
||||||
|
|
||||||
|
Extract the entire `ProcessedDB` class from main.py lines 398-626. Import `_log` from `core.paths`.
|
||||||
|
|
||||||
|
```python
|
||||||
|
import sqlite3
|
||||||
|
from datetime import datetime, timezone
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
from .paths import _log
|
||||||
|
|
||||||
|
|
||||||
|
class ProcessedDB:
|
||||||
|
_SCHEMA_VERSION = 3
|
||||||
|
|
||||||
|
def __init__(self, db_path: str | None = None):
|
||||||
|
# ... exact copy of existing class ...
|
||||||
|
```
|
||||||
|
|
||||||
|
Copy the full class body verbatim — all methods unchanged.
|
||||||
|
|
||||||
|
**Step 2: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add core/db.py
|
||||||
|
git commit -m "feat: create core/db module with ProcessedDB"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 4: Create core/annotations.py
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `core/annotations.py`
|
||||||
|
|
||||||
|
**Step 1: Create core/annotations.py**
|
||||||
|
|
||||||
|
Extract from main.py lines 191-241: `build_annotation_json_path`, `remove_clip_annotation`, `upsert_clip_annotation`.
|
||||||
|
|
||||||
|
```python
|
||||||
|
import json
|
||||||
|
import os
|
||||||
|
|
||||||
|
|
||||||
|
def build_annotation_json_path(folder: str) -> str:
|
||||||
|
return os.path.join(folder, "dataset.json")
|
||||||
|
|
||||||
|
|
||||||
|
def remove_clip_annotation(folder: str, clip_path: str) -> None:
|
||||||
|
json_path = build_annotation_json_path(folder)
|
||||||
|
if not os.path.exists(json_path):
|
||||||
|
return
|
||||||
|
abs_path = os.path.abspath(clip_path)
|
||||||
|
with open(json_path, "r", encoding="utf-8") as f:
|
||||||
|
try:
|
||||||
|
entries = json.load(f)
|
||||||
|
except (json.JSONDecodeError, ValueError):
|
||||||
|
return
|
||||||
|
entries = [e for e in entries if e.get("path") != abs_path]
|
||||||
|
with open(json_path, "w", encoding="utf-8") as f:
|
||||||
|
json.dump(entries, f, indent=2, ensure_ascii=False)
|
||||||
|
f.write("\n")
|
||||||
|
|
||||||
|
|
||||||
|
def upsert_clip_annotation(folder: str, clip_path: str, label: str) -> None:
|
||||||
|
if not label.strip():
|
||||||
|
return
|
||||||
|
os.makedirs(folder, exist_ok=True)
|
||||||
|
json_path = build_annotation_json_path(folder)
|
||||||
|
entries: list[dict] = []
|
||||||
|
if os.path.exists(json_path):
|
||||||
|
with open(json_path, "r", encoding="utf-8") as f:
|
||||||
|
try:
|
||||||
|
entries = json.load(f)
|
||||||
|
except (json.JSONDecodeError, ValueError):
|
||||||
|
entries = []
|
||||||
|
abs_path = os.path.abspath(clip_path)
|
||||||
|
entry: dict = {"path": abs_path, "label": label}
|
||||||
|
for i, e in enumerate(entries):
|
||||||
|
if e.get("path") == abs_path:
|
||||||
|
entries[i] = entry
|
||||||
|
break
|
||||||
|
else:
|
||||||
|
entries.append(entry)
|
||||||
|
with open(json_path, "w", encoding="utf-8") as f:
|
||||||
|
json.dump(entries, f, indent=2, ensure_ascii=False)
|
||||||
|
f.write("\n")
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 2: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add core/annotations.py
|
||||||
|
git commit -m "feat: create core/annotations module"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 5: Create core/export.py
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `core/export.py`
|
||||||
|
|
||||||
|
**Step 1: Create core/export.py**
|
||||||
|
|
||||||
|
A plain-threading version of `ExportWorker` (no QThread dependency). Used by the server. The Qt app continues using its own QThread-based worker.
|
||||||
|
|
||||||
|
```python
|
||||||
|
import os
|
||||||
|
import subprocess
|
||||||
|
import threading
|
||||||
|
from concurrent.futures import ThreadPoolExecutor, as_completed
|
||||||
|
from typing import Callable
|
||||||
|
|
||||||
|
from .ffmpeg import build_ffmpeg_command, build_audio_extract_command
|
||||||
|
from .paths import _bin, _log
|
||||||
|
|
||||||
|
|
||||||
|
class ExportRunner:
|
||||||
|
"""Run ffmpeg export jobs in a background thread pool.
|
||||||
|
|
||||||
|
Callbacks:
|
||||||
|
on_clip_done(path: str)
|
||||||
|
on_all_done()
|
||||||
|
on_error(msg: str)
|
||||||
|
"""
|
||||||
|
|
||||||
|
def __init__(
|
||||||
|
self,
|
||||||
|
input_path: str,
|
||||||
|
jobs: list[tuple[float, str, str | None, float]],
|
||||||
|
short_side: int | None = None,
|
||||||
|
image_sequence: bool = False,
|
||||||
|
max_workers: int | None = None,
|
||||||
|
encoder: str = "libx264",
|
||||||
|
on_clip_done: Callable[[str], None] | None = None,
|
||||||
|
on_all_done: Callable[[], None] | None = None,
|
||||||
|
on_error: Callable[[str], None] | None = None,
|
||||||
|
):
|
||||||
|
self._input = input_path
|
||||||
|
self._jobs = jobs
|
||||||
|
self._short_side = short_side
|
||||||
|
self._image_sequence = image_sequence
|
||||||
|
self._max_workers = max_workers
|
||||||
|
self._encoder = encoder
|
||||||
|
self._on_clip_done = on_clip_done
|
||||||
|
self._on_all_done = on_all_done
|
||||||
|
self._on_error = on_error
|
||||||
|
self._cancel = False
|
||||||
|
self._procs: list[subprocess.Popen] = []
|
||||||
|
self._procs_lock = threading.Lock()
|
||||||
|
self._thread: threading.Thread | None = None
|
||||||
|
|
||||||
|
def start(self):
|
||||||
|
self._thread = threading.Thread(target=self._run, daemon=True)
|
||||||
|
self._thread.start()
|
||||||
|
|
||||||
|
def cancel(self):
|
||||||
|
self._cancel = True
|
||||||
|
with self._procs_lock:
|
||||||
|
for proc in self._procs:
|
||||||
|
try:
|
||||||
|
proc.kill()
|
||||||
|
except OSError:
|
||||||
|
pass
|
||||||
|
|
||||||
|
def is_running(self) -> bool:
|
||||||
|
return self._thread is not None and self._thread.is_alive()
|
||||||
|
|
||||||
|
def _run_one(self, start: float, output: str,
|
||||||
|
portrait_ratio: str | None, crop_center: float) -> str:
|
||||||
|
if self._cancel:
|
||||||
|
raise RuntimeError("cancelled")
|
||||||
|
if self._image_sequence:
|
||||||
|
os.makedirs(output, exist_ok=True)
|
||||||
|
cmd = build_ffmpeg_command(
|
||||||
|
self._input, start, output,
|
||||||
|
short_side=self._short_side,
|
||||||
|
portrait_ratio=portrait_ratio,
|
||||||
|
crop_center=crop_center,
|
||||||
|
image_sequence=self._image_sequence,
|
||||||
|
encoder=self._encoder,
|
||||||
|
)
|
||||||
|
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
||||||
|
with self._procs_lock:
|
||||||
|
self._procs.append(proc)
|
||||||
|
try:
|
||||||
|
_, stderr = proc.communicate(timeout=120)
|
||||||
|
except subprocess.TimeoutExpired:
|
||||||
|
proc.kill()
|
||||||
|
raise RuntimeError("ffmpeg timed out")
|
||||||
|
finally:
|
||||||
|
with self._procs_lock:
|
||||||
|
self._procs.remove(proc)
|
||||||
|
if self._cancel:
|
||||||
|
raise RuntimeError("cancelled")
|
||||||
|
if proc.returncode != 0:
|
||||||
|
msg = stderr.decode(errors='replace')[-500:] if stderr else "ffmpeg failed"
|
||||||
|
raise RuntimeError(msg)
|
||||||
|
if self._image_sequence:
|
||||||
|
audio_cmd = build_audio_extract_command(self._input, start, output)
|
||||||
|
subprocess.run(audio_cmd, capture_output=True, text=True, timeout=60)
|
||||||
|
return output
|
||||||
|
|
||||||
|
def _run(self):
|
||||||
|
cap = self._max_workers or (os.cpu_count() or 2)
|
||||||
|
workers = min(len(self._jobs), cap)
|
||||||
|
try:
|
||||||
|
with ThreadPoolExecutor(max_workers=workers) as pool:
|
||||||
|
futures = {
|
||||||
|
pool.submit(self._run_one, s, o, pr, cc): o
|
||||||
|
for s, o, pr, cc in self._jobs
|
||||||
|
}
|
||||||
|
for fut in as_completed(futures):
|
||||||
|
if self._cancel:
|
||||||
|
break
|
||||||
|
try:
|
||||||
|
path = fut.result()
|
||||||
|
if self._on_clip_done:
|
||||||
|
self._on_clip_done(path)
|
||||||
|
except Exception as e:
|
||||||
|
if "cancelled" not in str(e) and self._on_error:
|
||||||
|
self._on_error(str(e))
|
||||||
|
except Exception as e:
|
||||||
|
if self._on_error:
|
||||||
|
self._on_error(str(e))
|
||||||
|
return
|
||||||
|
if self._cancel:
|
||||||
|
return
|
||||||
|
if self._on_all_done:
|
||||||
|
self._on_all_done()
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 2: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add core/export.py
|
||||||
|
git commit -m "feat: create core/export module with ExportRunner"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 6: Create core/tracking.py
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `core/tracking.py`
|
||||||
|
|
||||||
|
**Step 1: Create core/tracking.py**
|
||||||
|
|
||||||
|
Extract from main.py lines 294-395: YOLO tracking functions.
|
||||||
|
|
||||||
|
```python
|
||||||
|
import os
|
||||||
|
import subprocess
|
||||||
|
import tempfile
|
||||||
|
|
||||||
|
from .paths import _bin, _log
|
||||||
|
|
||||||
|
_yolo_model = None
|
||||||
|
|
||||||
|
|
||||||
|
def _get_yolo():
|
||||||
|
global _yolo_model
|
||||||
|
if _yolo_model is None:
|
||||||
|
try:
|
||||||
|
from ultralytics import YOLO
|
||||||
|
_yolo_model = YOLO("yolov8n.pt")
|
||||||
|
_log("YOLO model loaded")
|
||||||
|
except ImportError:
|
||||||
|
_log("ultralytics not installed — tracking disabled")
|
||||||
|
return None
|
||||||
|
except Exception as e:
|
||||||
|
_log(f"YOLO load failed: {e}")
|
||||||
|
return None
|
||||||
|
return _yolo_model
|
||||||
|
|
||||||
|
|
||||||
|
def extract_frame_cv(video_path: str, time: float):
|
||||||
|
try:
|
||||||
|
import cv2
|
||||||
|
import numpy as np
|
||||||
|
except ImportError:
|
||||||
|
return None
|
||||||
|
fd, tmp = tempfile.mkstemp(suffix=".png")
|
||||||
|
os.close(fd)
|
||||||
|
try:
|
||||||
|
cmd = [_bin("ffmpeg"), "-y", "-ss", str(time), "-i", video_path,
|
||||||
|
"-frames:v", "1", tmp]
|
||||||
|
result = subprocess.run(cmd, capture_output=True, timeout=10)
|
||||||
|
if result.returncode != 0:
|
||||||
|
return None
|
||||||
|
return cv2.imread(tmp)
|
||||||
|
except Exception:
|
||||||
|
return None
|
||||||
|
finally:
|
||||||
|
if os.path.exists(tmp):
|
||||||
|
os.unlink(tmp)
|
||||||
|
|
||||||
|
|
||||||
|
def detect_subject_center(
|
||||||
|
video_path: str, time: float, target_cls: int | None, last_x: float, last_y: float,
|
||||||
|
) -> tuple[int | None, float, float] | None:
|
||||||
|
model = _get_yolo()
|
||||||
|
if model is None:
|
||||||
|
return None
|
||||||
|
frame = extract_frame_cv(video_path, time)
|
||||||
|
if frame is None:
|
||||||
|
return None
|
||||||
|
results = model(frame, verbose=False)
|
||||||
|
if not results or len(results[0].boxes) == 0:
|
||||||
|
return None
|
||||||
|
h, w = frame.shape[:2]
|
||||||
|
dets = []
|
||||||
|
for box in results[0].boxes:
|
||||||
|
x1, y1, x2, y2 = box.xyxy[0].tolist()
|
||||||
|
cls = int(box.cls[0])
|
||||||
|
cx = (x1 + x2) / 2 / w
|
||||||
|
cy = (y1 + y2) / 2 / h
|
||||||
|
dets.append((cls, cx, cy))
|
||||||
|
def score(d):
|
||||||
|
cls_penalty = 0 if (target_cls is None or d[0] == target_cls) else 1.0
|
||||||
|
dist = (d[1] - last_x) ** 2 + (d[2] - last_y) ** 2
|
||||||
|
return cls_penalty + dist
|
||||||
|
best = min(dets, key=score)
|
||||||
|
return best
|
||||||
|
|
||||||
|
|
||||||
|
def track_centers_for_jobs(
|
||||||
|
video_path: str, cursor: float, crop_center: float,
|
||||||
|
starts: list[float],
|
||||||
|
) -> list[float]:
|
||||||
|
ref = detect_subject_center(video_path, cursor, None, crop_center, 0.5)
|
||||||
|
if ref is None:
|
||||||
|
_log("Tracking: no detection at cursor, using fixed center")
|
||||||
|
return [crop_center] * len(starts)
|
||||||
|
target_cls, last_x, last_y = ref
|
||||||
|
_log(f"Tracking: target class={target_cls} at ({last_x:.2f}, {last_y:.2f})")
|
||||||
|
centers = []
|
||||||
|
for t in starts:
|
||||||
|
det = detect_subject_center(video_path, t, target_cls, last_x, last_y)
|
||||||
|
if det is not None:
|
||||||
|
_, cx, cy = det
|
||||||
|
_log(f" t={t:.2f}s → center={cx:.3f}")
|
||||||
|
centers.append(cx)
|
||||||
|
last_x, last_y = cx, cy
|
||||||
|
else:
|
||||||
|
_log(f" t={t:.2f}s → lost, reusing {last_x:.3f}")
|
||||||
|
centers.append(last_x)
|
||||||
|
return centers
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 2: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add core/tracking.py
|
||||||
|
git commit -m "feat: create core/tracking module with YOLO subject tracking"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 7: Update main.py to import from core/
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Modify: `main.py`
|
||||||
|
|
||||||
|
**Step 1: Replace function definitions with imports**
|
||||||
|
|
||||||
|
At the top of main.py, after the existing stdlib imports (line 17), add:
|
||||||
|
|
||||||
|
```python
|
||||||
|
from core.paths import _bin, _log, build_export_path, build_sequence_dir, format_time
|
||||||
|
from core.ffmpeg import (
|
||||||
|
_RATIOS, resolve_keyframe, apply_keyframes_to_jobs,
|
||||||
|
build_ffmpeg_command, build_audio_extract_command, detect_hw_encoders,
|
||||||
|
)
|
||||||
|
from core.db import ProcessedDB
|
||||||
|
from core.annotations import remove_clip_annotation, upsert_clip_annotation
|
||||||
|
from core.tracking import track_centers_for_jobs
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 2: Delete the extracted function definitions and dead imports**
|
||||||
|
|
||||||
|
Remove definitions from main.py:
|
||||||
|
- Lines 36-74: `_frozen_path`, `_bin`, `_log`, `build_export_path`, `build_sequence_dir`, `format_time`
|
||||||
|
- Lines 77-188: `resolve_keyframe`, `apply_keyframes_to_jobs`, `build_ffmpeg_command`, `build_audio_extract_command`
|
||||||
|
- Lines 191-241: annotation functions (`build_annotation_json_path`, `remove_clip_annotation`, `upsert_clip_annotation`)
|
||||||
|
- Lines 244-289: `detect_hw_encoders`, `_RATIOS`, `_portrait_crop_filter`
|
||||||
|
- Lines 294-395: tracking functions (`_yolo_model`, `_get_yolo`, `extract_frame_cv`, `detect_subject_center`, `track_centers_for_jobs`)
|
||||||
|
- Lines 398-626: `ProcessedDB` class
|
||||||
|
|
||||||
|
Remove now-dead stdlib imports from the top of main.py:
|
||||||
|
- `re` (only used in `detect_hw_encoders`)
|
||||||
|
- `json` (only used in annotation functions)
|
||||||
|
- `sqlite3` (only used in `ProcessedDB`)
|
||||||
|
- `tempfile` (only used in `extract_frame_cv`)
|
||||||
|
- `datetime`, `timezone` from the datetime import (only used in `_log` and `ProcessedDB`)
|
||||||
|
|
||||||
|
Keep in main.py:
|
||||||
|
- `_SELVA_CATEGORIES` (UI constant, line 291)
|
||||||
|
- `_RATIOS` reference — imported from core.ffmpeg
|
||||||
|
- `ExportWorker` (QThread-based, stays in main.py — the server uses `core.export.ExportRunner` instead)
|
||||||
|
- `_DBWorker` and `FrameGrabber` (QThread-based, stay in main.py)
|
||||||
|
|
||||||
|
**Step 3: Verify Qt app still works**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
python main.py
|
||||||
|
```
|
||||||
|
|
||||||
|
Open a video, export a clip, check markers — verify nothing broke.
|
||||||
|
|
||||||
|
**Step 4: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add main.py
|
||||||
|
git commit -m "refactor: import shared logic from core/ instead of inline definitions"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 8: Create server/config.py
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `server/__init__.py` (empty package marker)
|
||||||
|
- Create: `server/config.py`
|
||||||
|
|
||||||
|
**Step 1: Create `server/__init__.py`**
|
||||||
|
|
||||||
|
```python
|
||||||
|
# empty — package marker
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 2: Create config**
|
||||||
|
|
||||||
|
```python
|
||||||
|
import os
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
|
||||||
|
MEDIA_DIRS: list[str] = [
|
||||||
|
d.strip() for d in os.environ.get("MEDIA_DIRS", str(Path.home())).split(",") if d.strip()
|
||||||
|
]
|
||||||
|
EXPORT_DIR: str = os.environ.get("EXPORT_DIR", str(Path.home() / "8cut-exports"))
|
||||||
|
DB_PATH: str = os.environ.get("DB_PATH", str(Path.home() / ".8cut.db"))
|
||||||
|
CACHE_DIR: str = os.environ.get("CACHE_DIR", str(Path.home() / ".8cut-cache"))
|
||||||
|
HOST: str = os.environ.get("HOST", "0.0.0.0")
|
||||||
|
PORT: int = int(os.environ.get("PORT", "8000"))
|
||||||
|
|
||||||
|
VIDEO_EXTENSIONS = {".mp4", ".mkv", ".avi", ".mov", ".webm", ".ts", ".flv", ".wmv"}
|
||||||
|
|
||||||
|
QUALITY_PRESETS = {
|
||||||
|
"potato": {"height": 480, "bitrate": "500k"},
|
||||||
|
"low": {"height": 720, "bitrate": "2M"},
|
||||||
|
"medium": {"height": 1080, "bitrate": "5M"},
|
||||||
|
"high": {"height": 0, "bitrate": "10M"}, # 0 = original resolution
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 2: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add server/
|
||||||
|
git commit -m "feat: create server/config with env var settings and quality presets"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 9: Create server/app.py — FastAPI skeleton + file listing
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `server/app.py`
|
||||||
|
- Create: `server/routes/__init__.py`
|
||||||
|
- Create: `server/routes/files.py`
|
||||||
|
|
||||||
|
**Step 1: Create FastAPI app**
|
||||||
|
|
||||||
|
`server/app.py`:
|
||||||
|
```python
|
||||||
|
from fastapi import FastAPI
|
||||||
|
from .routes import files, stream, markers, export, hidden
|
||||||
|
|
||||||
|
app = FastAPI(title="8-cut Server")
|
||||||
|
app.include_router(files.router, prefix="/api")
|
||||||
|
app.include_router(stream.router, prefix="/api")
|
||||||
|
app.include_router(markers.router, prefix="/api")
|
||||||
|
app.include_router(export.router, prefix="/api")
|
||||||
|
app.include_router(hidden.router, prefix="/api")
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 2: Create file listing route**
|
||||||
|
|
||||||
|
`server/routes/files.py`:
|
||||||
|
```python
|
||||||
|
import os
|
||||||
|
from fastapi import APIRouter, Query
|
||||||
|
from ..config import MEDIA_DIRS, VIDEO_EXTENSIONS
|
||||||
|
|
||||||
|
router = APIRouter()
|
||||||
|
|
||||||
|
|
||||||
|
def _scan_videos(root: str) -> list[dict]:
|
||||||
|
results = []
|
||||||
|
for dirpath, _, filenames in os.walk(root):
|
||||||
|
for f in sorted(filenames):
|
||||||
|
if os.path.splitext(f)[1].lower() in VIDEO_EXTENSIONS:
|
||||||
|
full = os.path.join(dirpath, f)
|
||||||
|
rel = os.path.relpath(full, root)
|
||||||
|
results.append({
|
||||||
|
"name": f,
|
||||||
|
"path": rel,
|
||||||
|
"root": root,
|
||||||
|
"size": os.path.getsize(full),
|
||||||
|
})
|
||||||
|
return results
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/files")
|
||||||
|
def list_files(root: str | None = Query(None)):
|
||||||
|
dirs = [root] if root and root in MEDIA_DIRS else MEDIA_DIRS
|
||||||
|
files = []
|
||||||
|
for d in dirs:
|
||||||
|
files.extend(_scan_videos(d))
|
||||||
|
return files
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/roots")
|
||||||
|
def list_roots():
|
||||||
|
return MEDIA_DIRS
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 3: Create `server/routes/__init__.py`**
|
||||||
|
|
||||||
|
```python
|
||||||
|
# empty — package marker
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 4: Create stub routers** so app.py imports don't fail. Each file gets a minimal router — later tasks fill in the real endpoints.
|
||||||
|
|
||||||
|
`server/routes/stream.py`:
|
||||||
|
```python
|
||||||
|
from fastapi import APIRouter
|
||||||
|
router = APIRouter()
|
||||||
|
```
|
||||||
|
|
||||||
|
`server/routes/markers.py`:
|
||||||
|
```python
|
||||||
|
from fastapi import APIRouter
|
||||||
|
router = APIRouter()
|
||||||
|
```
|
||||||
|
|
||||||
|
`server/routes/export.py`:
|
||||||
|
```python
|
||||||
|
from fastapi import APIRouter
|
||||||
|
router = APIRouter()
|
||||||
|
```
|
||||||
|
|
||||||
|
`server/routes/hidden.py`:
|
||||||
|
```python
|
||||||
|
from fastapi import APIRouter
|
||||||
|
router = APIRouter()
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 5: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add server/
|
||||||
|
git commit -m "feat: add FastAPI app with file listing endpoint"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 10: Create server/routes/stream.py — video serving + transcode cache
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `server/cache.py`
|
||||||
|
- Create: `server/routes/stream.py`
|
||||||
|
|
||||||
|
**Step 1: Create cache manager**
|
||||||
|
|
||||||
|
`server/cache.py` handles:
|
||||||
|
- Computing cache paths from source file hash + quality
|
||||||
|
- Checking cache status
|
||||||
|
- Launching background ffmpeg transcodes
|
||||||
|
- Tracking in-progress jobs
|
||||||
|
|
||||||
|
**Step 2: Create stream routes**
|
||||||
|
|
||||||
|
```
|
||||||
|
GET /api/video/{path} — raw file, range requests
|
||||||
|
GET /api/stream/{path}?quality=low — cached transcode, range requests (202 if not ready)
|
||||||
|
GET /api/audio/{path} — cached audio extraction, range requests (202 if not ready)
|
||||||
|
GET /api/cache/status/{path} — cache status for all qualities
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 3: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add server/cache.py server/routes/stream.py
|
||||||
|
git commit -m "feat: add video streaming with transcode cache and audio extraction"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 11: Create server/routes/markers.py — DB endpoints
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `server/routes/markers.py`
|
||||||
|
|
||||||
|
**Step 1: Create markers/profiles/labels routes**
|
||||||
|
|
||||||
|
```
|
||||||
|
GET /api/markers/{filename}?profile=default
|
||||||
|
GET /api/profiles
|
||||||
|
GET /api/labels
|
||||||
|
```
|
||||||
|
|
||||||
|
Uses `ProcessedDB` singleton from `core.db`.
|
||||||
|
|
||||||
|
**Step 2: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add server/routes/markers.py
|
||||||
|
git commit -m "feat: add markers, profiles, and labels API endpoints"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 12: Create server/routes/export.py + WebSocket
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `server/routes/export.py`
|
||||||
|
- Create: `server/ws.py`
|
||||||
|
|
||||||
|
**Step 1: Create export routes + WS**
|
||||||
|
|
||||||
|
```
|
||||||
|
POST /api/export — start export job
|
||||||
|
GET /api/export/{id} — check job status
|
||||||
|
DELETE /api/export/{path} — delete export from DB + disk
|
||||||
|
WS /ws/export — real-time progress
|
||||||
|
```
|
||||||
|
|
||||||
|
Uses `ExportRunner` from `core.export`.
|
||||||
|
|
||||||
|
**Step 2: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add server/routes/export.py server/ws.py
|
||||||
|
git commit -m "feat: add export endpoint with WebSocket progress"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 13: Create server/routes/hidden.py
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `server/routes/hidden.py`
|
||||||
|
|
||||||
|
**Step 1: Create hidden file routes**
|
||||||
|
|
||||||
|
```
|
||||||
|
POST /api/hidden/{filename}?profile=default
|
||||||
|
DELETE /api/hidden/{filename}?profile=default
|
||||||
|
GET /api/hidden?profile=default
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 2: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add server/routes/hidden.py
|
||||||
|
git commit -m "feat: add hidden files API endpoints"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
### Task 14: Create Dockerfile + docker-compose.yml
|
||||||
|
|
||||||
|
**Files:**
|
||||||
|
- Create: `Dockerfile`
|
||||||
|
- Create: `docker-compose.yml`
|
||||||
|
|
||||||
|
**Step 1: Create Dockerfile**
|
||||||
|
|
||||||
|
```dockerfile
|
||||||
|
FROM python:3.12-slim
|
||||||
|
RUN apt-get update && apt-get install -y ffmpeg && rm -rf /var/lib/apt/lists/*
|
||||||
|
WORKDIR /app
|
||||||
|
COPY core/ core/
|
||||||
|
COPY server/ server/
|
||||||
|
# Note: ultralytics + opencv-python needed only if subject tracking is used.
|
||||||
|
# Add them here if tracking is required on the server.
|
||||||
|
RUN pip install --no-cache-dir fastapi uvicorn
|
||||||
|
EXPOSE 8000
|
||||||
|
CMD ["uvicorn", "server.app:app", "--host", "0.0.0.0", "--port", "8000"]
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 2: Create docker-compose.yml**
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
services:
|
||||||
|
8cut:
|
||||||
|
build: .
|
||||||
|
ports:
|
||||||
|
- "8000:8000"
|
||||||
|
volumes:
|
||||||
|
- /path/to/videos:/videos:ro
|
||||||
|
- /path/to/exports:/exports
|
||||||
|
- 8cut-data:/data
|
||||||
|
environment:
|
||||||
|
MEDIA_DIRS: /videos
|
||||||
|
EXPORT_DIR: /exports
|
||||||
|
DB_PATH: /data/8cut.db
|
||||||
|
CACHE_DIR: /data/cache
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
8cut-data:
|
||||||
|
```
|
||||||
|
|
||||||
|
**Step 3: Commit**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git add Dockerfile docker-compose.yml
|
||||||
|
git commit -m "feat: add Dockerfile and docker-compose for server deployment"
|
||||||
|
```
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
from fastapi import FastAPI, WebSocket
|
||||||
|
|
||||||
|
from core.db import ProcessedDB
|
||||||
|
from .config import DB_PATH
|
||||||
|
from .routes import files, stream, markers, export, hidden
|
||||||
|
from . import ws
|
||||||
|
|
||||||
|
app = FastAPI(title="8-cut Server")
|
||||||
|
|
||||||
|
db = ProcessedDB(DB_PATH)
|
||||||
|
|
||||||
|
app.include_router(files.router, prefix="/api")
|
||||||
|
app.include_router(stream.router, prefix="/api")
|
||||||
|
app.include_router(markers.router, prefix="/api")
|
||||||
|
app.include_router(export.router, prefix="/api")
|
||||||
|
app.include_router(hidden.router, prefix="/api")
|
||||||
|
|
||||||
|
|
||||||
|
@app.websocket("/ws/export")
|
||||||
|
async def export_ws(websocket: WebSocket):
|
||||||
|
await ws.connect(websocket)
|
||||||
+171
@@ -0,0 +1,171 @@
|
|||||||
|
import hashlib
|
||||||
|
import os
|
||||||
|
import subprocess
|
||||||
|
import threading
|
||||||
|
from enum import Enum
|
||||||
|
|
||||||
|
from core.paths import _bin, _log
|
||||||
|
from .config import CACHE_DIR, QUALITY_PRESETS
|
||||||
|
|
||||||
|
|
||||||
|
class CacheStatus(str, Enum):
|
||||||
|
READY = "ready"
|
||||||
|
TRANSCODING = "transcoding"
|
||||||
|
MISSING = "missing"
|
||||||
|
ERROR = "error"
|
||||||
|
|
||||||
|
|
||||||
|
_jobs_lock = threading.Lock()
|
||||||
|
_active_jobs: dict[str, threading.Thread] = {}
|
||||||
|
|
||||||
|
|
||||||
|
def _cache_key(source_path: str) -> str:
|
||||||
|
"""Stable hash from absolute source path."""
|
||||||
|
return hashlib.sha256(source_path.encode()).hexdigest()[:16]
|
||||||
|
|
||||||
|
|
||||||
|
def cache_path(source_path: str, quality: str) -> str:
|
||||||
|
key = _cache_key(source_path)
|
||||||
|
return os.path.join(CACHE_DIR, quality, f"{key}.mp4")
|
||||||
|
|
||||||
|
|
||||||
|
def audio_cache_path(source_path: str) -> str:
|
||||||
|
key = _cache_key(source_path)
|
||||||
|
return os.path.join(CACHE_DIR, "audio", f"{key}.wav")
|
||||||
|
|
||||||
|
|
||||||
|
def get_status(source_path: str, quality: str) -> CacheStatus:
|
||||||
|
cp = cache_path(source_path, quality)
|
||||||
|
if os.path.isfile(cp):
|
||||||
|
return CacheStatus.READY
|
||||||
|
job_key = f"{source_path}:{quality}"
|
||||||
|
with _jobs_lock:
|
||||||
|
if job_key in _active_jobs and _active_jobs[job_key].is_alive():
|
||||||
|
return CacheStatus.TRANSCODING
|
||||||
|
return CacheStatus.MISSING
|
||||||
|
|
||||||
|
|
||||||
|
def get_audio_status(source_path: str) -> CacheStatus:
|
||||||
|
ap = audio_cache_path(source_path)
|
||||||
|
if os.path.isfile(ap):
|
||||||
|
return CacheStatus.READY
|
||||||
|
job_key = f"{source_path}:audio"
|
||||||
|
with _jobs_lock:
|
||||||
|
if job_key in _active_jobs and _active_jobs[job_key].is_alive():
|
||||||
|
return CacheStatus.TRANSCODING
|
||||||
|
return CacheStatus.MISSING
|
||||||
|
|
||||||
|
|
||||||
|
def get_all_statuses(source_path: str) -> dict:
|
||||||
|
result = {}
|
||||||
|
for q in QUALITY_PRESETS:
|
||||||
|
result[q] = get_status(source_path, q)
|
||||||
|
result["audio"] = get_audio_status(source_path)
|
||||||
|
return result
|
||||||
|
|
||||||
|
|
||||||
|
def _transcode_worker(source_path: str, quality: str) -> None:
|
||||||
|
preset = QUALITY_PRESETS[quality]
|
||||||
|
out = cache_path(source_path, quality)
|
||||||
|
os.makedirs(os.path.dirname(out), exist_ok=True)
|
||||||
|
tmp = out + ".tmp.mp4"
|
||||||
|
|
||||||
|
cmd = [_bin("ffmpeg"), "-y", "-i", source_path, "-an"]
|
||||||
|
|
||||||
|
if preset["height"] > 0:
|
||||||
|
cmd += [
|
||||||
|
"-vf", f"scale=-2:{preset['height']}:flags=lanczos",
|
||||||
|
]
|
||||||
|
|
||||||
|
cmd += [
|
||||||
|
"-c:v", "libx264",
|
||||||
|
"-preset", "fast",
|
||||||
|
"-b:v", preset["bitrate"],
|
||||||
|
"-movflags", "+faststart",
|
||||||
|
tmp,
|
||||||
|
]
|
||||||
|
|
||||||
|
_log(f"Transcode start: {source_path} @ {quality}")
|
||||||
|
try:
|
||||||
|
result = subprocess.run(cmd, capture_output=True, text=True, timeout=3600)
|
||||||
|
if result.returncode == 0:
|
||||||
|
os.rename(tmp, out)
|
||||||
|
_log(f"Transcode done: {out}")
|
||||||
|
else:
|
||||||
|
_log(f"Transcode failed: {result.stderr[-300:]}")
|
||||||
|
if os.path.exists(tmp):
|
||||||
|
os.unlink(tmp)
|
||||||
|
except Exception as e:
|
||||||
|
_log(f"Transcode error: {e}")
|
||||||
|
if os.path.exists(tmp):
|
||||||
|
os.unlink(tmp)
|
||||||
|
|
||||||
|
|
||||||
|
def _audio_extract_worker(source_path: str) -> None:
|
||||||
|
out = audio_cache_path(source_path)
|
||||||
|
os.makedirs(os.path.dirname(out), exist_ok=True)
|
||||||
|
tmp = out + ".tmp.wav"
|
||||||
|
|
||||||
|
cmd = [
|
||||||
|
_bin("ffmpeg"), "-y",
|
||||||
|
"-i", source_path,
|
||||||
|
"-vn",
|
||||||
|
"-c:a", "pcm_s16le",
|
||||||
|
tmp,
|
||||||
|
]
|
||||||
|
|
||||||
|
_log(f"Audio extract start: {source_path}")
|
||||||
|
try:
|
||||||
|
result = subprocess.run(cmd, capture_output=True, text=True, timeout=600)
|
||||||
|
if result.returncode == 0:
|
||||||
|
os.rename(tmp, out)
|
||||||
|
_log(f"Audio extract done: {out}")
|
||||||
|
else:
|
||||||
|
_log(f"Audio extract failed: {result.stderr[-300:]}")
|
||||||
|
if os.path.exists(tmp):
|
||||||
|
os.unlink(tmp)
|
||||||
|
except Exception as e:
|
||||||
|
_log(f"Audio extract error: {e}")
|
||||||
|
if os.path.exists(tmp):
|
||||||
|
os.unlink(tmp)
|
||||||
|
|
||||||
|
|
||||||
|
def _prune_dead_jobs() -> None:
|
||||||
|
"""Remove finished threads from _active_jobs. Must be called under _jobs_lock."""
|
||||||
|
dead = [k for k, t in _active_jobs.items() if not t.is_alive()]
|
||||||
|
for k in dead:
|
||||||
|
del _active_jobs[k]
|
||||||
|
|
||||||
|
|
||||||
|
def ensure_transcode(source_path: str, quality: str) -> CacheStatus:
|
||||||
|
"""Start transcode if not cached. Returns current status."""
|
||||||
|
status = get_status(source_path, quality)
|
||||||
|
if status != CacheStatus.MISSING:
|
||||||
|
return status
|
||||||
|
|
||||||
|
job_key = f"{source_path}:{quality}"
|
||||||
|
with _jobs_lock:
|
||||||
|
_prune_dead_jobs()
|
||||||
|
if job_key in _active_jobs and _active_jobs[job_key].is_alive():
|
||||||
|
return CacheStatus.TRANSCODING
|
||||||
|
t = threading.Thread(target=_transcode_worker, args=(source_path, quality), daemon=True)
|
||||||
|
_active_jobs[job_key] = t
|
||||||
|
t.start()
|
||||||
|
return CacheStatus.TRANSCODING
|
||||||
|
|
||||||
|
|
||||||
|
def ensure_audio(source_path: str) -> CacheStatus:
|
||||||
|
"""Start audio extraction if not cached. Returns current status."""
|
||||||
|
status = get_audio_status(source_path)
|
||||||
|
if status != CacheStatus.MISSING:
|
||||||
|
return status
|
||||||
|
|
||||||
|
job_key = f"{source_path}:audio"
|
||||||
|
with _jobs_lock:
|
||||||
|
_prune_dead_jobs()
|
||||||
|
if job_key in _active_jobs and _active_jobs[job_key].is_alive():
|
||||||
|
return CacheStatus.TRANSCODING
|
||||||
|
t = threading.Thread(target=_audio_extract_worker, args=(source_path,), daemon=True)
|
||||||
|
_active_jobs[job_key] = t
|
||||||
|
t.start()
|
||||||
|
return CacheStatus.TRANSCODING
|
||||||
@@ -0,0 +1,21 @@
|
|||||||
|
import os
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
|
||||||
|
MEDIA_DIRS: list[str] = [
|
||||||
|
d.strip() for d in os.environ.get("MEDIA_DIRS", str(Path.home())).split(",") if d.strip()
|
||||||
|
]
|
||||||
|
EXPORT_DIR: str = os.environ.get("EXPORT_DIR", str(Path.home() / "8cut-exports"))
|
||||||
|
DB_PATH: str = os.environ.get("DB_PATH", str(Path.home() / ".8cut.db"))
|
||||||
|
CACHE_DIR: str = os.environ.get("CACHE_DIR", str(Path.home() / ".8cut-cache"))
|
||||||
|
HOST: str = os.environ.get("HOST", "0.0.0.0")
|
||||||
|
PORT: int = int(os.environ.get("PORT", "8000"))
|
||||||
|
|
||||||
|
VIDEO_EXTENSIONS = {".mp4", ".mkv", ".avi", ".mov", ".webm", ".ts", ".flv", ".wmv"}
|
||||||
|
|
||||||
|
QUALITY_PRESETS = {
|
||||||
|
"potato": {"height": 480, "bitrate": "500k"},
|
||||||
|
"low": {"height": 720, "bitrate": "2M"},
|
||||||
|
"medium": {"height": 1080, "bitrate": "5M"},
|
||||||
|
"high": {"height": 0, "bitrate": "10M"}, # 0 = original resolution
|
||||||
|
}
|
||||||
@@ -0,0 +1,203 @@
|
|||||||
|
import os
|
||||||
|
import re
|
||||||
|
import shutil
|
||||||
|
import uuid
|
||||||
|
|
||||||
|
from fastapi import APIRouter, HTTPException, Query
|
||||||
|
from pydantic import BaseModel
|
||||||
|
|
||||||
|
from core.export import ExportRunner
|
||||||
|
from core.paths import build_export_path, build_sequence_dir
|
||||||
|
from core.ffmpeg import _RATIOS, apply_keyframes_to_jobs
|
||||||
|
from .. import ws as ws_module
|
||||||
|
from ..config import EXPORT_DIR, MEDIA_DIRS
|
||||||
|
|
||||||
|
router = APIRouter()
|
||||||
|
|
||||||
|
_jobs: dict[str, dict] = {}
|
||||||
|
|
||||||
|
_VALID_ENCODERS = {"libx264", "h264_nvenc", "h264_vaapi", "h264_qsv", "h264_amf", "h264_videotoolbox"}
|
||||||
|
|
||||||
|
|
||||||
|
class CropKeyframe(BaseModel):
|
||||||
|
time: float
|
||||||
|
center: float
|
||||||
|
ratio: str | None = None
|
||||||
|
rand_portrait: bool = False
|
||||||
|
rand_square: bool = False
|
||||||
|
|
||||||
|
|
||||||
|
class ExportRequest(BaseModel):
|
||||||
|
input_path: str
|
||||||
|
cursor: float
|
||||||
|
name: str
|
||||||
|
clips: int = 3
|
||||||
|
spread: float = 3.0
|
||||||
|
short_side: int | None = None
|
||||||
|
portrait_ratio: str | None = None
|
||||||
|
crop_center: float = 0.5
|
||||||
|
format: str = "MP4"
|
||||||
|
label: str = ""
|
||||||
|
category: str = ""
|
||||||
|
profile: str = "default"
|
||||||
|
folder_suffix: str = ""
|
||||||
|
crop_keyframes: list[CropKeyframe] | None = None
|
||||||
|
rand_portrait: bool = False
|
||||||
|
rand_square: bool = False
|
||||||
|
encoder: str = "libx264"
|
||||||
|
|
||||||
|
|
||||||
|
def _next_counter(folder: str, basename: str) -> int:
|
||||||
|
"""Scan folder for existing {basename}_NNN dirs and return max + 1."""
|
||||||
|
pattern = re.compile(rf'^{re.escape(basename)}_(\d{{3}})$')
|
||||||
|
highest = 0
|
||||||
|
if os.path.isdir(folder):
|
||||||
|
for entry in os.listdir(folder):
|
||||||
|
m = pattern.match(entry)
|
||||||
|
if m:
|
||||||
|
highest = max(highest, int(m.group(1)))
|
||||||
|
return highest + 1
|
||||||
|
|
||||||
|
|
||||||
|
def _validate_input_path(path: str) -> str:
|
||||||
|
"""Verify input_path falls under a configured MEDIA_DIR."""
|
||||||
|
real = os.path.realpath(path)
|
||||||
|
for root in MEDIA_DIRS:
|
||||||
|
root_real = os.path.realpath(root)
|
||||||
|
if real == root_real or real.startswith(root_real + os.sep):
|
||||||
|
return real
|
||||||
|
raise HTTPException(status_code=403, detail="input_path outside media directories")
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/export")
|
||||||
|
def start_export(req: ExportRequest):
|
||||||
|
from ..app import db
|
||||||
|
|
||||||
|
# Validate inputs
|
||||||
|
input_path = _validate_input_path(req.input_path)
|
||||||
|
|
||||||
|
if req.encoder not in _VALID_ENCODERS:
|
||||||
|
raise HTTPException(status_code=400, detail=f"invalid encoder: {req.encoder}")
|
||||||
|
|
||||||
|
if req.portrait_ratio is not None and req.portrait_ratio not in _RATIOS:
|
||||||
|
raise HTTPException(status_code=400, detail=f"invalid portrait_ratio: {req.portrait_ratio}")
|
||||||
|
|
||||||
|
if req.folder_suffix and ("/" in req.folder_suffix or "\\" in req.folder_suffix or ".." in req.folder_suffix):
|
||||||
|
raise HTTPException(status_code=400, detail="folder_suffix must not contain path separators")
|
||||||
|
|
||||||
|
if "/" in req.name or "\\" in req.name or ".." in req.name:
|
||||||
|
raise HTTPException(status_code=400, detail="name must not contain path separators")
|
||||||
|
|
||||||
|
job_id = str(uuid.uuid4())[:8]
|
||||||
|
folder = EXPORT_DIR
|
||||||
|
if req.folder_suffix:
|
||||||
|
folder = folder.rstrip(os.sep) + "_" + req.folder_suffix
|
||||||
|
|
||||||
|
image_sequence = req.format in ("WebP", "WebP sequence")
|
||||||
|
counter = _next_counter(folder, req.name)
|
||||||
|
|
||||||
|
# Build job list: (start, output_path, portrait_ratio, crop_center)
|
||||||
|
jobs = []
|
||||||
|
for i in range(req.clips):
|
||||||
|
start = req.cursor + i * req.spread
|
||||||
|
if image_sequence:
|
||||||
|
out = build_sequence_dir(folder, req.name, counter, sub=i if req.clips > 1 else None)
|
||||||
|
else:
|
||||||
|
out = build_export_path(folder, req.name, counter, sub=i if req.clips > 1 else None)
|
||||||
|
os.makedirs(os.path.dirname(out), exist_ok=True)
|
||||||
|
jobs.append((start, out, req.portrait_ratio, req.crop_center))
|
||||||
|
|
||||||
|
# Apply keyframes if provided — returns 6-tuples, strip back to 4
|
||||||
|
if req.crop_keyframes:
|
||||||
|
kf_tuples = [
|
||||||
|
(kf.time, kf.center, kf.ratio, kf.rand_portrait, kf.rand_square)
|
||||||
|
for kf in req.crop_keyframes
|
||||||
|
]
|
||||||
|
widened = apply_keyframes_to_jobs(
|
||||||
|
jobs, kf_tuples,
|
||||||
|
req.crop_center, req.portrait_ratio,
|
||||||
|
req.rand_portrait, req.rand_square,
|
||||||
|
)
|
||||||
|
jobs = [(s, o, r, c) for s, o, r, c, _rp, _rs in widened]
|
||||||
|
|
||||||
|
completed = []
|
||||||
|
|
||||||
|
def on_clip_done(path: str):
|
||||||
|
completed.append(path)
|
||||||
|
# Record in DB so markers show up
|
||||||
|
db.add(
|
||||||
|
filename=os.path.basename(input_path),
|
||||||
|
start_time=req.cursor,
|
||||||
|
output_path=path,
|
||||||
|
label=req.label,
|
||||||
|
category=req.category,
|
||||||
|
short_side=req.short_side,
|
||||||
|
portrait_ratio=req.portrait_ratio or "",
|
||||||
|
crop_center=req.crop_center,
|
||||||
|
fmt=req.format,
|
||||||
|
clip_count=req.clips,
|
||||||
|
spread=req.spread,
|
||||||
|
profile=req.profile,
|
||||||
|
)
|
||||||
|
ws_module.broadcast({"type": "clip_done", "job_id": job_id, "path": path})
|
||||||
|
|
||||||
|
def on_all_done():
|
||||||
|
_jobs[job_id]["status"] = "done"
|
||||||
|
_jobs[job_id].pop("runner", None)
|
||||||
|
ws_module.broadcast({"type": "all_done", "job_id": job_id})
|
||||||
|
|
||||||
|
def on_error(msg: str):
|
||||||
|
_jobs[job_id]["status"] = "error"
|
||||||
|
_jobs[job_id]["error"] = msg
|
||||||
|
_jobs[job_id].pop("runner", None)
|
||||||
|
ws_module.broadcast({"type": "error", "job_id": job_id, "msg": msg})
|
||||||
|
|
||||||
|
runner = ExportRunner(
|
||||||
|
input_path=input_path,
|
||||||
|
jobs=jobs,
|
||||||
|
short_side=req.short_side,
|
||||||
|
image_sequence=image_sequence,
|
||||||
|
encoder=req.encoder,
|
||||||
|
on_clip_done=on_clip_done,
|
||||||
|
on_all_done=on_all_done,
|
||||||
|
on_error=on_error,
|
||||||
|
)
|
||||||
|
|
||||||
|
_jobs[job_id] = {
|
||||||
|
"status": "running",
|
||||||
|
"total": len(jobs),
|
||||||
|
"completed": completed,
|
||||||
|
"runner": runner,
|
||||||
|
}
|
||||||
|
runner.start()
|
||||||
|
|
||||||
|
return {"job_id": job_id}
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/export/{job_id}")
|
||||||
|
def get_export_status(job_id: str):
|
||||||
|
job = _jobs.get(job_id)
|
||||||
|
if job is None:
|
||||||
|
raise HTTPException(status_code=404, detail="job not found")
|
||||||
|
return {
|
||||||
|
"status": job["status"],
|
||||||
|
"total": job["total"],
|
||||||
|
"completed": len(job["completed"]),
|
||||||
|
"outputs": list(job["completed"]),
|
||||||
|
"error": job.get("error"),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@router.delete("/export")
|
||||||
|
def delete_export(output_path: str = Query(...)):
|
||||||
|
from ..app import db
|
||||||
|
# Validate path is under EXPORT_DIR
|
||||||
|
real = os.path.realpath(output_path)
|
||||||
|
if not real.startswith(os.path.realpath(EXPORT_DIR) + os.sep):
|
||||||
|
raise HTTPException(status_code=403, detail="path outside export directory")
|
||||||
|
db.delete_by_output_path(real)
|
||||||
|
if os.path.isfile(real):
|
||||||
|
os.unlink(real)
|
||||||
|
elif os.path.isdir(real):
|
||||||
|
shutil.rmtree(real)
|
||||||
|
return {"deleted": real}
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
import os
|
||||||
|
|
||||||
|
from fastapi import APIRouter, HTTPException, Query
|
||||||
|
from fastapi.responses import FileResponse
|
||||||
|
|
||||||
|
from ..config import MEDIA_DIRS, VIDEO_EXTENSIONS
|
||||||
|
|
||||||
|
router = APIRouter()
|
||||||
|
|
||||||
|
|
||||||
|
def _scan_videos(root: str) -> list[dict]:
|
||||||
|
results = []
|
||||||
|
for dirpath, _, filenames in os.walk(root):
|
||||||
|
for f in sorted(filenames):
|
||||||
|
if os.path.splitext(f)[1].lower() in VIDEO_EXTENSIONS:
|
||||||
|
full = os.path.join(dirpath, f)
|
||||||
|
rel = os.path.relpath(full, root)
|
||||||
|
results.append({
|
||||||
|
"name": f,
|
||||||
|
"path": rel,
|
||||||
|
"root": root,
|
||||||
|
"size": os.path.getsize(full),
|
||||||
|
})
|
||||||
|
return results
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/files")
|
||||||
|
def list_files(root: str | None = Query(None)):
|
||||||
|
dirs = [root] if root and root in MEDIA_DIRS else MEDIA_DIRS
|
||||||
|
files = []
|
||||||
|
for d in dirs:
|
||||||
|
files.extend(_scan_videos(d))
|
||||||
|
return files
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/roots")
|
||||||
|
def list_roots():
|
||||||
|
return MEDIA_DIRS
|
||||||
|
|
||||||
|
|
||||||
|
def _safe_resolve(path: str, root: str) -> str:
|
||||||
|
"""Join path to root and verify it stays within the root directory."""
|
||||||
|
if root not in MEDIA_DIRS:
|
||||||
|
raise HTTPException(status_code=400, detail="invalid root")
|
||||||
|
full = os.path.realpath(os.path.join(root, path))
|
||||||
|
if not full.startswith(os.path.realpath(root) + os.sep):
|
||||||
|
raise HTTPException(status_code=403, detail="path outside media root")
|
||||||
|
return full
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/video/{path:path}")
|
||||||
|
def serve_video(path: str, root: str = Query(...)):
|
||||||
|
full = _safe_resolve(path, root)
|
||||||
|
if not os.path.isfile(full):
|
||||||
|
raise HTTPException(status_code=404, detail="not found")
|
||||||
|
return FileResponse(full, media_type="video/mp4")
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
from fastapi import APIRouter, Query
|
||||||
|
|
||||||
|
router = APIRouter()
|
||||||
|
|
||||||
|
|
||||||
|
def _db():
|
||||||
|
from ..app import db
|
||||||
|
return db
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/hidden/{filename}")
|
||||||
|
def hide_file(filename: str, profile: str = Query("default")):
|
||||||
|
_db().hide_file(filename, profile)
|
||||||
|
return {"hidden": filename}
|
||||||
|
|
||||||
|
|
||||||
|
@router.delete("/hidden/{filename}")
|
||||||
|
def unhide_file(filename: str, profile: str = Query("default")):
|
||||||
|
_db().unhide_file(filename, profile)
|
||||||
|
return {"unhidden": filename}
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/hidden")
|
||||||
|
def get_hidden(profile: str = Query("default")):
|
||||||
|
return sorted(_db().get_hidden_files(profile))
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
from fastapi import APIRouter, Query
|
||||||
|
|
||||||
|
router = APIRouter()
|
||||||
|
|
||||||
|
|
||||||
|
def _db():
|
||||||
|
from ..app import db
|
||||||
|
return db
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/markers/{filename}")
|
||||||
|
def get_markers(filename: str, profile: str = Query("default")):
|
||||||
|
markers = _db().get_markers(filename, profile)
|
||||||
|
return [
|
||||||
|
{"start_time": t, "marker_number": n, "output_path": p}
|
||||||
|
for t, n, p in markers
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/profiles")
|
||||||
|
def get_profiles():
|
||||||
|
return _db().get_profiles()
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/labels")
|
||||||
|
def get_labels():
|
||||||
|
return _db().get_labels()
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
import os
|
||||||
|
|
||||||
|
from fastapi import APIRouter, HTTPException, Query
|
||||||
|
from fastapi.responses import FileResponse, JSONResponse
|
||||||
|
|
||||||
|
from ..config import MEDIA_DIRS, QUALITY_PRESETS
|
||||||
|
from .. import cache
|
||||||
|
|
||||||
|
router = APIRouter()
|
||||||
|
|
||||||
|
|
||||||
|
def _resolve_source(path: str, root: str) -> str:
|
||||||
|
"""Join path to root, verify it stays within root, and exists."""
|
||||||
|
if root not in MEDIA_DIRS:
|
||||||
|
raise HTTPException(status_code=400, detail="invalid root")
|
||||||
|
full = os.path.realpath(os.path.join(root, path))
|
||||||
|
if not full.startswith(os.path.realpath(root) + os.sep):
|
||||||
|
raise HTTPException(status_code=403, detail="path outside media root")
|
||||||
|
if not os.path.isfile(full):
|
||||||
|
raise HTTPException(status_code=404, detail="not found")
|
||||||
|
return full
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/stream/{path:path}")
|
||||||
|
def stream_video(path: str, root: str = Query(...), quality: str = Query("low")):
|
||||||
|
if quality not in QUALITY_PRESETS:
|
||||||
|
raise HTTPException(status_code=400, detail=f"invalid quality: {quality}")
|
||||||
|
source = _resolve_source(path, root)
|
||||||
|
|
||||||
|
status = cache.ensure_transcode(source, quality)
|
||||||
|
if status == cache.CacheStatus.READY:
|
||||||
|
return FileResponse(cache.cache_path(source, quality), media_type="video/mp4")
|
||||||
|
return JSONResponse({"status": status, "quality": quality}, status_code=202)
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/audio/{path:path}")
|
||||||
|
def stream_audio(path: str, root: str = Query(...)):
|
||||||
|
source = _resolve_source(path, root)
|
||||||
|
|
||||||
|
status = cache.ensure_audio(source)
|
||||||
|
if status == cache.CacheStatus.READY:
|
||||||
|
return FileResponse(cache.audio_cache_path(source), media_type="audio/wav")
|
||||||
|
return JSONResponse({"status": status}, status_code=202)
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/cache/status/{path:path}")
|
||||||
|
def cache_status(path: str, root: str = Query(...)):
|
||||||
|
source = _resolve_source(path, root)
|
||||||
|
return cache.get_all_statuses(source)
|
||||||
@@ -0,0 +1,43 @@
|
|||||||
|
import asyncio
|
||||||
|
import json
|
||||||
|
import threading
|
||||||
|
|
||||||
|
from fastapi import WebSocket, WebSocketDisconnect
|
||||||
|
|
||||||
|
_lock = threading.Lock()
|
||||||
|
_connections: list[WebSocket] = []
|
||||||
|
_loop: asyncio.AbstractEventLoop | None = None
|
||||||
|
|
||||||
|
|
||||||
|
async def connect(ws: WebSocket):
|
||||||
|
global _loop
|
||||||
|
_loop = asyncio.get_running_loop()
|
||||||
|
await ws.accept()
|
||||||
|
with _lock:
|
||||||
|
_connections.append(ws)
|
||||||
|
try:
|
||||||
|
while True:
|
||||||
|
await ws.receive_text() # keep alive
|
||||||
|
except (WebSocketDisconnect, Exception):
|
||||||
|
pass
|
||||||
|
finally:
|
||||||
|
with _lock:
|
||||||
|
if ws in _connections:
|
||||||
|
_connections.remove(ws)
|
||||||
|
|
||||||
|
|
||||||
|
def broadcast(msg: dict):
|
||||||
|
"""Send a message to all connected WebSocket clients.
|
||||||
|
|
||||||
|
Called from sync code (export callbacks running in background threads),
|
||||||
|
so we schedule sends on uvicorn's event loop.
|
||||||
|
"""
|
||||||
|
if _loop is None:
|
||||||
|
return
|
||||||
|
data = json.dumps(msg)
|
||||||
|
with _lock:
|
||||||
|
for ws in list(_connections):
|
||||||
|
try:
|
||||||
|
asyncio.run_coroutine_threadsafe(ws.send_text(data), _loop)
|
||||||
|
except Exception:
|
||||||
|
pass
|
||||||
Reference in New Issue
Block a user