@tricoteuses/senat 2.22.5 → 2.22.7

package/lib/src/videos/pipeline.js

@@ -6,7 +6,7 @@ import fs from "fs-extra";
 import fsp from "fs/promises";
 import path from "path";
 export async function processOneReunionMatch(args) {
-    const { agenda, baseDir, dataDir, session, options, writeIfChanged, lastByVideo, getAgendaSegmentTimecodes, buildSenatVodMasterM3u8FromNvs, } = args;
+    const { agenda, best, baseDir, dataDir, session, options, writeIfChanged, lastByVideo, getAgendaSegmentTimecodes, buildSenatVodMasterM3u8FromNvs, } = args;
     const reunionUid = agenda.uid;
     let dataTxt;
     let finalTxt;
@@ -67,7 +67,7 @@ export async function processOneReunionMatch(args) {
         console.warn(`[warn] invalid JSON in ${agendaJsonPath}`);
         return;
     }
-    const next = { ...obj, urlVideo: master, startTime: agenda.startTime };
+    const next = { ...obj, urlVideo: master, startTime: agenda.startTime, urlPageVideo: best?.pageUrl };
     if (timecodeDebutVideo != null) {
         next.timecodeDebutVideo = timecodeDebutVideo;
         if (timecodeFinVideo != null)
@@ -102,6 +102,7 @@ export async function processBisIfNeeded(args) {
     await downloadNvsForMatch(secondBest, baseDirBis);
     await processOneReunionMatch({
         agenda: agendaBis,
+        best: secondBest,
         baseDir: baseDirBis,
         dataDir: ctx.dataDir,
         session: ctx.session,

package/lib/utils/reunion_grouping.d.ts

@@ -1,7 +1,9 @@
 import { AgendaEvent, GroupedReunion, TimeSlot } from "../types/agenda";
+import { DossierLegislatifResult } from "../model/dosleg";
 type KnownType = "SP" | "COM" | "MC" | "OD" | "ID";
-export declare function groupNonSPByTypeOrganeHour(events: AgendaEvent[]): Record<"IDC" | "IDM" | "IDO" | "IDI", GroupedReunion[]>;
-export declare function groupSeancePubliqueBySlot(events: AgendaEvent[]): Record<TimeSlot, GroupedReunion[]>;
+type DossierBySenatUrl = Record<string, DossierLegislatifResult>;
+export declare function groupNonSPByTypeOrganeHour(events: AgendaEvent[], DossierBySenatUrl: DossierBySenatUrl): Record<"IDC" | "IDM" | "IDO" | "IDI", GroupedReunion[]>;
+export declare function groupSeancePubliqueBySlot(events: AgendaEvent[], dossierBySenatUrl: DossierBySenatUrl): Record<TimeSlot, GroupedReunion[]>;
 export declare function makeTypeGroupUid(dateISO: string, kind: KnownType, agendaEventId: string, organe?: string | null): string;
 export declare function makeGroupUid(date: string, slot: TimeSlot): string;
 export declare function formatYYYYMMDD(dateYYYYMMDD: string): string;

package/lib/utils/reunion_grouping.js

@@ -1,5 +1,6 @@
 import { DateTime } from "luxon";
 import { norm } from "../model/util";
+import { buildOdj } from "./reunion_odj_building";
 const PARIS = "Europe/Paris";
 const STOPWORDS = new Set([
     "de",
@@ -21,7 +22,7 @@ const STOPWORDS = new Set([
     "a",
     "aux",
 ]);
-export function groupNonSPByTypeOrganeHour(events) {
+export function groupNonSPByTypeOrganeHour(events, DossierBySenatUrl) {
     const out = { IDC: [], IDM: [], IDO: [], IDI: [] };
     if (!events?.length)
         return out;
@@ -49,6 +50,7 @@ export function groupNonSPByTypeOrganeHour(events) {
             titre: e.titre,
             objet: e.objet || "",
             events: [e],
+            odj: buildOdj([e], DossierBySenatUrl),
         };
         out[suffix].push(group);
     }
@@ -61,8 +63,7 @@ export function groupNonSPByTypeOrganeHour(events) {
     }
     return out;
 }
-export function groupSeancePubliqueBySlot(events) {
-    // Résultat à la manière de groupNonSPByTypeOrganeHour : objet de listes, ici indexé par créneau
+export function groupSeancePubliqueBySlot(events, dossierBySenatUrl) {
     const out = {};
     const ensureBucket = (slot) => (out[slot] ??= []);
     if (!events?.length)
@@ -70,7 +71,6 @@ export function groupSeancePubliqueBySlot(events) {
     const sp = events.filter((e) => isSeancePublique(e?.type));
     if (sp.length === 0)
         return out;
-    // Regroupement par date
     const byDate = new Map();
     for (const e of sp) {
         const d = norm(e.date);
@@ -124,6 +124,7 @@ export function groupSeancePubliqueBySlot(events) {
             }, null);
             const titres = sorted.map((x) => x.ev.titre || "").filter(Boolean);
             const captationVideo = sorted.some((x) => x.ev.captationVideo === true);
+            const eventsForSlot = sorted.map((x) => x.ev);
             ensureBucket(slot).push({
                 uid: makeGroupUid(date, slot),
                 chambre: "SN",
@@ -137,6 +138,7 @@ export function groupSeancePubliqueBySlot(events) {
                 titre: compactTitleList(titres, 5),
                 objet: joinObjets(sorted.map((x) => x.ev)),
                 events: sorted.map((x) => x.ev),
+                odj: buildOdj(eventsForSlot, dossierBySenatUrl),
             });
         }
     }
@@ -189,32 +191,6 @@ function typeToSuffixStrict(kind) {
             return "IDI";
     }
 }
-function hourShortFromISO(iso) {
-    if (!iso)
-        return null;
-    const dt = parseISO(iso);
-    if (!dt)
-        return null;
-    const z = DateTime.fromISO(iso, { zone: PARIS });
-    const H = String(z.hour);
-    const mm = String(z.minute).padStart(2, "0");
-    return `${H}${mm}`;
-}
-function hourShortFromOriginal(s) {
-    if (!s)
-        return null;
-    const clean = normalizeNoAccents(s).toLowerCase();
-    const m = clean.match(/(\d{1,2})\s*[h:]\s*(\d{2})/);
-    if (m) {
-        const H = String(parseInt(m[1], 10));
-        const mm = m[2].padStart(2, "0");
-        return `${H}${mm}`;
-    }
-    const m2 = clean.match(/(\d{1,2})\s*h\b/);
-    if (m2)
-        return `${parseInt(m2[1], 10)}00`;
-    return null;
-}
 function organeInitials(input, maxLen = 8) {
     if (!input)
         return "";

package/package.json

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

package/lib/aggregates.d.ts

@@ -1,52 +0,0 @@
-import { Ses, Sub, TxtAmeli } from "./types/ameli";
-import { Debat } from "./types/debats";
-import { Ass, Aud, Auteur, DateSeance, DecCoc, DenRap, DocAtt, Ecr, EtaLoi, LecAss, LecAssRap, Lecture, Loi, Org, OriTxt, Qua, Rap, Scr, Texte, TypAtt, TypLec, TypLoi, TypTxt, TypUrl } from "./types/dosleg";
-import { Question } from "./types/questions";
-export declare const allFollows: string[];
-export declare class Aggregator {
-    follow: Set<string>;
-    objectByIdByTableName: {
-        [name: string]: {
-            [id: string]: object;
-        };
-    };
-    requestedIdsByTableName: {
-        [name: string]: Set<string>;
-    };
-    visitedIdsByTableName: {
-        [name: string]: Set<string>;
-    };
-    constructor(follow: Set<string>);
-    addAss(ass: Ass): void;
-    addAud(aud: Aud): void;
-    addAuteur(auteur: Auteur): void;
-    addDateSeance(dateSeance: DateSeance): void;
-    addDebat(debat: Debat): void;
-    addDeccoc(deccoc: DecCoc): void;
-    addDenrap(denrap: DenRap): void;
-    addDocatt(docatt: DocAtt): void;
-    addEcr(ecr: Ecr): void;
-    addEtaloi(etaloi: EtaLoi): void;
-    addLecass(lecass: LecAss): void;
-    addLecassrap(lecassrap: LecAssRap): void;
-    addLecture(lecture: Lecture): void;
-    addLoi(loi: Loi): void;
-    addOrg(org: Org): void;
-    addOritxt(oritxt: OriTxt): void;
-    addQua(qua: Qua): void;
-    addQuestion(question: Question): void;
-    addRap(rap: Rap): void;
-    addScr(scr: Scr): void;
-    addSes(ses: Ses): void;
-    addSub(sub: Sub): void;
-    addTexte(texte: Texte): void;
-    addTxtAmeli(txtAmeli: TxtAmeli): void;
-    addTypatt(typatt: TypAtt): void;
-    addTyplec(typlec: TypLec): void;
-    addTyploi(typloi: TypLoi): void;
-    addTyptxt(typtxt: TypTxt): void;
-    addTypurl(typurl: TypUrl): void;
-    getAll(): Promise<void>;
-    request(tableName: string, id: string): void;
-    toJson(): any;
-}