@tricoteuses/senat 2.22.6 → 2.22.8

package/lib/src/parsers/texte.js

@@ -7,6 +7,7 @@ function buildDivision(node, index) {
     const level = DivisionType[tag];
     const titleNode = node.querySelector("num");
     const subtitleNode = node.querySelector("heading");
+    const mention = node.getAttribute("data:mention") ?? null;
     const headings = [
         ...(titleNode
             ? [
@@ -25,6 +26,12 @@ function buildDivision(node, index) {
             ]
             : []),
     ];
+    if (mention?.includes("(nouveau)") && headings.length > 0) {
+        headings[0] = {
+            text: headings[0].text != null ? `${headings[0].text} (nouveau)` : "(nouveau)",
+            html: headings[0].html != null ? `${headings[0].html} (nouveau)` : "(nouveau)",
+        };
+    }
     const division = {
         index,
         eId,
@@ -65,6 +72,7 @@ function buildEmptyArticle(index) {
 function splitTexte(texteContentRoot) {
     const divisions = [];
     let divisionIndex = 0;
+    const mentionByEId = new Map();
     const iter = (node) => {
         if (node.nodeName === "content") {
             return;
@@ -79,9 +87,16 @@ function splitTexte(texteContentRoot) {
             case "section":
             case "subsection":
             case "paragraph":
-            case "article":
                 divisions.push(buildDivision(node, divisionIndex++));
                 break;
+            case "article": {
+                const division = buildDivision(node, divisionIndex++);
+                const mention = node.getAttribute("data:mention");
+                if (mention)
+                    mentionByEId.set(division.eId, mention);
+                divisions.push(division);
+                break;
+            }
         }
         if (node.nodeName === "alinea") {
             Array.from(node.childNodes)
@@ -104,6 +119,21 @@ function splitTexte(texteContentRoot) {
         }
     };
     iter(texteContentRoot);
+    for (const division of divisions) {
+        if (division.tag !== "article")
+            continue;
+        const article = division;
+        const mention = mentionByEId.get(division.eId);
+        if (mention?.includes("(Supprimé)") && article.alineas.length === 0) {
+            article.alineas.push({
+                eId: "",
+                heading: { text: null },
+                text: "(Supprimé)",
+                html: "(Supprimé)",
+                pastille: null,
+            });
+        }
+    }
     return divisions;
 }
 export function transformTexte(document) {

package/lib/src/scripts/retrieve_videos.js

@@ -132,6 +132,7 @@ async function processGroupedReunion(agenda, session, dataDir, lastByVideo) {
     // 3) Always update BEST agenda JSON from local NVS
     await processOneReunionMatch({
         agenda,
+        best,
         baseDir: ctx.baseDir,
         dataDir: ctx.dataDir,
         session: ctx.session,

package/lib/src/types/agenda.d.ts

@@ -30,6 +30,7 @@ export interface Reunion {
     compteRenduRefUid?: string;
     transcriptionRef?: string;
     urlVideo?: string;
+    urlPageVideo?: string;
     timecodeDebutVideo?: number;
     timecodeFinVideo?: number;
     odj?: ReunionOdj;

package/lib/src/videos/pipeline.d.ts

@@ -3,6 +3,7 @@ import { BestMatch, LastForVideo, MatchContext } from "./types";
 import { CommandLineOptions } from "command-line-args";
 export declare function processOneReunionMatch(args: {
     agenda: Reunion;
+    best: BestMatch | null;
     baseDir: string;
     dataDir: string;
     session: number;
@@ -29,6 +30,7 @@ export declare function processBisIfNeeded(args: {
     writeIfChanged: (p: string, content: string) => Promise<void>;
     processOneReunionMatch: (args: {
         agenda: Reunion;
+        best: BestMatch | null;
         baseDir: string;
         dataDir: string;
         session: number;

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/package.json

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