Skip to content

armgit / peach

Public Imported from GitHub
0

Peach: Local-first video metadata scraper and media manager.

fix(media): 悬停预览不再启动取消不了的整片转码

longmeidao8231c3a00b9e
diff --git a/src/peach/routes_media.py b/src/peach/routes_media.py
index 24c2df2bc..7adf3a33f 100644
--- a/src/peach/routes_media.py
+++ b/src/peach/routes_media.py
@@ -53,7 +53,7 @@ from .preview_cache import PreviewCache
from .routes_auth import require_auth
from .segments import SegmentCancelled, SegmentUnavailable, build_hls_playlist
from .streaming import BufferedFileResponse, CancellableFileResponse, SplicedMp4Response
-from .transcodes import TranscodeCancelled, TranscodeUnavailable
+from .transcodes import TranscodeCancelled, TranscodeNeedsSession, TranscodeUnavailable
router = APIRouter()
@@ -252,11 +252,15 @@ def stream(request: Request, id: int, session: str = "", args: dict[str, str] =
path, header, session=session, registry=state.stream_sessions,
)
try:
+ # 不带会话的只有卡片悬停预览:取消不了,也看不到浏览器断开,不能为它起整片转码。
path, transcoded = state.transcode_service.browser_path(
- id, path, session=session, registry=state.stream_sessions,
+ id, path, session=session, registry=state.stream_sessions, convert=bool(session),
)
except TranscodeCancelled:
return Response(status_code=410, headers={"Cache-Control": "no-store"})
+ except TranscodeNeedsSession:
+ return JSONResponse({"error": "conversion needs a stream session"}, status_code=415,
+ headers={"Cache-Control": "no-store"})
except TranscodeUnavailable:
LOGGER.exception("browser transcode failed for asset %s", id)
return JSONResponse({"error": "transcode unavailable"}, status_code=503)
diff --git a/src/peach/transcodes.py b/src/peach/transcodes.py
index 9821da11e..ca61d67f2 100644
--- a/src/peach/transcodes.py
+++ b/src/peach/transcodes.py
@@ -54,6 +54,10 @@ class TranscodeCancelled(TranscodeUnavailable):
pass
+class TranscodeNeedsSession(TranscodeUnavailable):
+ """片源要整片转码,但请求没带可取消的流会话,也没有现成缓存。"""
+
+
class TranscodeService:
"""Create immutable browser-playable MP4 cache entries without touching sources."""
@@ -128,7 +132,13 @@ class TranscodeService:
def browser_path(
self, asset_id: int, source: Path, *, session: str = "", registry=None,
+ convert: bool = True,
) -> tuple[Path, bool]:
+ """浏览器能直接放的路径,以及它是不是转码产物。
+
+ `convert=False` 时只交现成的整片缓存,缺缓存就抛 `TranscodeNeedsSession`。
+ 没有会话的请求取消不了,浏览器断开后整片 FFmpeg 还会跑到结束。
+ """
profile = None
if not self.needs_transcode(source):
if self.resolver.ffprobe() is None:
@@ -152,6 +162,8 @@ class TranscodeService:
target = self.cache_root / f"{asset_id}-{stat.st_size}-{stat.st_mtime_ns}.mp4"
if target.is_file() and target.stat().st_size:
return target, True
+ if not convert:
+ raise TranscodeNeedsSession("conversion needs a stream session")
with self._lock_for(asset_id):
if target.is_file() and target.stat().st_size:
@@ -278,7 +290,7 @@ class TranscodeService:
整片转码要占满一个编码位、写一份和原片同量级的缓存,只有编码本身不被支持才值得。
缺 `ctts` 的片源画面解得出来,错的只是容器写的显示顺序,交给 HLS 转码分片按需修
- 就够。卡片悬停预览直接打 `/stream`,鼠标划过一张卡片不能启动一次整片转码。
+ 就够。卡片悬停预览直接打不带会话的 `/stream`,那条路只交现成缓存,见 `browser_path`。
"""
return TranscodeService._browser_compatible(
source, replace(profile, decode_order_timestamps=False),
diff --git a/tests/test_fastapi_api.py b/tests/test_fastapi_api.py
index 4fbe96553..1587970f2 100644
--- a/tests/test_fastapi_api.py
+++ b/tests/test_fastapi_api.py
@@ -2928,6 +2928,30 @@ class FastApiContractTests(unittest.IsolatedAsyncioTestCase):
self.assertEqual(response.headers["content-type"], "video/mp4")
self.assertEqual(response.headers["x-peach-transcoded"], "1")
+ async def test_sessionless_stream_never_starts_a_whole_file_conversion(self):
+ """悬停预览不带会话:取消不了、看不到断开,缺缓存就直接拒绝,不起 FFmpeg。"""
+ avi = self.media_root / "hover.avi"
+ avi.write_bytes(b"avi-source")
+ con = sqlite3.connect(self.db)
+ con.execute(
+ "INSERT INTO asset(id,location,path,name,medium,size,first_seen) "
+ "VALUES(3,'local',?,'hover.avi','video',10,'2026-08-15')",
+ (str(avi),),
+ )
+ con.commit()
+ con.close()
+ from peach.ffmpeg import BinaryChoice
+ service = self.app.state.transcode_service
+
+ with patch.object(service.resolver, "ffmpeg",
+ return_value=BinaryChoice(Path("ffmpeg"), "test")), \
+ patch.object(service, "_execute",
+ side_effect=AssertionError("悬停预览起了整片转码")):
+ response = await self.client.get("/stream?id=3", headers={"X-Token": "secret"})
+
+ self.assertEqual(response.status_code, 415)
+ self.assertEqual(response.headers["cache-control"], "no-store")
+
async def test_cached_visual_assets_and_thumbnail(self):
headers = {"X-Token": "secret"}
poster = await self.client.get("/poster?id=1&c=4", headers=headers)