testilo 3.1.2 → 3.1.3

package/digest.js

@@ -14,7 +14,7 @@ const fs = require('fs').promises;
 
 const reportDirScored = process.env.REPORTDIR_SCORED || 'reports/scored';
 const reportDirDigested = process.env.REPORTDIR_DIGESTED || 'reports/digested';
-const reportID = process.argv[2];
+const reportIDStart = process.argv[2];
 const digesterID = process.argv[3];
 
 // ########## FUNCTIONS
@@ -24,15 +24,23 @@ const replaceHolders = (content, query) => content
 .replace(/__([a-zA-Z]+)__/g, (ph, qp) => query[qp]);
 // Creates a digest.
 const digest = async () => {
-  const reportJSON = await fs.readFile(`${__dirname}/${reportDirScored}/${reportID}.json`, 'utf8');
-  const report = JSON.parse(reportJSON);
+  const reportDirScoredAbs = `${__dirname}/${reportDirScored}`;
+  const allReportFileNames = await fs.readdir(reportDirScoredAbs);
+  const sourceReportFileNames = allReportFileNames
+  .filter(fileName => fileName.startsWith(reportIDStart) && fileName.endsWith('.json'));
   const {makeQuery} = require(`${__dirname}/procs/digest/${digesterID}/index.js`);
-  const query = {};
-  makeQuery(report, query);
-  const template = await fs.readFile(`${__dirname}/procs/digest/${digesterID}/index.html`, 'utf8');
-  const digest = replaceHolders(template, query);
-  await fs.writeFile(`${__dirname}/${reportDirDigested}/${reportID}.html`, digest);
-  console.log(`Report ${reportID} digested and saved`);
+  for (const fileName of sourceReportFileNames) {
+    const reportJSON = await fs.readFile(`${reportDirScoredAbs}/${fileName}`, 'utf8');
+    const report = JSON.parse(reportJSON);
+    const query = {};
+    makeQuery(report, query);
+    const template = await fs
+    .readFile(`${__dirname}/procs/digest/${digesterID}/index.html`, 'utf8');
+    const digest = replaceHolders(template, query);
+    const fileNameBase = fileName.slice(0, -5);
+    await fs.writeFile(`${__dirname}/${reportDirDigested}/${fileNameBase}.html`, digest);
+    console.log(`Report ${fileNameBase} digested and saved`);
+  };
 };
 
 // ########## OPERATION

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testilo",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "description": "Client that scores and digests Testaro reports",
   "main": "index.js",
   "scripts": {

package/reports/scored/35k1r-railpass.json

@@ -8974,4 +8974,4 @@
       "zIndex": 33
     }
   }
-}
+}

package/score.js

@@ -14,20 +14,27 @@ const fs = require('fs').promises;
 
 const reportDirRaw = process.env.REPORTDIR_RAW || 'reports/raw';
 const reportDirScored = process.env.REPORTDIR_SCORED || 'reports/scored';
-const reportID = process.argv[2];
+const reportIDStart = process.argv[2];
 const scoreProcID = process.argv[3];
 
 // ########## FUNCTIONS
 
 const score = async () => {
-  const reportJSON = await fs.readFile(`${__dirname}/${reportDirRaw}/${reportID}.json`, 'utf8');
-  const report = JSON.parse(reportJSON);
+  const reportDirRawAbs = `${__dirname}/${reportDirRaw}`;
+  const allReportFileNames = await fs.readdir(reportDirRawAbs);
+  const sourceReportFileNames = allReportFileNames
+  .filter(fileName => fileName.startsWith(reportIDStart) && fileName.endsWith('.json'));
   const {scorer} = require(`./procs/score/${scoreProcID}`);
-  scorer(report);
-  report.score.scoreProcID = scoreProcID;
-  const scoredReportJSON = JSON.stringify(report, null, 2);
-  await fs.writeFile(`${__dirname}/${reportDirScored}/${reportID}.json`, scoredReportJSON);
-  console.log(`Report ${reportID} scored and saved`);
+  for (const fileName of sourceReportFileNames) {
+    const reportJSON = await fs
+    .readFile(`${reportDirRawAbs}/${fileName}`, 'utf8');
+    const report = JSON.parse(reportJSON);
+    scorer(report);
+    report.score.scoreProcID = scoreProcID;
+    const scoredReportJSON = JSON.stringify(report, null, 2);
+    await fs.writeFile(`${__dirname}/${reportDirScored}/${fileName}`, scoredReportJSON);
+    console.log(`Report ${fileName.slice(0, -5)} scored and saved`);
+  };
 };
 
 // ########## OPERATION