@tricoteuses/senat 2.20.17 → 2.20.19

package/lib/scripts/retrieve_videos.js

@@ -4,12 +4,14 @@ import commandLineArgs from "command-line-args";
 import fs from "fs-extra";
 import fsp from "fs/promises";
 import path from "path";
+import * as cheerio from "cheerio";
 import { AGENDA_FOLDER, DATA_TRANSFORMED_FOLDER, iterLoadSenatAgendas } from "../loaders";
 import { getSessionsFromStart } from "../types/sessions";
 import { commonOptions } from "./shared/cli_helpers";
-import { decodeHtmlEntities } from "../model/util";
-import { DateTime } from "luxon";
 import { getFirstInterventionStartTimecode } from "../utils/nvs-timecode";
+import { decodeHtmlEntities } from "../utils/string_cleaning";
+import { dice, normalize, scoreVideo } from "../utils/scoring";
+import { epochToParisDateTime, toFRDate, toTargetEpoch } from "../utils/date";
 // ===================== Constants =====================
 const MATCH_THRESHOLD = 0.5;
 const MAX_CANDIDATES = 15;
@@ -21,68 +23,6 @@ const SENAT_DATAS_ROOT = "https://videos.senat.fr/Datas/senat";
 const optionsDefinitions = [...commonOptions];
 const options = commandLineArgs(optionsDefinitions);
 // ===================== Utils =====================
-function normalize(s) {
-    return (s ?? "")
-        .toLowerCase()
-        .normalize("NFD")
-        .replace(/[\u0300-\u036f]/g, "")
-        .replace(/[^\p{L}\p{N}\s-]/gu, " ")
-        .replace(/\s+/g, " ")
-        .trim();
-}
-function tokens(s) {
-    return normalize(s).split(" ").filter(Boolean);
-}
-function dice(a, b) {
-    const A = new Set(tokens(a)), B = new Set(tokens(b));
-    if (!A.size || !B.size)
-        return 0;
-    let inter = 0;
-    for (const t of A)
-        if (B.has(t))
-            inter++;
-    return (2 * inter) / (A.size + B.size);
-}
-function epochToParisDateTime(epochSec) {
-    if (!Number.isFinite(epochSec))
-        return null;
-    const dUtc = new Date(epochSec * 1000);
-    // Offset heuristic (same logique que parisOffsetForDate)
-    const m = dUtc.getUTCMonth() + 1; // 1..12
-    const offsetHours = m >= 4 && m <= 10 ? 2 : 1;
-    const offsetStr = offsetHours === 2 ? "+02:00" : "+01:00";
-    // Applique l'offset pour obtenir la date/heure locales Paris
-    const localMs = dUtc.getTime() + offsetHours * 3600 * 1000;
-    const dl = new Date(localMs);
-    const yyyy = String(dl.getUTCFullYear());
-    const mm = String(dl.getUTCMonth() + 1).padStart(2, "0");
-    const dd = String(dl.getUTCDate()).padStart(2, "0");
-    const hh = String(dl.getUTCHours()).padStart(2, "0");
-    const mi = String(dl.getUTCMinutes()).padStart(2, "0");
-    const ss = String(dl.getUTCSeconds()).padStart(2, "0");
-    const ms = String(dl.getUTCMilliseconds()).padStart(3, "0");
-    return {
-        date: `${yyyy}-${mm}-${dd}`,
-        startTime: `${hh}:${mi}:${ss}.${ms}${offsetStr}`,
-    };
-}
-function toTargetEpoch(time, date) {
-    if (!time)
-        return null;
-    let dtLocal;
-    if (time.includes("T")) {
-        dtLocal = DateTime.fromISO(time, { zone: "Europe/Paris" });
-    }
-    else if (date) {
-        dtLocal = DateTime.fromISO(`${date}T${time}`, { zone: "Europe/Paris" });
-    }
-    else {
-        return null;
-    }
-    if (!dtLocal.isValid)
-        return null;
-    return Math.floor(dtLocal.toUTC().toSeconds());
-}
 async function fetchText(url) {
     const res = await fetch(url);
     if (!res.ok)
@@ -110,23 +50,23 @@ function queryString(obj) {
         .map(([k, v]) => `${encodeURIComponent(k)}=${encodeURIComponent(v)}`)
         .join("&");
 }
-function toFRDate(dateYYYYMMDD) {
-    const [y, m, d] = dateYYYYMMDD.split("-");
-    return `${d}/${m}/${y}`; // DD/MM/YYYY
-}
 function extractCandidatesFromSearchHtml(html) {
+    const $ = cheerio.load(html);
     const out = [];
-    const re = /href="\/?video\.(\d+)_([a-z0-9]+)\.[^"]+"/gi;
-    let m;
-    while ((m = re.exec(html))) {
-        const id = m[1], hash = m[2];
+    const re = /video\.(\d+)_([a-z0-9]+)/i;
+    $('h3.card-title a.stretched-link[href*="video."]').each((_, a) => {
+        const href = $(a).attr("href") || "";
+        const m = href.match(re);
+        if (!m)
+            return;
+        const id = m[1];
+        const hash = m[2];
         const pageUrl = `https://videos.senat.fr/video.${id}_${hash}.html`;
-        const ctx = html.slice(Math.max(0, m.index - 240), Math.min(html.length, m.index + 240));
-        const t = ctx.match(/title="([^"]+)"/i) || ctx.match(/>([^<]{10,200})</);
-        const title = t?.[1]?.trim();
+        const title = ($(a).attr("title") || $(a).text() || "").replace(/\s+/g, " ").trim() || undefined;
         const isSeancePublique = title?.toLowerCase().includes("séance publique") ?? false;
         out.push({ id, hash, pageUrl, title, isSeancePublique });
-    }
+    });
+    // dedupe
     const seen = new Set();
     return out.filter((c) => {
         const k = `${c.id}_${c.hash}`;
@@ -159,7 +99,7 @@ function parseDataNvs(nvs) {
     const firstChapterLabel = firstChapterLabelMatch ? decodeHtmlEntities(firstChapterLabelMatch[1]).trim() : undefined;
     return { epoch, organes, firstChapterLabel };
 }
-export function buildSenatVodMasterM3u8FromNvs(nvsText) {
+function buildSenatVodMasterM3u8FromNvs(nvsText) {
     // serverfiles://senat/2025/10/encoder10_20251022084451_2.mp4
     const m = nvsText.match(/serverfiles:\/\/senat\/(\d{4})\/(\d{2})\/(encoder\d+)_([0-9]{14})/i);
     if (!m)
@@ -168,21 +108,31 @@ export function buildSenatVodMasterM3u8FromNvs(nvsText) {
     const base = `https://vodsenat.akamaized.net/senat/${yyyy}/${mm}/${encoder}_${stamp}`;
     return `${base}.smil/master.m3u8`;
 }
-function score(agenda, agendaTs, sameOrg, videoTitle, videoEpoch, videoOrganes) {
-    const objetS = dice(agenda.objet || "", videoTitle || "");
-    const titleS = dice(agenda.titre || "", videoTitle || "");
-    const titleScore = Math.max(objetS, titleS);
-    let timeScore = 0;
-    if (agendaTs && videoEpoch) {
-        const deltaMin = Math.abs(videoEpoch - agendaTs) / 60;
-        timeScore = Math.exp(-deltaMin / 60);
-    }
-    let orgScore = 0;
-    if (agenda.organe && videoOrganes && videoOrganes.length) {
-        const agendaOrg = agenda.organe;
-        orgScore = Math.max(...videoOrganes.map((v) => dice(agendaOrg, v)));
+function isAmbiguousTimeOriginal(timeOriginal) {
+    if (!timeOriginal)
+        return false;
+    const s = timeOriginal.toLowerCase();
+    // Catches "14h", "14 h", "14h30", "14 h 30", "14 heures", "14 heure"
+    const timeRe = /\b([01]?\d|2[0-3])\s*(?:h|heures?|heure)\s*(?:([0-5]\d))?\b/g;
+    const times = new Set();
+    let m;
+    while ((m = timeRe.exec(s))) {
+        const hh = String(m[1]).padStart(2, "0");
+        const mm = m[2] ? String(m[2]).padStart(2, "0") : "00";
+        times.add(`${hh}:${mm}`);
     }
-    return 0.2 * titleScore + 0.4 * timeScore + (sameOrg ? 0.4 : orgScore * 0.4);
+    // "midi" / "minuit"
+    if (/\bmidi\b/.test(s))
+        times.add("12:00");
+    if (/\bminuit\b/.test(s))
+        times.add("00:00");
+    if (times.size >= 2)
+        return true;
+    const hasDayPeriod = /\b(matin|après-?midi|soir|nuit|journée|toute la journée)\b/.test(s);
+    const hasLinking = /,|\bet\b|\bou\b|\bpuis\b/.test(s);
+    if (times.size === 1 && hasDayPeriod && hasLinking)
+        return true;
+    return false;
 }
 function getAgendaType(agenda) {
     const o = agenda.organe || "";
@@ -310,6 +260,10 @@ async function processGroupedReunion(agenda, session, dataDir) {
         }
         // ==== 2) Enrich via data.nvs + scoring; pick best ====
         let best = null;
+        const timeAmbigious = isAmbiguousTimeOriginal(agenda.events[0].timeOriginal);
+        if (timeAmbigious) {
+            console.log(`[match] ${agenda.uid} timeOriginal ambiguous => ignoring time scoring: "${agenda.events[0].timeOriginal}"`);
+        }
         for (const c of candidates) {
             const dataUrl = `${SENAT_DATAS_ROOT}/${c.id}_${c.hash}/content/data.nvs`;
             const finalUrl = `${SENAT_DATAS_ROOT}/${c.id}_${c.hash}/content/finalplayer.nvs`;
@@ -346,7 +300,7 @@ async function processGroupedReunion(agenda, session, dataDir) {
             if (c.isSeancePublique && meta.firstChapterLabel) {
                 videoTitle = meta.firstChapterLabel;
             }
-            const s = score(agenda, agendaTs, sameOrg, videoTitle, meta.epoch, meta.organes);
+            const s = scoreVideo(agenda, agendaTs, sameOrg, videoTitle, meta.epoch, meta.organes, timeAmbigious);
             if (!best || s > best.score) {
                 best = {
                     id: c.id,

package/lib/scripts/shared/cli_helpers.d.ts

@@ -40,14 +40,31 @@ export declare const keepDirOption: {
     name: string;
     type: BooleanConstructor;
 };
-export declare const commonOptions: ({
+export declare const cloneOption: {
+    alias: string;
+    help: string;
+    name: string;
+    type: StringConstructor;
+};
+export declare const commitOption: {
+    help: string;
+    name: string;
+    type: BooleanConstructor;
+};
+export declare const remoteOption: {
     alias: string;
-    defaultValue: string[];
     help: string;
     multiple: boolean;
     name: string;
     type: StringConstructor;
-} | {
+};
+export declare const pullOption: {
+    alias: string;
+    help: string;
+    name: string;
+    type: BooleanConstructor;
+};
+export declare const commonOptions: ({
     defaultOption: boolean;
     help: string;
     name: string;
@@ -60,4 +77,9 @@ export declare const commonOptions: ({
     help: string;
     name: string;
     type: BooleanConstructor;
+} | {
+    alias: string;
+    help: string;
+    name: string;
+    type: StringConstructor;
 })[];

package/lib/scripts/shared/cli_helpers.js

@@ -40,6 +40,30 @@ export const keepDirOption = {
     name: "keepDir",
     type: Boolean,
 };
+export const cloneOption = {
+    alias: "C",
+    help: "clone repositories from given group (or organization) git URL",
+    name: "clone",
+    type: String,
+};
+export const commitOption = {
+    help: "commit clean files",
+    name: "commit",
+    type: Boolean,
+};
+export const remoteOption = {
+    alias: "r",
+    help: "push commit to given remote",
+    multiple: true,
+    name: "remote",
+    type: String,
+};
+export const pullOption = {
+    alias: "p",
+    help: "pull repositories before proceeding",
+    name: "pull",
+    type: Boolean,
+};
 export const commonOptions = [
     categoriesOption,
     dataDirDefaultOption,
@@ -48,4 +72,8 @@ export const commonOptions = [
     verboseOption,
     onlyRecentOption,
     keepDirOption,
+    cloneOption,
+    commitOption,
+    remoteOption,
+    pullOption,
 ];

package/lib/types/agenda.d.ts

@@ -14,11 +14,10 @@ export interface AgendaEvent {
     quantieme: string | null;
 }
 export type TimeSlot = "MATIN" | "APRES-MIDI" | "SOIR" | "UNKNOWN";
-export interface GroupedReunion {
+export interface Reunion {
     uid: string;
     chambre: "SN";
     date: string;
-    slot?: TimeSlot;
     startTime: string | null;
     endTime: string | null;
     captationVideo: boolean;
@@ -32,13 +31,13 @@ export interface GroupedReunion {
     transcriptionRef?: string;
     urlVideo?: string;
     timecodeDebutVideo?: number;
-    odj?: GroupedReunionOdj;
+    odj?: ReunionOdj;
 }
-export interface GroupedReunionOdjPoint {
+export interface ReunionOdjPoint {
     objet: string | null;
     dossierLegislatifRef: string | null;
     codeEtape: string | null;
 }
-export interface GroupedReunionOdj {
-    pointsOdj: GroupedReunionOdjPoint[];
+export interface ReunionOdj {
+    pointsOdj: ReunionOdjPoint[];
 }

package/lib/utils/cr_spliting.d.ts

@@ -1,11 +1,4 @@
-import { GroupedReunion, TimeSlot } from "../types/agenda";
-import * as cheerio from "cheerio";
-export declare function computeIntervalsBySlot($: cheerio.CheerioAPI, idx: Map<any, number>, firstSlotOfDay?: TimeSlot): {
-    slot: TimeSlot;
-    start: number;
-    end: number;
-}[];
-export declare function frDateToISO(s?: string): string | undefined;
+import { Reunion } from "../types/agenda";
 export declare function parseCommissionMetadataFromHtml(html: string, sourceFileName?: string): {
     sourceFile: string | null;
     organeTitleRaw: string | null;
@@ -18,8 +11,7 @@ export declare function parseCommissionMetadataFromHtml(html: string, sourceFile
         h2Index: number;
     }[];
 };
-export declare function loadAgendaForDate(dataDir: string, yyyymmdd: string, session: number): Promise<GroupedReunion[]>;
-export declare function hourShortToStartTime(hourShort: string | null): string | null;
+export declare function loadAgendaForDate(dataDir: string, yyyymmdd: string, session: number): Promise<Reunion[]>;
 export declare function linkCRtoCommissionGroup(opts: {
     dataDir: string;
     dateISO: string;

package/lib/utils/cr_spliting.js

@@ -3,76 +3,8 @@ import * as cheerio from "cheerio";
 import { AGENDA_FOLDER, DATA_TRANSFORMED_FOLDER } from "../loaders";
 import fs from "fs-extra";
 import { sessionStartYearFromDate } from "../model/seance";
-export function computeIntervalsBySlot($, idx, firstSlotOfDay) {
-    const all = $("body *").toArray();
-    const cuts = [{ pos: 0, hhmm: undefined }];
-    $("a[name]").each((_, a) => {
-        const name = (a.attribs?.["name"] || "").trim();
-        if (!/^su/i.test(name))
-            return;
-        const pos = idx.get(a);
-        if (pos == null)
-            return;
-        const hhmm = hhmmFromSuName(name); // "SU1620" -> "1620"
-        cuts.push({ pos, hhmm });
-    });
-    cuts.sort((a, b) => a.pos - b.pos);
-    cuts.push({ pos: all.length, hhmm: undefined });
-    let initialSlot = firstSlotOfDay;
-    if (!initialSlot) {
-        const openHHMM = extractOpeningHHMM($);
-        if (openHHMM)
-            initialSlot = slotOfHHMM(openHHMM);
-    }
-    if (!initialSlot)
-        initialSlot = "MATIN";
-    const intervals = [];
-    let lastSlot = initialSlot;
-    for (let i = 0; i + 1 < cuts.length; i++) {
-        const start = cuts[i].pos;
-        const end = cuts[i + 1].pos;
-        if (end <= start)
-            continue;
-        // i=0  initialSlot
-        // i>0 : if current cut has SU -> slotOfHHMM, otherwise lastSlot
-        const slot = i === 0 ? initialSlot : cuts[i].hhmm ? slotOfHHMM(cuts[i].hhmm) : lastSlot;
-        intervals.push({ slot, start, end });
-        lastSlot = slot;
-    }
-    return intervals;
-}
-function hhmmFromSuName(name) {
-    const m = name.match(/^SU(\d{2})(\d{2})$/i);
-    if (!m)
-        return;
-    return `${m[1]}:${m[2]}`;
-}
-function slotOfHHMM(hhmm) {
-    if (!hhmm)
-        return "MATIN";
-    const [h, m] = hhmm.split(":").map(Number);
-    const v = h + m / 60;
-    if (v < 12)
-        return "MATIN";
-    if (v < 18.5)
-        return "APRES-MIDI";
-    return "SOIR";
-}
-// Looks for text like "(La séance est ouverte à quinze heures.)" and extracts "HH:MM"
-function extractOpeningHHMM($) {
-    let txt = "";
-    $("span.info_entre_parentheses, .info_entre_parentheses").each((_, el) => {
-        const t = ($(el).text() || "").replace(/\s+/g, " ").trim();
-        if (!txt && /\bs[eé]ance est ouverte\b/i.test(t))
-            txt = t;
-    });
-    if (!txt)
-        return undefined;
-    const inner = txt.match(/\(.*?ouverte\s+à\s+([^)]+?)\)/i)?.[1];
-    if (!inner)
-        return undefined;
-    return parseFrenchClockToHHMM(inner);
-}
+import { frDateToISO, hourShortToStartTime } from "./date";
+import { normalizeSpaces } from "./string_cleaning";
 // Convert "quinze heures trente", "15 heures 30", "dix-sept heures moins le quart", etc. en "HHMM"
 function parseFrenchClockToHHMM(input) {
     const s = (input || "")
@@ -173,40 +105,6 @@ function parseFrenchClockToHHMM(input) {
     }
     return `${String(hour).padStart(2, "0")}${String(minutes).padStart(2, "0")}`;
 }
-export function frDateToISO(s) {
-    if (!s)
-        return;
-    const months = {
-        janvier: 1,
-        février: 2,
-        fevrier: 2,
-        mars: 3,
-        avril: 4,
-        mai: 5,
-        juin: 6,
-        juillet: 7,
-        août: 8,
-        aout: 8,
-        septembre: 9,
-        octobre: 10,
-        novembre: 11,
-        décembre: 12,
-        decembre: 12,
-    };
-    const cleaned = s
-        .trim()
-        .replace(/\u00A0/g, " ")
-        .replace(/ +/g, " ");
-    const m = cleaned.match(/^(\d{1,2})(?:er)?\s+([a-zéèêîïôûùç]+)\s+(\d{4})$/i);
-    if (!m)
-        return;
-    const d = String(parseInt(m[1], 10)).padStart(2, "0");
-    const mon = months[m[2].toLowerCase()];
-    if (!mon)
-        return;
-    const y = m[3];
-    return `${y}-${String(mon).padStart(2, "0")}-${d}`;
-}
 function extractWeekStartFromHead($) {
     const og = $('meta[property="og:title"]').attr("content") || $("title").text();
     const m = (og ?? "").toLowerCase().match(/semaine du\s+(\d{1,2}\s+\w+\s+\d{4})/i);
@@ -230,12 +128,6 @@ function detectOrganeFromTitle(s) {
     }
     return { organeTitleRaw: t, organeDetected };
 }
-function normalizeSpaces(s) {
-    return s
-        .replace(/\u00A0/g, " ")
-        .replace(/\s+/g, " ")
-        .trim();
-}
 function extractDaysAndOpenings($) {
     const days = [];
     const h2s = $("h2").toArray();
@@ -316,15 +208,6 @@ export async function loadAgendaForDate(dataDir, yyyymmdd, session) {
     }
     return out;
 }
-export function hourShortToStartTime(hourShort) {
-    if (!hourShort || hourShort === "NA")
-        return null;
-    if (!/^\d{4}$/.test(hourShort))
-        return null;
-    const hh = hourShort.slice(0, 2);
-    const mm = hourShort.slice(2, 4);
-    return `${hh}:${mm}`;
-}
 export async function linkCRtoCommissionGroup(opts) {
     const { dataDir, dateISO, organeDetected, hourShort, crUid, titreGuess, groupUid } = opts;
     const computedUid = crUid.replace(/^CRC/, "RU");

package/lib/utils/date.d.ts

@@ -0,0 +1,10 @@
+export declare function yyyymmddFromPath(xmlFilePath: string): string;
+export declare function parseYYYYMMDD(yyyymmdd: string): Date | null;
+export declare function frDateToISO(s?: string): string | undefined;
+export declare function hourShortToStartTime(hourShort: string | null): string | null;
+export declare function epochToParisDateTime(epochSec: number): {
+    date: string;
+    startTime: string;
+} | null;
+export declare function toTargetEpoch(time: string | null, date?: string | null): number | null;
+export declare function toFRDate(dateYYYYMMDD: string): string;

package/lib/utils/date.js

@@ -0,0 +1,100 @@
+import { DateTime } from "luxon";
+export function yyyymmddFromPath(xmlFilePath) {
+    return xmlFilePath.replace(/^.*?(\d{8}).*$/i, "$1");
+}
+export function parseYYYYMMDD(yyyymmdd) {
+    if (!/^\d{8}$/.test(yyyymmdd))
+        return null;
+    const y = Number(yyyymmdd.slice(0, 4));
+    const m = Number(yyyymmdd.slice(4, 6)) - 1;
+    const d = Number(yyyymmdd.slice(6, 8));
+    const dt = new Date(y, m, d);
+    return Number.isFinite(dt.getTime()) ? dt : null;
+}
+export function frDateToISO(s) {
+    if (!s)
+        return;
+    const months = {
+        janvier: 1,
+        février: 2,
+        fevrier: 2,
+        mars: 3,
+        avril: 4,
+        mai: 5,
+        juin: 6,
+        juillet: 7,
+        août: 8,
+        aout: 8,
+        septembre: 9,
+        octobre: 10,
+        novembre: 11,
+        décembre: 12,
+        decembre: 12,
+    };
+    const cleaned = s
+        .trim()
+        .replace(/\u00A0/g, " ")
+        .replace(/ +/g, " ");
+    const m = cleaned.match(/^(\d{1,2})(?:er)?\s+([a-zéèêîïôûùç]+)\s+(\d{4})$/i);
+    if (!m)
+        return;
+    const d = String(parseInt(m[1], 10)).padStart(2, "0");
+    const mon = months[m[2].toLowerCase()];
+    if (!mon)
+        return;
+    const y = m[3];
+    return `${y}-${String(mon).padStart(2, "0")}-${d}`;
+}
+export function hourShortToStartTime(hourShort) {
+    if (!hourShort || hourShort === "NA")
+        return null;
+    if (!/^\d{4}$/.test(hourShort))
+        return null;
+    const hh = hourShort.slice(0, 2);
+    const mm = hourShort.slice(2, 4);
+    return `${hh}:${mm}`;
+}
+export function epochToParisDateTime(epochSec) {
+    if (!Number.isFinite(epochSec))
+        return null;
+    const dUtc = new Date(epochSec * 1000);
+    // Offset heuristic (same logique que parisOffsetForDate)
+    const m = dUtc.getUTCMonth() + 1; // 1..12
+    const offsetHours = m >= 4 && m <= 10 ? 2 : 1;
+    const offsetStr = offsetHours === 2 ? "+02:00" : "+01:00";
+    // Applique l'offset pour obtenir la date/heure locales Paris
+    const localMs = dUtc.getTime() + offsetHours * 3600 * 1000;
+    const dl = new Date(localMs);
+    const yyyy = String(dl.getUTCFullYear());
+    const mm = String(dl.getUTCMonth() + 1).padStart(2, "0");
+    const dd = String(dl.getUTCDate()).padStart(2, "0");
+    const hh = String(dl.getUTCHours()).padStart(2, "0");
+    const mi = String(dl.getUTCMinutes()).padStart(2, "0");
+    const ss = String(dl.getUTCSeconds()).padStart(2, "0");
+    const ms = String(dl.getUTCMilliseconds()).padStart(3, "0");
+    return {
+        date: `${yyyy}-${mm}-${dd}`,
+        startTime: `${hh}:${mi}:${ss}.${ms}${offsetStr}`,
+    };
+}
+export function toTargetEpoch(time, date) {
+    if (!time)
+        return null;
+    let dtLocal;
+    if (time.includes("T")) {
+        dtLocal = DateTime.fromISO(time, { zone: "Europe/Paris" });
+    }
+    else if (date) {
+        dtLocal = DateTime.fromISO(`${date}T${time}`, { zone: "Europe/Paris" });
+    }
+    else {
+        return null;
+    }
+    if (!dtLocal.isValid)
+        return null;
+    return Math.floor(dtLocal.toUTC().toSeconds());
+}
+export function toFRDate(dateYYYYMMDD) {
+    const [y, m, d] = dateYYYYMMDD.split("-");
+    return `${d}/${m}/${y}`; // DD/MM/YYYY
+}

package/lib/utils/reunion_odj_building.d.ts

@@ -1,5 +1,5 @@
 import commandLineArgs from "command-line-args";
 import { DossierLegislatifResult } from "../model/dosleg";
-import { AgendaEvent, GroupedReunionOdj } from "../types/agenda";
-export declare function buildOdj(events: AgendaEvent[], dossierBySenatUrl: Record<string, DossierLegislatifResult>): GroupedReunionOdj | undefined;
+import { AgendaEvent, ReunionOdj } from "../types/agenda";
+export declare function buildOdj(events: AgendaEvent[], dossierBySenatUrl: Record<string, DossierLegislatifResult>): ReunionOdj | undefined;
 export declare function buildSenatDossierIndex(options: commandLineArgs.CommandLineOptions): Record<string, DossierLegislatifResult>;

package/lib/utils/reunion_odj_building.js

@@ -7,12 +7,8 @@ export function buildOdj(events, dossierBySenatUrl) {
     for (const ev of events) {
         const objetKey = (ev.objet ?? "").trim();
         const url = normalizeSenatUrl(ev.urlDossierSenat) ?? undefined;
-        if (url)
-            console.log(` urlDossierSenat: ${url}`);
         dossier = url ? dossierBySenatUrl[url] : null;
         const dossierUid = dossier ? pickDossierUid(dossier) : undefined;
-        if (url)
-            console.log(`  → matched dossier uid: ${dossierUid}`);
         codeEtape = dossier ? computeCodeEtape(ev, dossier) : null;
         // si on n’a ni objet ni dossier, ça ne sert à rien de créer un point
         if (!objetKey && !dossierUid)
@@ -94,36 +90,36 @@ function computeCodeEtape(ev, dossier) {
             return false;
         return true;
     });
-    console.log(`  → candidats STRICT (date==${evDate} & nature=${nature || "ANY"}): ${candidates.length}`);
-    candidates.forEach((c) => console.log(`    STRICT MATCH: ${c.codeActe} (date=${c.date}, lecture=${c.ordreLecture})`));
+    // console.log(`  → candidats STRICT (date==${evDate} & nature=${nature || "ANY"}): ${candidates.length}`)
+    // candidates.forEach((c) => console.log(`    STRICT MATCH: ${c.codeActe} (date=${c.date}, lecture=${c.ordreLecture})`))
     // Si lecture détectée → on filtre si ça garde des candidats
     if (lecture !== undefined && candidates.length > 0) {
         const withLecture = candidates.filter((c) => c.ordreLecture === lecture);
         if (withLecture.length > 0) {
-            console.log(`  → filtre lecture=${lecture} : ${withLecture.length} candidats`);
+            // console.log(`  → filtre lecture=${lecture} : ${withLecture.length} candidats`)
             candidates = withLecture;
         }
     }
     // Multiple candidates : we take the longest ?
     if (candidates.length > 0) {
         candidates.sort((a, b) => b.codeActe.length - a.codeActe.length);
-        console.log(`  ✔ match FINAL (intervalle) : ${candidates[0].codeActe}`);
+        // console.log(`  ✔ match FINAL (intervalle) : ${candidates[0].codeActe}`)
         return candidates[0].codeActe;
     }
     // 2) fallback COM : dernier acte COM avant la date
     if (nature === "COM") {
         let comActs = flat.filter((a) => a.codeActe.includes("COM") && a.date <= evDate);
-        console.log(`  → fallback COM: actes COM <= date : ${comActs.length}`);
+        // console.log(`  → fallback COM: actes COM <= date : ${comActs.length}`)
         if (lecture !== undefined) {
             const byLecture = comActs.filter((a) => a.ordreLecture === lecture);
             if (byLecture.length > 0) {
                 comActs = byLecture;
-                console.log(`  → filtrés lecture=${lecture}: ${comActs.length}`);
+                // console.log(`  → filtrés lecture=${lecture}: ${comActs.length}`)
             }
         }
         if (comActs.length > 0) {
             comActs.sort((a, b) => b.date.localeCompare(a.date) || b.codeActe.length - a.codeActe.length);
-            console.log(`  ✔ match FINAL (fallback COM): ${comActs[0].codeActe}`);
+            // console.log(`  ✔ match FINAL (fallback COM): ${comActs[0].codeActe}`)
             return comActs[0].codeActe;
         }
     }
@@ -133,7 +129,7 @@ function computeCodeEtape(ev, dossier) {
         const lectureNode = lectures.find((l) => l.ordre_lecture === lecture);
         const rootCode = lectureNode?.code_acte;
         if (rootCode && typeof rootCode === "string") {
-            console.log(`  ✔ FALLBACK LECTURE: ${rootCode}`);
+            // console.log(`  ✔ FALLBACK LECTURE: ${rootCode}`)
             return rootCode;
         }
     }