@tricoteuses/senat 2.21.2 → 2.21.4

package/lib/src/scripts/retrieve_videos.js

@@ -97,7 +97,7 @@ async function writeMatchArtifacts(args) {
     if (finalTxt)
         await fsp.writeFile(path.join(ctx.baseDir, "finalplayer.nvs"), finalTxt, "utf-8");
 }
-async function processGroupedReunion(agenda, session, dataDir) {
+async function processGroupedReunion(agenda, session, dataDir, lastByVideo) {
     // 1) GuardRails
     if (shouldSkipAgenda(agenda))
         return;
@@ -137,18 +137,30 @@ async function processGroupedReunion(agenda, session, dataDir) {
         session: ctx.session,
         options,
         writeIfChanged,
+        lastByVideo, // NEW
+        getAgendaSegmentTimecodes,
+        buildSenatVodMasterM3u8FromNvs,
+    });
+    await processBisIfNeeded({
+        agenda,
+        secondBest,
+        ctx,
+        skipDownload,
+        options,
+        lastByVideo,
+        writeIfChanged,
+        processOneReunionMatch,
         getAgendaSegmentTimecodes,
         buildSenatVodMasterM3u8FromNvs,
     });
-    // 4) Optional BIS
-    await processBisIfNeeded({ agenda, secondBest, ctx, skipDownload, options });
 }
 async function processAll(dataDir, sessions) {
     console.log("Process all Agendas and fetch video's url");
     for (const session of sessions) {
+        const lastByVideo = new Map();
         for (const { item: agenda } of iterLoadSenatAgendas(dataDir, session)) {
             try {
-                await processGroupedReunion(agenda, session, dataDir);
+                await processGroupedReunion(agenda, session, dataDir, lastByVideo);
             }
             catch (e) {
                 console.error(`[error] ${agenda?.uid ?? "unknown-uid"}:`, e?.message || e);

package/lib/src/utils/nvs-parsing.js

@@ -103,7 +103,7 @@ export function parseDataNvs(nvs) {
 }
 export 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);
+    const m = nvsText.match(/serverfiles:\/\/senat\/(\d{4})\/(\d{2})\/(encoder\d+)_([0-9]{13,14})(?:_[0-9]+)?\.mp4/i);
     if (!m)
         return null;
     const [, yyyy, mm, encoder, stamp] = m;

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

@@ -1,5 +1,5 @@
 import { Reunion } from "../types/agenda";
-import { BestMatch, MatchContext } from "./types";
+import { BestMatch, LastForVideo, MatchContext } from "./types";
 import { CommandLineOptions } from "command-line-args";
 export declare function processOneReunionMatch(args: {
     agenda: Reunion;
@@ -8,6 +8,11 @@ export declare function processOneReunionMatch(args: {
     session: number;
     options: Record<string, any>;
     writeIfChanged: (p: string, content: string) => Promise<void>;
+    lastByVideo: Map<string, {
+        agendaUid: string;
+        agendaJsonPath: string;
+        start: number;
+    }>;
     getAgendaSegmentTimecodes: (dataNvs: string, finalNvs: string, agendaKey: string) => {
         start: number;
         end: number | null;
@@ -20,5 +25,26 @@ export declare function processBisIfNeeded(args: {
     ctx: MatchContext;
     skipDownload: boolean;
     options: CommandLineOptions;
+    lastByVideo: Map<string, LastForVideo>;
+    writeIfChanged: (p: string, content: string) => Promise<void>;
+    processOneReunionMatch: (args: {
+        agenda: Reunion;
+        baseDir: string;
+        dataDir: string;
+        session: number;
+        options: Record<string, any>;
+        writeIfChanged: (p: string, content: string) => Promise<void>;
+        lastByVideo: Map<string, LastForVideo>;
+        getAgendaSegmentTimecodes: (dataNvs: string, finalNvs: string, agendaKey: string) => {
+            start: number;
+            end: number | null;
+        } | null;
+        buildSenatVodMasterM3u8FromNvs: (dataNvs: string) => string | null;
+    }) => Promise<void>;
+    getAgendaSegmentTimecodes: (dataNvs: string, finalNvs: string, agendaKey: string) => {
+        start: number;
+        end: number | null;
+    } | null;
+    buildSenatVodMasterM3u8FromNvs: (dataNvs: string) => string | null;
 }): Promise<void>;
 export declare function writeIfChanged(p: string, content: string): Promise<void>;

package/lib/src/videos/pipeline.js

@@ -5,9 +5,8 @@ import { fetchText } from "./search";
 import fs from "fs-extra";
 import fsp from "fs/promises";
 import path from "path";
-import { getAgendaSegmentTimecodes, buildSenatVodMasterM3u8FromNvs } from "../utils/nvs-parsing";
 export async function processOneReunionMatch(args) {
-    const { agenda, baseDir, dataDir, session, options, writeIfChanged, getAgendaSegmentTimecodes, buildSenatVodMasterM3u8FromNvs, } = args;
+    const { agenda, baseDir, dataDir, session, options, writeIfChanged, lastByVideo, getAgendaSegmentTimecodes, buildSenatVodMasterM3u8FromNvs, } = args;
     const reunionUid = agenda.uid;
     let dataTxt;
     let finalTxt;
@@ -25,18 +24,40 @@ export async function processOneReunionMatch(args) {
         return;
     }
     const agendaJsonPath = path.join(dataDir, AGENDA_FOLDER, DATA_TRANSFORMED_FOLDER, String(session), `${agenda.uid}.json`);
+    // Ensure it exists first.
+    if (!(await fs.pathExists(agendaJsonPath))) {
+        console.warn(`[warn] agenda file not found: ${agendaJsonPath}`);
+        return;
+    }
     let timecodeDebutVideo = null;
     let timecodeFinVideo = null;
     const agendaKey = agenda.titre || agenda.objet || "";
     const seg = getAgendaSegmentTimecodes(dataTxt, finalTxt, agendaKey);
     if (seg) {
         timecodeDebutVideo = seg.start;
-        timecodeFinVideo = seg.end;
+        timecodeFinVideo = null; // keep open by default
     }
-    if (!(await fs.pathExists(agendaJsonPath))) {
-        console.warn(`[warn] agenda file not found: ${agendaJsonPath}`);
-        return;
+    // 1) If we have a start timecode, close the previous agenda for this SAME master
+    if (timecodeDebutVideo != null) {
+        const prev = lastByVideo.get(master);
+        if (prev && prev.agendaJsonPath !== agendaJsonPath) {
+            // micro-safety: do not close with an earlier timecode
+            if (timecodeDebutVideo <= prev.start) {
+                console.warn(`[warn] timecode order inversion on same video: ` +
+                    `prev=${prev.agendaUid}(${prev.start}s) -> cur=${agenda.uid}(${timecodeDebutVideo}s). ` +
+                    `Skip closing prev to avoid negative segment.`);
+            }
+            else {
+                await patchAgendaTimecodeFin({
+                    agendaJsonPath: prev.agendaJsonPath,
+                    timecodeFinVideo: timecodeDebutVideo,
+                    writeIfChanged,
+                });
+            }
+        }
+        lastByVideo.set(master, { agendaUid: agenda.uid, agendaJsonPath, start: timecodeDebutVideo });
     }
+    // 2) Update current agenda JSON with urlVideo (+ start/end if any)
     const raw = await fsp.readFile(agendaJsonPath, "utf-8");
     let obj;
     try {
@@ -49,7 +70,10 @@ export async function processOneReunionMatch(args) {
     const next = { ...obj, urlVideo: master, startTime: agenda.startTime };
     if (timecodeDebutVideo != null) {
         next.timecodeDebutVideo = timecodeDebutVideo;
-        next.timecodeFinVideo = timecodeFinVideo ?? undefined;
+        if (timecodeFinVideo != null)
+            next.timecodeFinVideo = timecodeFinVideo;
+        else
+            delete next.timecodeFinVideo;
     }
     await writeIfChanged(agendaJsonPath, JSON.stringify(next, null, 2));
     if (!options["silent"]) {
@@ -58,7 +82,7 @@ export async function processOneReunionMatch(args) {
     }
 }
 export async function processBisIfNeeded(args) {
-    const { agenda, secondBest, ctx, skipDownload, options } = args;
+    const { agenda, secondBest, ctx, skipDownload, options, lastByVideo, writeIfChanged, processOneReunionMatch, getAgendaSegmentTimecodes, buildSenatVodMasterM3u8FromNvs, } = args;
     if (skipDownload)
         return;
     if (!secondBest)
@@ -83,6 +107,7 @@ export async function processBisIfNeeded(args) {
         session: ctx.session,
         options,
         writeIfChanged,
+        lastByVideo,
         getAgendaSegmentTimecodes,
         buildSenatVodMasterM3u8FromNvs,
     });
@@ -128,3 +153,19 @@ export async function writeIfChanged(p, content) {
     }
     await fsp.writeFile(p, content, "utf-8");
 }
+async function patchAgendaTimecodeFin(args) {
+    const { agendaJsonPath, timecodeFinVideo, writeIfChanged } = args;
+    if (!(await fs.pathExists(agendaJsonPath)))
+        return;
+    const raw = await fsp.readFile(agendaJsonPath, "utf-8");
+    let obj;
+    try {
+        obj = JSON.parse(raw);
+    }
+    catch {
+        console.warn(`[warn] invalid JSON in ${agendaJsonPath}`);
+        return;
+    }
+    const next = { ...obj, timecodeFinVideo };
+    await writeIfChanged(agendaJsonPath, JSON.stringify(next, null, 2));
+}

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

@@ -68,3 +68,8 @@ export type MatchContext = {
     reunionUid: string;
     agendaTs: number | null;
 };
+export type LastForVideo = {
+    agendaUid: string;
+    agendaJsonPath: string;
+    start: number;
+};

package/package.json

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