@tricoteuses/senat 2.3.1 → 2.4.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/lib/loaders.js
CHANGED
|
@@ -60,7 +60,7 @@ export function* iterLoadSenatDossiersLegislatifs(dataDir, session, options = {}
|
|
|
60
60
|
}
|
|
61
61
|
}
|
|
62
62
|
export function* iterLoadSenatDossiersLegislatifsRapportUrls(dataDir, session) {
|
|
63
|
-
let itemsDir = path.join(dataDir, RAPPORT_FOLDER);
|
|
63
|
+
let itemsDir = path.join(dataDir, RAPPORT_FOLDER, DATA_ORIGINAL_FOLDER);
|
|
64
64
|
if (session) {
|
|
65
65
|
itemsDir = path.join(itemsDir, session.toString());
|
|
66
66
|
}
|
|
@@ -177,11 +177,12 @@ async function retrieveTextes(dataDir, sessions) {
|
|
|
177
177
|
async function retrieveRapports(dataDir, sessions) {
|
|
178
178
|
const rapportsDir = path.join(dataDir, RAPPORT_FOLDER);
|
|
179
179
|
fs.ensureDirSync(rapportsDir);
|
|
180
|
+
const originalRapportsDir = path.join(rapportsDir, DATA_ORIGINAL_FOLDER);
|
|
180
181
|
let retrievedRapportsCount = 0;
|
|
181
182
|
const rapportUrlsNotFoundOrError = [];
|
|
182
183
|
for (const session of sessions) {
|
|
183
184
|
for (const { item: rapportMetadata, } of iterLoadSenatDossiersLegislatifsRapportUrls(dataDir, session)) {
|
|
184
|
-
const rapportDir = path.join(
|
|
185
|
+
const rapportDir = path.join(originalRapportsDir, `${rapportMetadata.session ?? UNDEFINED_SESSION}`, rapportMetadata.name);
|
|
185
186
|
fs.ensureDirSync(rapportDir);
|
|
186
187
|
if (isOptionEmptyOrHasValue(options["formats"], "html")) {
|
|
187
188
|
const rapportPath = path.join(rapportDir, `${rapportMetadata.name}.html`);
|