From 4bda54b5293d4b54e611840f79674623b8de378f Mon Sep 17 00:00:00 2001 From: dakerboul Date: Thu, 13 Mar 2025 10:02:49 +0100 Subject: [PATCH] =?UTF-8?q?Ajouter=20une=20fonction=20pour=20v=C3=A9rifier?= =?UTF-8?q?=20si=20la=20cam=C3=A9ra=20est=20occup=C3=A9e=20et=20mettre=20?= =?UTF-8?q?=C3=A0=20jour=20la=20gestion=20des=20fichiers=20vid=C3=A9o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- routes/cameraRoutes.js | 12 ++++++++++-- routes/videoRoutes.js | 2 +- src/video/videoManager.js | 4 ++-- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/routes/cameraRoutes.js b/routes/cameraRoutes.js index 9ff4836..4e22ff9 100644 --- a/routes/cameraRoutes.js +++ b/routes/cameraRoutes.js @@ -23,6 +23,10 @@ function writeCameraFile() { (cameraFile, JSON.stringify(data, null, 2), 'utf8'); } +function isCameraOccupied() { + return captureProjectID != -1; +} + writeCameraFile(); router.post('/procedure/start/', async (req, res) => { @@ -36,8 +40,12 @@ router.post('/procedure/start/', async (req, res) => { }); function startProcedure(projectId, interval) { - //vérifier qu'un projet n'est pas déjà en cours - if (captureProjectID != -1) { + // Vérifier si la caméra est occupée + // Vérifier cohérence des valeurs + // Interroger DB sur l'existence du projet + // Appliquer valeurs + // Changer le statut du projet dans la DB + if (isCameraOccupied()) { return { message: 'Caméra Occupée : Le projet ID ' + captureProjectID + ' est déjà en cours de capture.' }; } console.log('Démarrage de la procédure de capture'); diff --git a/routes/videoRoutes.js b/routes/videoRoutes.js index 9cc5302..d536282 100644 --- a/routes/videoRoutes.js +++ b/routes/videoRoutes.js @@ -164,7 +164,7 @@ router.post('/videos/render/:video_id', async (req, res) => { const videoFile = await videoManager.createVideoWithList(project_id, pathList, duration, videoId); console.log('Video file:', videoFile); - await videoManager.updateVideoFile(videoId, videoFile); + const update = await videoManager.updateVideoFile(videoId, videoFile); console.log('Video rendering complete'); } catch (err) { diff --git a/src/video/videoManager.js b/src/video/videoManager.js index 520a590..e4b1d3b 100644 --- a/src/video/videoManager.js +++ b/src/video/videoManager.js @@ -134,9 +134,9 @@ async function createVideo(projectId) { } } -async function updateVideoFile(videoId, path) { +async function updateVideoFile(videoId, video_file) { const query = 'UPDATE public.videos SET video_file = $2 WHERE id = $1 RETURNING *'; - const values = [videoId, path]; + const values = [videoId, video_file]; const res = await db.query(query, values); console.log('Video updated:', res.rows[0]); return res.rows[0];