Nettoyer le code en supprimant les importations inutilisées et en décommentant des fonctions pour améliorer la lisibilité.

This commit is contained in:
2025-04-03 09:02:34 +02:00
parent ed853ab0f7
commit a33e517a8a
16 changed files with 1091 additions and 56 deletions

2
api.js
View File

@@ -7,8 +7,6 @@ const videoRoutes = require('./routes/videoRoutes');
const imageRoutes = require('./routes/imageRoutes'); const imageRoutes = require('./routes/imageRoutes');
const cameraRoutes = require('./routes/cameraRoutes'); const cameraRoutes = require('./routes/cameraRoutes');
const uploadRoutes = require('./routes/uploadRoutes'); const uploadRoutes = require('./routes/uploadRoutes');
const fileWatcher = require('./src/data/filewatcher.js');
const ffmpeg = require('./ffmpeg.js');
router.use(cors({ router.use(cors({
origin: ['http://127.0.0.1:5500', 'http://localhost:5500', 'http://localhost:3000'], origin: ['http://127.0.0.1:5500', 'http://localhost:5500', 'http://localhost:3000'],

11
eslint.config.mjs Normal file
View File

@@ -0,0 +1,11 @@
import { defineConfig } from "eslint/config";
import globals from "globals";
import js from "@eslint/js";
export default defineConfig([
{ files: ["**/*.{js,mjs,cjs}"] },
{ files: ["**/*.js"], languageOptions: { sourceType: "commonjs" } },
{ files: ["**/*.{js,mjs,cjs}"], languageOptions: { globals: globals.browser } },
{ files: ["**/*.{js,mjs,cjs}"], plugins: { js }, extends: ["js/recommended"] },
]);

View File

@@ -1,9 +1,9 @@
const { exec } = require('child_process'); const { exec } = require('child_process');
exec('ffmpeg -version', (error, stdout, stderr) => { exec('ffmpeg -version', (error) => {
if (error) { if (error) {
console.log('FFmpeg is not installed. Installing FFmpeg...'); console.log('FFmpeg is not installed. Installing FFmpeg...');
exec('apt update && apt install -y ffmpeg', (installError, installStdout, installStderr) => { exec('apt update && apt install -y ffmpeg', (installError) => {
if (installError) { if (installError) {
console.error(`Error installing FFmpeg: ${installError}`); console.error(`Error installing FFmpeg: ${installError}`);
return; return;

1055
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -22,7 +22,10 @@
"swagger-ui-express": "^5.0.1" "swagger-ui-express": "^5.0.1"
}, },
"devDependencies": { "devDependencies": {
"@eslint/js": "^9.23.0",
"@types/cors": "^2.8.17", "@types/cors": "^2.8.17",
"eslint": "^9.23.0",
"globals": "^16.0.0",
"nodemon": "^3.1.7" "nodemon": "^3.1.7"
} }
} }

View File

@@ -1,8 +1,5 @@
const express = require('express'); const express = require('express');
const router = express.Router(); const router = express.Router();
const path = require('path');
const fs = require('fs');
const dbTester = require('../test/tester');
const db = require('../db'); const db = require('../db');
const serverError = require('../utils/serverError'); const serverError = require('../utils/serverError');
@@ -176,8 +173,8 @@ async function changeProjectStatus(projectId, status) {
} }
} }
await initCamera(); initCamera();
await printCameraStatus(); printCameraStatus();
/** /**
* @swagger * @swagger
@@ -232,8 +229,8 @@ async function setCameraSettings(interval, maintenance) {
console.error('Erreur lors de la mise à jour des paramètres de la caméra:', err); console.error('Erreur lors de la mise à jour des paramètres de la caméra:', err);
} else { } else {
console.log('Paramètres de la caméra mis à jour avec succès.'); console.log('Paramètres de la caméra mis à jour avec succès.');
captureInterval = interval; //captureInterval = interval;
maintenance = maintenance; //maintenance = maintenance;
} }
}); });
} catch (err) { } catch (err) {

View File

@@ -1,7 +1,6 @@
const express = require('express'); const express = require('express');
const router = express.Router(); const router = express.Router();
const sharp = require('sharp'); const sharp = require('sharp');
const path = require('path');
const fs = require('fs'); const fs = require('fs');
const dbTester = require('../test/tester'); const dbTester = require('../test/tester');
const db = require('../db'); const db = require('../db');

View File

@@ -62,7 +62,7 @@ router.delete('/measurements/:id', async (req, res) => {
return res.status(400).json({ error: 'Invalid measurement ID' }); return res.status(400).json({ error: 'Invalid measurement ID' });
} }
try { try {
const measurement = await measureManager.deleteMeasurement(measurementId); await measureManager.deleteMeasurement(measurementId);
res.status(200).json({ message: 'Measurement deleted successfully', id: measurementId }); res.status(200).json({ message: 'Measurement deleted successfully', id: measurementId });
} catch (error) { } catch (error) {
serverError.sendError('Error deleting measurement:', res, error, 500); serverError.sendError('Error deleting measurement:', res, error, 500);

View File

@@ -3,7 +3,6 @@ const router = express.Router();
const db = require('../db'); const db = require('../db');
const fs = require('fs'); const fs = require('fs');
const rangeParser = require('range-parser'); const rangeParser = require('range-parser');
const path = require('path');
const serverError = require('../utils/serverError'); const serverError = require('../utils/serverError');
const videoManager = require('../src/video/videoManager'); const videoManager = require('../src/video/videoManager');
const measureManager = require('../src/measure/measureManager'); const measureManager = require('../src/measure/measureManager');
@@ -228,15 +227,15 @@ router.get('/videos/progress/:video_id', async (req, res) => {
} }
}); });
function getStatusLabel(status) { // function getStatusLabel(status) {
const statusMap = { // const statusMap = {
0: 'En attente', // 0: 'En attente',
1: 'Terminé', // 1: 'Terminé',
2: 'Échec', // 2: 'Échec',
3: 'En cours' // 3: 'En cours'
}; // };
return statusMap[status] || 'Inconnu'; // return statusMap[status] || 'Inconnu';
} // }
router.get('/cat', (_, res) => { router.get('/cat', (_, res) => {

View File

@@ -1,7 +1,6 @@
// server.js // server.js
const express = require('express'); const express = require('express');
const cors = require('cors'); const cors = require('cors');
const sharp = require('sharp');
const app = express(); const app = express();
const port = 3000; const port = 3000;

View File

@@ -1,7 +1,6 @@
import db from '../../db.js'; const db = require('../../db.js');
import path from 'path'; const storageManager = require('../data/storageManager.js');
import storageManager from '../data/storageManager.js'; const fs = require('fs');
import fs from 'fs';
let localCounter = 0; let localCounter = 0;

View File

@@ -50,6 +50,7 @@ async function scanAllImages(dir = 'storage') {
} }
async function saveFile(filePath, content) { async function saveFile(filePath, content) {
let Buffer=Buffer.from(content, 'base64');
if (Buffer.isBuffer(content)) { if (Buffer.isBuffer(content)) {
await fs.writeFile(filePath, content); await fs.writeFile(filePath, content);
} else { } else {

View File

@@ -1,6 +1,6 @@
import db from '../../db.js'; const db = require('../../db.js');
import path from 'path'; const path = require('path');
import storageManager from '../data/storageManager.js'; const storageManager = require('../data/storageManager.js');
async function uploadMeasureImage(image, projectId, orderId) { async function uploadMeasureImage(image, projectId, orderId) {
try { try {
@@ -114,7 +114,7 @@ async function getPathList(IdList, projectId) {
} }
export { module.exports = {
uploadMeasureImage, uploadMeasureImage,
addMeasureToProject, addMeasureToProject,
getNextOrderId, getNextOrderId,
@@ -127,4 +127,4 @@ export {
updateMeasurementById, updateMeasurementById,
getPathFromIds, getPathFromIds,
getPathList getPathList
} };

View File

@@ -1,5 +1,5 @@
import storageManager from '../data/storageManager.js'; const storageManager = require('../data/storageManager.js');
import db from '../../db.js'; const db = require('../../db.js');
function createProjectDirectory(projectId) { function createProjectDirectory(projectId) {
const projectPath = `${projectId}`; const projectPath = `${projectId}`;
@@ -69,7 +69,7 @@ async function getMeasurementsByProjectId(projectId) {
return res.rows; return res.rows;
} }
export { module.exports = {
createProjectDirectory, createProjectDirectory,
deleteProjectDirectory, deleteProjectDirectory,
getAllProjects, getAllProjects,

View File

@@ -1,16 +1,10 @@
const fs = require('fs'); const fs = require('fs');
const path = require('path'); const path = require('path');
const { execSync } = require('child_process');
const { exec } = require('child_process');
const util = require('util');
const execPromise = util.promisify(exec);
const { spawn } = require('child_process'); const { spawn } = require('child_process');
let globalProgress = {};
const serverError = require('../../utils/serverError'); const serverError = require('../../utils/serverError');
const db = require('../../db'); const db = require('../../db');
const storageManager = require('../data/storageManager'); const storageManager = require('../data/storageManager');
const measureManager = require('../measure/measureManager');
const PROJECTS_DIR = path.join('.'); const PROJECTS_DIR = path.join('.');
@@ -31,9 +25,9 @@ async function deleteUnfinishedVideos() {
} }
} }
async function cleanVideoFiles() { // async function cleanVideoFiles() {
//supprimer les fichiers vidéos qui ne sont pas associés à une vidéo de la base de données // //supprimer les fichiers vidéos qui ne sont pas associés à une vidéo de la base de données
} // }
deleteUnfinishedVideos(); deleteUnfinishedVideos();

View File

@@ -1,5 +1,7 @@
const path = require('path'); const path = require('path');
const __dirname = path.resolve();
function getSmileImage() { function getSmileImage() {
return path.join(__dirname, '../sample/smile.png'); return path.join(__dirname, '../sample/smile.png');
} }