@tricoteuses/senat 3.1.15 → 3.1.17

package/lib/src/scripts/retrieve_cr_commission.js

@@ -1,7 +1,7 @@
 import fs, { ensureDir } from "fs-extra";
 import path from "path";
 import * as cheerio from "cheerio";
-import { COMMISSION_FOLDER, DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER } from "../server/loaders.js";
+import { AGENDA_FOLDER, COMMISSION_FOLDER, DATA_ORIGINAL_FOLDER, DATA_TRANSFORMED_FOLDER } from "../server/loaders.js";
 import { loadAgendaForDate, parseCommissionMetadataFromHtml, linkCRtoCommissionGroup } from "../utils/cr_spliting.js";
 import { cleanTitle, extractDayH3Sections, parseCommissionCRSectionFromDom } from "../server/commission.js";
 import commandLineArgs from "command-line-args";
@@ -360,7 +360,9 @@ async function retrieveCommissionCRs(options = {}) {
         }
     }
     const debatsDir = path.join(dataDir, COMMISSION_FOLDER);
+    const agendaDir = path.join(dataDir, AGENDA_FOLDER);
     commitAndPushGit(debatsDir, options);
+    commitAndPushGit(agendaDir, options);
 }
 async function main() {
     assertExistingDirectory(options["dataDir"], "data directory");

package/lib/src/scripts/retrieve_cr_seance.js

@@ -206,7 +206,9 @@ export async function retrieveCriXmlDump(dataDir, options = {}) {
         }
     }
     const debatsDir = path.join(dataDir, COMPTES_RENDUS_FOLDER);
+    const agendaDir = path.join(dataDir, AGENDA_FOLDER);
     commitAndPushGit(debatsDir, options);
+    commitAndPushGit(agendaDir, options);
 }
 function commitAndPushGit(datasetDir, options) {
     if (options.commit) {

package/lib/src/scripts/retrieve_videos.js

@@ -168,8 +168,8 @@ async function processAll(dataDir, sessions) {
             }
         }
     }
-    const debatsDir = path.join(dataDir, AGENDA_FOLDER);
-    commitAndPushGit(debatsDir, options);
+    const agendaDir = path.join(dataDir, AGENDA_FOLDER);
+    commitAndPushGit(agendaDir, options);
 }
 function commitAndPushGit(datasetDir, options) {
     if (options.commit) {

package/lib/src/server/loaders.d.ts

@@ -44,7 +44,7 @@ export declare function loadSenatTexteContent(dataDir: string, session: number |
 export declare function loadSenatCompteRenduContent(dataDir: string, session: number, debatId: string | number): {
     item: CompteRendu | null;
 };
-export declare function iterLoadSenatAgendas(dataDir: string, session: number | undefined): Generator<IterItem<Reunion>>;
+export declare function iterLoadSenatAgendas(dataDir: string, session: number | undefined, options?: {}): Generator<IterItem<Reunion>>;
 export declare function iterLoadSenatCirconscriptions(dataDir: string, options?: {}): Generator<IterItem<CirconscriptionResult>>;
 export declare function iterLoadSenatOrganismes(dataDir: string, options?: {}): Generator<IterItem<OrganismeResult>>;
 export declare function iterLoadSenatSenateurs(dataDir: string, options?: {}): Generator<IterItem<SenateurResult>>;

package/lib/src/server/loaders.js

@@ -1,4 +1,3 @@
-import fsex from "fs-extra";
 import fs from "fs";
 import path from "path";
 import * as git from "./git.js";
@@ -207,30 +206,16 @@ export function loadSenatCompteRenduContent(dataDir, session, debatId) {
     const json = fs.readFileSync(fullPath, { encoding: "utf8" });
     return { item: JSON.parse(json) };
 }
-export function* iterLoadSenatAgendas(dataDir, session) {
-    const baseDir = path.join(dataDir, AGENDA_FOLDER, DATA_TRANSFORMED_FOLDER, String(session ?? ""));
-    if (!fs.existsSync(baseDir))
-        return;
-    const files = (fs.readdirSync(baseDir) || []).filter((f) => f.startsWith("RUSN") && f.endsWith(".json")).sort();
-    for (const fileName of files) {
-        const filePath = path.join(baseDir, fileName);
-        let raw;
-        try {
-            raw = fsex.readJSONSync(filePath);
-        }
-        catch {
-            continue; // JSON invalide
-        }
-        if (!raw || typeof raw !== "object")
-            continue;
-        const gr = raw;
+export function* iterLoadSenatAgendas(dataDir, session, options = {}) {
+    for (const reunionItem of iterLoadSenatItems(dataDir, AGENDA_FOLDER, session, DATA_TRANSFORMED_FOLDER, options)) {
+        const gr = reunionItem.item;
         if (!gr.uid || !gr.date || !gr.titre)
             continue;
-        const reunion = {
+        reunionItem.item = {
             ...gr,
             events: Array.isArray(gr.events) ? gr.events : [],
         };
-        yield { item: reunion };
+        yield reunionItem;
     }
 }
 export function* iterLoadSenatCirconscriptions(dataDir, options = {}) {

package/package.json

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