From f56c35c5f9dde64a5ed34b8ae4c5f30ca3d46f8e Mon Sep 17 00:00:00 2001 From: Kerboul Date: Tue, 11 Feb 2025 19:26:42 +0100 Subject: [PATCH] =?UTF-8?q?Migration=20de=20la=20fonction=20de=20cr=C3=A9a?= =?UTF-8?q?tion=20de=20vid=C3=A9o=20vers=20un=20nouveau=20module=20et=20su?= =?UTF-8?q?ppression=20de=20l'ancienne=20impl=C3=A9mentation?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db.js | 2 +- routes/videoRoutes.js | 1 + src/video/videoManager.js | 46 +++++++++++++++++++++++++++++++++++++++ test/tester.js | 8 +++++++ utils/video.js | 31 -------------------------- 5 files changed, 56 insertions(+), 32 deletions(-) create mode 100644 src/video/videoManager.js delete mode 100644 utils/video.js diff --git a/db.js b/db.js index 04bfb08..e1c46a7 100644 --- a/db.js +++ b/db.js @@ -1,6 +1,6 @@ const { Client } = require('pg'); -const local = false; +const local = true; // Connexion à la base de données PostgreSQL const client = new Client({ host: local ? 'mikoshi' : '172.30.0.2', diff --git a/routes/videoRoutes.js b/routes/videoRoutes.js index ceaa597..406dbc6 100644 --- a/routes/videoRoutes.js +++ b/routes/videoRoutes.js @@ -2,6 +2,7 @@ const express = require('express'); const router = express.Router(); const db = require('../db'); const serverError = require('../utils/serverError'); +const videoManager = require('../src/video/videoManager'); /** * @swagger diff --git a/src/video/videoManager.js b/src/video/videoManager.js new file mode 100644 index 0000000..91cd598 --- /dev/null +++ b/src/video/videoManager.js @@ -0,0 +1,46 @@ +const fs = require('fs'); +const path = require('path'); +const { execSync } = require('child_process'); +const serverError = require('../../utils/serverError'); +const db = require('../../db'); +const storageManager = require('../data/storageManager'); +const PROJECTS_DIR = path.join('.'); + +async function createVideo(projectId) { + const tempFile = path.join('temp.txt'); + try { + // trouver tous les fichiers image pour le projet donné + const workdir = path.join(PROJECTS_DIR, 'storage', `${projectId}`); + const dir = path.join(PROJECTS_DIR, 'storage', `${projectId}`, 'images'); + console.log('dir:', dir); + const images = storageManager.scanAllImages(dir); + console.log('images:', images); + + // Créer un fichier temporaire pour la liste des images + const tempFile = path.join('temp.txt'); + fs.writeFileSync(tempFile, images.map(image => `file '${image}'`).join('\n')); + + const frameRate = 10; + const outputVideo = path.join(workdir, 'video.mp4'); + + // Commande ffmpeg pour créer la vidéo + const ffmpegCommand = `ffmpeg -r ${frameRate} -f concat -safe 0 -i ${tempFile} -vsync vfr -pix_fmt yuv420p ${outputVideo}`; + console.log('Running ffmpeg command:', ffmpegCommand); + execSync(ffmpegCommand); + console.log('Video created successfully:', outputVideo); + } catch (error) { + console.error('Error creating video:', error); + serverError(error); + } finally { + // Supprimer le fichier temporaire + if (fs.existsSync(tempFile)) { + fs.unlinkSync(tempFile); + console.log('Temporary file deleted:', tempFile); + } + } +} +// Commande ffmpeg pour créer la vidéo + //const ffmpegCommand = `ffmpeg -r ${frameRate} -f concat -safe 0 -i ${tempFile} -vsync vfr -pix_fmt yuv420p ${outputVideo}`; + //execSync(ffmpegCommand); + +module.exports = { createVideo }; diff --git a/test/tester.js b/test/tester.js index 87f286c..597853a 100644 --- a/test/tester.js +++ b/test/tester.js @@ -1,4 +1,5 @@ const storageManager = require('../src/data/storageManager'); +const videoManager = require('../src/video/videoManager'); const path = require('path'); console.log('Testing database functions...'); @@ -16,4 +17,11 @@ function getSmileImage() { return path.join(__dirname, '../sample/smile.png'); } +//test de lancement d'une création de vidéo sur le projet 1 +videoManager.createVideo(1).then(res => { + console.log('3 - Video created:', res); +}).catch(err => { + console.error('Error creating video:', err); +}); + exports.getSmileImage = getSmileImage; \ No newline at end of file diff --git a/utils/video.js b/utils/video.js deleted file mode 100644 index 168aaea..0000000 --- a/utils/video.js +++ /dev/null @@ -1,31 +0,0 @@ -const fs = require('fs'); -const path = require('path'); -const { execSync } = require('child_process'); -const serverError = require('../utils/serverError'); - -async function createVideo(projectId) { - const imageDir = `/storage/${projectId}`; - const outputVideo = `/storage/videos/output_${projectId}_video.mp4`; - const frameRate = 24; - const tempFile = `/storage/${projectId}/temp_file.txt`; - - try { - const images = fs.readdirSync(imageDir).filter(file => file.endsWith('.jpg')); - if (images.length === 0) { - throw new Error('No images found for this project'); - } - - const tempFileContent = images.map(img => `file '${path.join(imageDir, img)}'`).join('\n'); - fs.writeFileSync(tempFile, tempFileContent); - - const ffmpegCommand = `ffmpeg -r ${frameRate} -f concat -safe 0 -i ${tempFile} -vsync vfr -pix_fmt yuv420p ${outputVideo}`; - execSync(ffmpegCommand); - - fs.unlinkSync(tempFile); - return { message: 'Video created successfully', videoPath: outputVideo }; - } catch (error) { - throw new Error(`Error creating video: ${error.message}`); - } -} - -module.exports = { createVideo }; \ No newline at end of file