imgfloat/server
1
0
Fork 0
mirror of https://github.com/imgfloat/server.git synced 2026-02-05 19:49:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use ffmpeg

Browse Source
This commit is contained in:
Andreas Krühlmann
2026-01-22 21:53:36 +01:00
parent a8c4c97294
commit 10a7f5675d
14 changed files with 406 additions and 319 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/resources/static/js/admin/console.js
View File

@@ -2406,7 +2406,9 @@ export function createAdminConsole({
})
.then((response) => {
if (!response.ok) {
throw new Error("Upload failed");
return extractErrorMessage(response, "Upload failed").then((message) => {
throw new Error(message);
});
}
if (fileInput) {
fileInput.value = "";
@@ -2421,10 +2423,31 @@ export function createAdminConsole({
}
console.error(e);
removePendingUpload(pendingId);
showToast("Upload failed. Please try again with a supported file.", "error");
showToast(e?.message || "Upload failed. Please try again with a supported file.", "error");
});
}
function extractErrorMessage(response, fallback) {
if (!response) {
return Promise.resolve(fallback);
}
return response
.json()
.then((data) => {
if (data?.message) {
return data.message;
}
if (data?.error) {
return data.error;
}
if (typeof data === "string" && data.trim()) {
return data;
}
return fallback;
})
.catch(() => response.text().then((text) => text?.trim() || fallback).catch(() => fallback));
}
function getCanvasPoint(event) {
const rect = canvas.getBoundingClientRect();
const scaleX = canvas.width / rect.width;

33
src/main/resources/static/js/customAssets.js
View File

@@ -390,7 +390,7 @@ export function createCustomAssetModal({
}
})
.catch((e) => {
showToast?.("Unable to save custom asset. Please try again.", "error");
showToast?.(e?.message || "Unable to save custom asset. Please try again.", "error");
console.error(e);
})
.finally(() => {
@@ -498,7 +498,7 @@ export function createCustomAssetModal({
})
.catch((error) => {
console.error(error);
showToast?.("Unable to upload attachment. Please try again.", "error");
showToast?.(error?.message || "Unable to upload attachment. Please try again.", "error");
})
.finally(() => {
attachmentInput.value = "";
@@ -591,12 +591,35 @@ export function createCustomAssetModal({
body: payload,
}).then((response) => {
if (!response.ok) {
throw new Error("Failed to upload attachment");
return extractErrorMessage(response, "Failed to upload attachment").then((message) => {
throw new Error(message);
});
}
return response.json();
});
}
function extractErrorMessage(response, fallback) {
if (!response) {
return Promise.resolve(fallback);
}
return response
.json()
.then((data) => {
if (data?.message) {
return data.message;
}
if (data?.error) {
return data.error;
}
if (typeof data === "string" && data.trim()) {
return data;
}
return fallback;
})
.catch(() => response.text().then((text) => text?.trim() || fallback).catch(() => fallback));
}
function removeAttachment(attachmentId) {
if (!attachmentId || !currentAssetId) {
return;
@@ -694,7 +717,9 @@ export function createCustomAssetModal({
body: payload,
}).then((response) => {
if (!response.ok) {
throw new Error("Failed to upload logo");
return extractErrorMessage(response, "Failed to upload logo").then((message) => {
throw new Error(message);
});
}
pendingLogoFile = null;
return response.json();