@tricoteuses/senat 2.11.4 → 2.11.5

package/lib/scripts/retrieve_cr_seance.js

@@ -9,9 +9,9 @@ import fs from "fs-extra";
 import path from "path";
 import StreamZip from "node-stream-zip";
 import * as cheerio from "cheerio";
-import { AGENDA_FOLDER, COMPTES_RENDUS_FOLDER, DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER, } from "../loaders";
+import { AGENDA_FOLDER, COMPTES_RENDUS_FOLDER, DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER } from "../loaders";
 import { commonOptions } from "./shared/cli_helpers";
-import { deriveTitreObjetFromSommaire, parseCompteRenduSlotFromFile, parseYYYYMMDD, sessionStartYearFromDate } from "../model/seance";
+import { deriveTitreObjetFromSommaire, parseCompteRenduSlotFromFile, parseYYYYMMDD, sessionStartYearFromDate, } from "../model/seance";
 import { makeGroupUid } from "../utils/reunion_grouping";
 import { getSessionsFromStart } from "../types/sessions";
 import { ensureAndClearDir, fetchWithRetry } from "./shared/util";
@@ -22,7 +22,7 @@ const optionsDefinitions = [
         help: "parse and convert comptes-rendus des débats into JSON",
         name: "parseDebats",
         type: Boolean,
-    }
+    },
 ];
 const options = commandLineArgs(optionsDefinitions);
 const CRI_ZIP_URL = "https://data.senat.fr/data/debats/cri.zip";
@@ -151,9 +151,7 @@ export async function retrieveCriXmlDump(dataDir, options = {}) {
         if (!(await fs.pathExists(originalSessionDir))) {
             continue;
         }
-        const xmlFiles = (await fs.readdir(originalSessionDir))
-            .filter((f) => /^d\d{8}\.xml$/i.test(f))
-            .sort();
+        const xmlFiles = (await fs.readdir(originalSessionDir)).filter((f) => /^d\d{8}\.xml$/i.test(f)).sort();
         const transformedSessionDir = path.join(transformedRoot, String(session));
         if (options["parseDebats"])
             await fs.ensureDir(transformedSessionDir);
@@ -224,31 +222,30 @@ main()
 async function linkCriSlotIntoAgendaGrouped(dataDir, yyyymmdd, slot, crUid, cr, session) {
     const groupedDir = path.join(dataDir, AGENDA_FOLDER, DATA_TRANSFORMED_FOLDER, session.toString());
     fs.ensureDirSync(groupedDir);
-    const groupedPath = path.join(groupedDir, 'RUSN' + yyyymmdd + 'IDS-' + slot + '.json');
-    let groups = [];
+    const groupedPath = path.join(groupedDir, `RUSN${yyyymmdd}IDS-${slot}.json`);
+    let group = null;
     if (fs.existsSync(groupedPath)) {
         try {
-            groups = JSON.parse(fs.readFileSync(groupedPath, "utf8"));
-            if (!Array.isArray(groups))
-                groups = [];
+            const parsed = JSON.parse(fs.readFileSync(groupedPath, "utf8"));
+            if (Array.isArray(parsed)) {
+                // Take correct slot if multiple or first one if no direct match ?
+                group = parsed.find((g) => g?.slot === slot) ?? parsed[0] ?? null;
+            }
+            else {
+                group = parsed;
+            }
         }
         catch (e) {
             console.warn(`[AGENDA] unreadable grouped JSON → ${groupedPath} (${e}) → recreating`);
-            groups = [];
+            group = null;
         }
     }
-    // find existing group with same slot
-    const sameSlot = groups.filter(g => g?.slot === slot);
-    let target = null;
-    if (sameSlot.length > 1) {
-        console.warn(`[AGENDA] multiple groups for ${yyyymmdd} ${slot} in ${groupedPath} → linking the first`);
-    }
-    target = sameSlot[0] ?? null;
     const dateISO = `${yyyymmdd.slice(0, 4)}-${yyyymmdd.slice(4, 6)}-${yyyymmdd.slice(6, 8)}`;
     const sommaire = cr?.metadonnees?.sommaire;
     const { titre: dTitre, objet: dObjet } = deriveTitreObjetFromSommaire(sommaire, slot);
-    if (!target) {
-        const newGroup = {
+    // Création si manquant
+    if (!group) {
+        group = {
             uid: makeGroupUid(dateISO, slot),
             chambre: "SN",
             date: dateISO,
@@ -262,13 +259,10 @@ async function linkCriSlotIntoAgendaGrouped(dataDir, yyyymmdd, slot, crUid, cr,
             events: [],
             compteRenduRefUid: crUid,
         };
-        groups.push(newGroup);
     }
     else {
-        target.compteRenduRefUid = crUid;
-    }
-    await fs.writeJSON(groupedPath, groups, { spaces: 2 });
-    if (!options["silent"]) {
-        console.log(`[AGENDA] Linked CR ${crUid} → ${path.basename(groupedPath)} [${slot}]`);
+        group.compteRenduRefUid = crUid;
     }
+    await fs.writeJSON(groupedPath, group, { spaces: 2 });
+    console.log(`[AGENDA] Linked CR ${crUid} → ${path.basename(groupedPath)} [${slot}]`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tricoteuses/senat",
-  "version": "2.11.4",
+  "version": "2.11.5",
   "description": "Handle French Sénat's open data",
   "keywords": [
     "France",