mirror of
https://github.com/snapotter-hq/SnapOtter.git
synced 2026-08-03 07:46:42 +02:00
fix: handle HEIC images in blur-faces and red-eye-removal, show warning when no faces detected
This commit is contained in:
@@ -8,6 +8,7 @@ import { z } from "zod";
|
||||
import { autoOrient } from "../../lib/auto-orient.js";
|
||||
import { isToolInstalled } from "../../lib/feature-status.js";
|
||||
import { validateImageBuffer } from "../../lib/file-validation.js";
|
||||
import { decodeHeic, ensureSharpCompat } from "../../lib/heic-converter.js";
|
||||
import { createWorkspace } from "../../lib/workspace.js";
|
||||
import { updateSingleFileProgress } from "../progress.js";
|
||||
import { registerToolProcessFn } from "../tool-factory.js";
|
||||
@@ -66,6 +67,11 @@ export function registerBlurFaces(app: FastifyInstance) {
|
||||
|
||||
try {
|
||||
const settings = settingsRaw ? JSON.parse(settingsRaw) : {};
|
||||
|
||||
if (validation.format === "heif") {
|
||||
fileBuffer = await decodeHeic(fileBuffer);
|
||||
}
|
||||
|
||||
request.log.info(
|
||||
{
|
||||
toolId: "blur-faces",
|
||||
@@ -76,7 +82,6 @@ export function registerBlurFaces(app: FastifyInstance) {
|
||||
"Starting face blur",
|
||||
);
|
||||
|
||||
// Auto-orient to fix EXIF rotation before face detection
|
||||
fileBuffer = await autoOrient(fileBuffer);
|
||||
|
||||
const jobId = randomUUID();
|
||||
@@ -129,6 +134,9 @@ export function registerBlurFaces(app: FastifyInstance) {
|
||||
processedSize: result.buffer.length,
|
||||
facesDetected: result.facesDetected,
|
||||
faces: result.faces,
|
||||
...(result.facesDetected === 0 && {
|
||||
warning: "No faces detected in this image. Try increasing detection sensitivity.",
|
||||
}),
|
||||
});
|
||||
} catch (err) {
|
||||
request.log.error({ err, toolId: "blur-faces" }, "Face blur failed");
|
||||
@@ -149,7 +157,7 @@ export function registerBlurFaces(app: FastifyInstance) {
|
||||
}),
|
||||
process: async (inputBuffer, settings, filename) => {
|
||||
const s = settings as { blurRadius?: number; sensitivity?: number };
|
||||
const orientedBuffer = await autoOrient(inputBuffer);
|
||||
const orientedBuffer = await autoOrient(await ensureSharpCompat(inputBuffer));
|
||||
const jobId = randomUUID();
|
||||
const workspacePath = await createWorkspace(jobId);
|
||||
const result = await blurFaces(orientedBuffer, join(workspacePath, "output"), {
|
||||
|
||||
@@ -8,6 +8,7 @@ import { z } from "zod";
|
||||
import { autoOrient } from "../../lib/auto-orient.js";
|
||||
import { isToolInstalled } from "../../lib/feature-status.js";
|
||||
import { validateImageBuffer } from "../../lib/file-validation.js";
|
||||
import { decodeHeic, ensureSharpCompat } from "../../lib/heic-converter.js";
|
||||
import { createWorkspace } from "../../lib/workspace.js";
|
||||
import { updateSingleFileProgress } from "../progress.js";
|
||||
import { registerToolProcessFn } from "../tool-factory.js";
|
||||
@@ -68,6 +69,11 @@ export function registerRedEyeRemoval(app: FastifyInstance) {
|
||||
|
||||
try {
|
||||
const settings = settingsRaw ? JSON.parse(settingsRaw) : {};
|
||||
|
||||
if (validation.format === "heif") {
|
||||
fileBuffer = await decodeHeic(fileBuffer);
|
||||
}
|
||||
|
||||
request.log.info(
|
||||
{
|
||||
toolId: "red-eye-removal",
|
||||
@@ -78,7 +84,6 @@ export function registerRedEyeRemoval(app: FastifyInstance) {
|
||||
"Starting red eye removal",
|
||||
);
|
||||
|
||||
// Auto-orient to fix EXIF rotation before face detection
|
||||
fileBuffer = await autoOrient(fileBuffer);
|
||||
|
||||
const jobId = randomUUID();
|
||||
@@ -162,7 +167,7 @@ export function registerRedEyeRemoval(app: FastifyInstance) {
|
||||
format?: string;
|
||||
quality?: number;
|
||||
};
|
||||
const orientedBuffer = await autoOrient(inputBuffer);
|
||||
const orientedBuffer = await autoOrient(await ensureSharpCompat(inputBuffer));
|
||||
const jobId = randomUUID();
|
||||
const workspacePath = await createWorkspace(jobId);
|
||||
const result = await removeRedEye(orientedBuffer, join(workspacePath, "output"), {
|
||||
|
||||
@@ -75,7 +75,7 @@ export function BlurFacesControls({ settings: initialSettings, onChange }: BlurF
|
||||
/>
|
||||
<div className="flex justify-between text-[10px] text-muted-foreground mt-0.5">
|
||||
<span>More faces</span>
|
||||
<span>Fewer false positives</span>
|
||||
<span>Fewer faces</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -89,6 +89,7 @@ export function BlurFacesSettings() {
|
||||
processAllFiles,
|
||||
processing,
|
||||
error,
|
||||
warning,
|
||||
downloadUrl,
|
||||
originalSize,
|
||||
processedSize,
|
||||
@@ -110,9 +111,10 @@ export function BlurFacesSettings() {
|
||||
<div className="space-y-4">
|
||||
<BlurFacesControls onChange={setSettings} />
|
||||
|
||||
{/* Error */}
|
||||
{error && <p className="text-xs text-red-500">{error}</p>}
|
||||
|
||||
{warning && <p className="text-xs text-amber-600 dark:text-amber-400">{warning}</p>}
|
||||
|
||||
{/* Size info */}
|
||||
{originalSize != null && processedSize != null && (
|
||||
<div className="text-xs text-muted-foreground space-y-0.5">
|
||||
|
||||
@@ -11,6 +11,7 @@ interface ProcessResult {
|
||||
originalSize: number;
|
||||
processedSize: number;
|
||||
savedFileId?: string;
|
||||
warning?: string;
|
||||
}
|
||||
|
||||
export interface ToolProgress {
|
||||
@@ -39,6 +40,7 @@ export function useToolProcessor(toolId: string) {
|
||||
useFileStore();
|
||||
|
||||
const [progress, setProgress] = useState<ToolProgress>(IDLE_PROGRESS);
|
||||
const [warning, setWarning] = useState<string | null>(null);
|
||||
const elapsedRef = useRef<ReturnType<typeof setInterval> | null>(null);
|
||||
const xhrRef = useRef<XMLHttpRequest | null>(null);
|
||||
const eventSourceRef = useRef<EventSource | null>(null);
|
||||
@@ -69,6 +71,7 @@ export function useToolProcessor(toolId: string) {
|
||||
const capturedIndex = useFileStore.getState().selectedIndex;
|
||||
|
||||
setError(null);
|
||||
setWarning(null);
|
||||
// Mark the target entry as processing and clear any old result
|
||||
useFileStore.getState().updateEntry(capturedIndex, {
|
||||
processedUrl: null,
|
||||
@@ -216,6 +219,7 @@ export function useToolProcessor(toolId: string) {
|
||||
if (xhr.status >= 200 && xhr.status < 300) {
|
||||
try {
|
||||
const result: ProcessResult = JSON.parse(xhr.responseText);
|
||||
setWarning(result.warning ?? null);
|
||||
// Write result to the entry that was being processed (captured at
|
||||
// request time), not whatever entry happens to be selected now.
|
||||
useFileStore.getState().updateEntry(capturedIndex, {
|
||||
@@ -429,6 +433,7 @@ export function useToolProcessor(toolId: string) {
|
||||
processAllFiles,
|
||||
processing,
|
||||
error,
|
||||
warning,
|
||||
downloadUrl: processedUrl,
|
||||
originalSize,
|
||||
processedSize,
|
||||
|
||||
Reference in New Issue
Block a user