@tricoteuses/senat 3.1.0 → 3.1.2

package/lib/src/utils/nvs-parsing.d.ts

@@ -8,7 +8,7 @@ export declare function pickBestLevel1ChapterForAgenda(chapters: L1Chapter[], ag
     chapter: L1Chapter;
     score: number;
 } | null;
-export declare function getAgendaSegmentTimecodes(dataNvs: string, finalPlayerNvs: string, agendaTitleOrObjet: string): {
+export declare function getAgendaSegmentTimecodes(dataNvs: string, finalPlayerNvs: string, agendaTitleOrObjet: string[]): {
     start: number;
     end: number | null;
     chapterId: string;

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

@@ -60,7 +60,15 @@ export function getAgendaSegmentTimecodes(dataNvs, finalPlayerNvs, agendaTitleOr
     const l1 = getLevel1Chapters(dataNvs);
     if (!l1.length)
         return null;
-    const best = pickBestLevel1ChapterForAgenda(l1, agendaTitleOrObjet);
+    const agendaCandidates = agendaTitleOrObjet;
+    let best = null;
+    for (const agendaCandidate of agendaCandidates) {
+        const candidateBest = pickBestLevel1ChapterForAgenda(l1, agendaCandidate);
+        if (!candidateBest)
+            continue;
+        if (!best || candidateBest.score > best.score)
+            best = candidateBest;
+    }
     if (!best)
         return null;
     const chapter = best.chapter;

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

@@ -17,7 +17,7 @@ export declare function processOneReunionMatch(args: {
         agendaJsonPath: string;
         start: number;
     }>;
-    getAgendaSegmentTimecodes: (dataNvs: string, finalNvs: string, agendaKey: string) => {
+    getAgendaSegmentTimecodes: (dataNvs: string, finalNvs: string, agendaKey: string[]) => {
         start: number;
         end: number | null;
     } | null;
@@ -40,13 +40,13 @@ export declare function processBisIfNeeded(args: {
         options: VideoPipelineOptions;
         writeIfChanged: (p: string, content: string) => Promise<void>;
         lastByVideo: Map<string, LastForVideo>;
-        getAgendaSegmentTimecodes: (dataNvs: string, finalNvs: string, agendaKey: string) => {
+        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) => {
+    getAgendaSegmentTimecodes: (dataNvs: string, finalNvs: string, agendaKey: string[]) => {
         start: number;
         end: number | null;
     } | null;

package/lib/src/videos/pipeline.js

@@ -34,8 +34,8 @@ export async function processOneReunionMatch(args) {
     }
     let timecodeDebutVideo = null;
     let timecodeFinVideo = null;
-    const agendaKey = agenda.titre || agenda.objet || "";
-    const seg = getAgendaSegmentTimecodes(dataTxt, finalTxt, agendaKey);
+    const agendaKeys = [agenda.objet ?? "", agenda.titre ?? ""];
+    const seg = getAgendaSegmentTimecodes(dataTxt, finalTxt, agendaKeys);
     if (seg) {
         timecodeDebutVideo = seg.start;
         timecodeFinVideo = null; // keep open by default

package/package.json

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

package/lib/add-js-extensions-v2.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/add-js-extensions-v2.js

@@ -1,23 +0,0 @@
-import { glob } from "glob";
-import fs from "fs";
-import path from "path";
-async function main() {
-    const files = await glob(["src/**/*.ts", "tests/**/*.ts"]);
-    for (const file of files) {
-        let content = fs.readFileSync(file, "utf8");
-        content = content.replace(/(from|import)\s+(["'])(\.\.?\/[^"']+)\2/g, (match, p1, p2, p3) => {
-            if (p3.endsWith(".js"))
-                return match;
-            const dir = path.dirname(file);
-            const targetPath = path.resolve(dir, p3);
-            if (fs.existsSync(targetPath) && fs.lstatSync(targetPath).isDirectory()) {
-                return `${p1} ${p2}${p3}/index.js${p2}`;
-            }
-            else {
-                return `${p1} ${p2}${p3}.js${p2}`;
-            }
-        });
-        fs.writeFileSync(file, content);
-    }
-}
-main();

package/lib/add-js-extensions.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/add-js-extensions.js

@@ -1,17 +0,0 @@
-import { glob } from "glob";
-import fs from "fs";
-async function main() {
-    const files = await glob("src/**/*.ts");
-    for (const file of files) {
-        let content = fs.readFileSync(file, "utf8");
-        // Matches: from "./foo" or import "./foo"
-        // Regex: (from|import) + (quote) + (relative_path) + (same_quote)
-        content = content.replace(/(from|import)\s+(["'])(\.\.?\/[^"']+)\2/g, (match, p1, p2, p3) => {
-            if (p3.endsWith(".js"))
-                return match;
-            return `${p1} ${p2}${p3}.js${p2}`;
-        });
-        fs.writeFileSync(file, content);
-    }
-}
-main();

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;
-}