admin/Rezepte
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bilder von Hand sortieren

Browse Source
This commit is contained in:
Reinhard X. Fürst
2025-09-25 19:09:58 +00:00
parent da9d08c149
commit 0bfb8b2074
16 changed files with 462 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

205
backend/dist/routes/images.js vendored
View File

@@ -1,11 +1,44 @@
"use strict";
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
var desc = Object.getOwnPropertyDescriptor(m, k);
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
desc = { enumerable: true, get: function() { return m[k]; } };
}
Object.defineProperty(o, k2, desc);
}) : (function(o, m, k, k2) {
if (k2 === undefined) k2 = k;
o[k2] = m[k];
}));
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
Object.defineProperty(o, "default", { enumerable: true, value: v });
}) : function(o, v) {
o["default"] = v;
});
var __importStar = (this && this.__importStar) || (function () {
var ownKeys = function(o) {
ownKeys = Object.getOwnPropertyNames || function (o) {
var ar = [];
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
return ar;
};
return ownKeys(o);
};
return function (mod) {
if (mod && mod.__esModule) return mod;
var result = {};
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
__setModuleDefault(result, mod);
return result;
};
})();
var __importDefault = (this && this.__importDefault) || function (mod) {
return (mod && mod.__esModule) ? mod : { "default": mod };
};
Object.defineProperty(exports, "__esModule", { value: true });
const express_1 = require("express");
const client_1 = require("@prisma/client");
const multer_1 = __importDefault(require("multer"));
const multer_1 = __importStar(require("multer"));
const path_1 = __importDefault(require("path"));
const fs_1 = __importDefault(require("fs"));
const config_1 = require("../config/config");
@@ -19,29 +52,68 @@ const getUploadsDir = (subPath) => {
: legacyUploadsDir;
return subPath ? path_1.default.join(baseDir, subPath) : baseDir;
};
const loadRecipe = async (req, res, next) => {
try {
const { recipeId } = req.params;
if (!recipeId || isNaN(Number(recipeId))) {
return res.status(400).json({ success: false, message: 'Valid recipeId is required' });
}
const recipe = await prisma.recipe.findUnique({ where: { id: Number(recipeId) } });
if (!recipe) {
return res.status(404).json({ success: false, message: 'Recipe not found' });
}
req.recipeNumber = recipe.recipeNumber;
res.locals.recipe = recipe;
next();
}
catch (err) {
next(err);
}
};
const mimeExt = {
'image/jpeg': 'jpg',
'image/jpg': 'jpg',
'image/png': 'png',
'image/webp': 'webp'
};
const storage = multer_1.default.diskStorage({
destination: (req, file, cb) => {
const recipeNumber = req.body.recipeNumber || req.params.recipeNumber;
const recipeNumber = req.recipeNumber || req.body.recipeNumber || req.params.recipeNumber;
if (!recipeNumber) {
return cb(new Error('Recipe number is required'), '');
}
const uploadDir = getUploadsDir(recipeNumber);
if (!fs_1.default.existsSync(uploadDir)) {
fs_1.default.mkdirSync(uploadDir, { recursive: true });
try {
if (!fs_1.default.existsSync(uploadDir)) {
fs_1.default.mkdirSync(uploadDir, { recursive: true });
}
}
catch (e) {
return cb(new Error('Failed to prepare upload directory'), '');
}
cb(null, uploadDir);
},
filename: (req, file, cb) => {
const recipeNumber = req.body.recipeNumber || req.params.recipeNumber;
const recipeNumber = req.recipeNumber || req.body.recipeNumber || req.params.recipeNumber;
if (!recipeNumber) {
return cb(new Error('Recipe number is required'), '');
}
const uploadDir = getUploadsDir(recipeNumber);
const existingFiles = fs_1.default.existsSync(uploadDir)
? fs_1.default.readdirSync(uploadDir).filter(f => f.match(new RegExp(`^${recipeNumber}_\\d+\\.jpg$`)))
? fs_1.default.readdirSync(uploadDir).filter(f => f.startsWith(`${recipeNumber}_`))
: [];
const nextIndex = existingFiles.length;
const filename = `${recipeNumber}_${nextIndex}.jpg`;
let maxIndex = -1;
existingFiles.forEach(f => {
const m = f.match(new RegExp(`^${recipeNumber}_(\\d+)`));
if (m && m[1] !== undefined) {
const idx = parseInt(m[1], 10);
if (!Number.isNaN(idx) && idx > maxIndex)
maxIndex = idx;
}
});
const nextIndex = maxIndex + 1;
const ext = mimeExt[file.mimetype] || 'jpg';
const filename = `${recipeNumber}_${nextIndex}.${ext}`;
cb(null, filename);
}
});
@@ -60,41 +132,31 @@ const upload = (0, multer_1.default)({
}
},
});
router.post('/upload/:recipeId', upload.array('images', 10), async (req, res, next) => {
router.post('/upload/:recipeId', loadRecipe, (req, res, next) => {
const mw = upload.array('images', 10);
mw(req, res, function (err) {
if (err) {
if (err instanceof multer_1.MulterError) {
return res.status(400).json({ success: false, message: `Upload error: ${err.message}` });
}
return res.status(400).json({ success: false, message: err.message || 'Upload failed' });
}
next();
});
}, async (req, res, next) => {
try {
const { recipeId } = req.params;
const files = req.files;
if (!recipeId) {
return res.status(400).json({
success: false,
message: 'Recipe ID is required',
});
}
const recipe = res.locals.recipe;
if (!files || files.length === 0) {
return res.status(400).json({
success: false,
message: 'No files uploaded',
});
return res.status(400).json({ success: false, message: 'No files uploaded' });
}
const recipe = await prisma.recipe.findUnique({
where: { id: parseInt(recipeId) }
});
if (!recipe) {
return res.status(404).json({
success: false,
message: 'Recipe not found',
});
}
const imagePromises = files.map(file => {
const images = await Promise.all(files.map(file => {
const relativePath = `uploads/${recipe.recipeNumber}/${file.filename}`;
return prisma.recipeImage.create({
data: {
recipeId: parseInt(recipeId),
filePath: relativePath,
}
data: { recipeId: Number(recipeId), filePath: relativePath }
});
});
const images = await Promise.all(imagePromises);
}));
return res.status(201).json({
success: true,
data: images,
@@ -104,11 +166,8 @@ router.post('/upload/:recipeId', upload.array('images', 10), async (req, res, ne
catch (error) {
if (req.files) {
const files = req.files;
files.forEach(file => {
if (fs_1.default.existsSync(file.path)) {
fs_1.default.unlinkSync(file.path);
}
});
files.forEach(file => { if (fs_1.default.existsSync(file.path))
fs_1.default.unlinkSync(file.path); });
}
next(error);
}
@@ -234,5 +293,71 @@ router.get('/:id', async (req, res, next) => {
next(error);
}
});
router.post('/reorder/:recipeId', async (req, res, next) => {
try {
const { recipeId } = req.params;
const { order } = req.body;
if (!recipeId || isNaN(Number(recipeId))) {
return res.status(400).json({ success: false, message: 'Valid recipeId required' });
}
if (!Array.isArray(order) || order.length === 0) {
return res.status(400).json({ success: false, message: 'order (non-empty array) required' });
}
const rid = Number(recipeId);
const recipe = await prisma.recipe.findUnique({ where: { id: rid } });
if (!recipe)
return res.status(404).json({ success: false, message: 'Recipe not found' });
const images = await prisma.recipeImage.findMany({ where: { recipeId: rid }, orderBy: { id: 'asc' } });
if (images.length === 0)
return res.status(400).json({ success: false, message: 'No images to reorder' });
const existingIds = images.map(i => i.id).sort((a, b) => a - b);
const provided = [...order].sort((a, b) => a - b);
if (existingIds.length !== provided.length || !existingIds.every((v, i) => v === provided[i])) {
return res.status(400).json({ success: false, message: 'order must contain all image IDs exactly once' });
}
const recipeNumber = recipe.recipeNumber;
const baseDir = getUploadsDir(recipeNumber);
if (!fs_1.default.existsSync(baseDir)) {
return res.status(500).json({ success: false, message: 'Upload directory missing on server' });
}
const idToImage = new Map(images.map(i => [i.id, i]));
const newSequence = order.map((id, idx) => ({ idx, image: idToImage.get(id) }));
const tempRenames = [];
for (const { idx, image } of newSequence) {
const fileName = image.filePath.split('/').pop() || '';
const extMatch = fileName.match(/\.(jpg|jpeg|png|webp)$/i);
const ext = extMatch && extMatch[1] ? extMatch[1].toLowerCase() : 'jpg';
const finalName = `${recipeNumber}_${idx}.${ext === 'jpeg' ? 'jpg' : ext}`;
const oldFull = path_1.default.join(baseDir, path_1.default.basename(fileName));
const tempName = `${recipeNumber}__reorder_${idx}_${Date.now()}_${Math.random().toString(36).slice(2)}.${ext}`;
const tempFull = path_1.default.join(baseDir, tempName);
const finalFull = path_1.default.join(baseDir, finalName);
if (!fs_1.default.existsSync(oldFull)) {
return res.status(500).json({ success: false, message: `File missing on disk: ${fileName}` });
}
fs_1.default.renameSync(oldFull, tempFull);
tempRenames.push({ from: tempFull, to: finalFull, final: `uploads/${recipeNumber}/${finalName}`, idx, ext });
}
for (const r of tempRenames) {
fs_1.default.renameSync(r.from, r.to);
}
await Promise.all(newSequence.map(({ idx, image }) => {
const renameRecord = tempRenames.find(tr => tr.idx === idx);
return prisma.recipeImage.update({
where: { id: image.id },
data: { filePath: renameRecord.final }
});
}));
const updated = await prisma.recipeImage.findMany({ where: { recipeId: rid }, orderBy: { id: 'asc' } });
return res.json({
success: true,
message: 'Images reordered',
data: updated,
});
}
catch (error) {
next(error);
}
});
exports.default = router;
//# sourceMappingURL=images.js.map