diff --git a/parse.js b/parse.js index 391f766..662c6ae 100644 --- a/parse.js +++ b/parse.js @@ -1,10 +1,8 @@ import { parse } from 'csv-parse'; import fs from 'node:fs'; -import zlib from 'zlib'; +import zlib from 'node:zlib'; import mysql from 'mysql2'; -import dotenv from 'dotenv'; - -dotenv.config(); +import './lib/dotenv.js'; if (process.argv.length != 3) { throw new Error('You should give a project dir'); @@ -43,8 +41,8 @@ const flushBatch = (batch) => { }; // quand quelques ligne de csv sont parsées on les assemble puis on genere le sql -parser.on('readable', function(){ - let record; +parser.on('readable', () =>{ + let record = null; const batch = []; while ((record = parser.read()) !== null) { @@ -60,10 +58,10 @@ parser.on('readable', function(){ flushBatch(batch); }); -parser.on('error', function(err){ +parser.on('error', (err) =>{ console.error(err.message); }); -parser.on('end', function(){ +parser.on('end', () =>{ connection.end(); }); diff --git a/sync.js b/sync.js index a5546cd..11accb7 100644 --- a/sync.js +++ b/sync.js @@ -88,7 +88,7 @@ async function importYear(connection, year, file) { if (!columns) { columns = Object.keys(record).map(col => `\`${col}\``); } - const values = Object.values(record).map(v => v === '' ? null : v); + const values = Object.values(record).map(v => (v === '' ? null : v)); batch.push(values); if (batch.length >= BATCH_SIZE) { await flush(); @@ -128,12 +128,10 @@ async function main() { const dbYears = await getYearsInDb(connection); console.log(`Années en base : ${dbYears.join(', ')}`); - let missing; + let missing = serverYears.filter(y => !dbYears.includes(y)); if (forceYear) { missing = [forceYear]; console.log(`Mode forcé : import de ${forceYear}`); - } else { - missing = serverYears.filter(y => !dbYears.includes(y)); } if (missing.length === 0) {