From 532d811511f0dbddc90c2e4e0f845341e2185a87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20P=2E?= Date: Thu, 12 Mar 2026 17:38:23 +0100 Subject: [PATCH] Minor changes --- controllers/canvas.mjs | 5 +++-- src/common.js | 10 ++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/controllers/canvas.mjs b/controllers/canvas.mjs index 2e33856..7101561 100644 --- a/controllers/canvas.mjs +++ b/controllers/canvas.mjs @@ -22,8 +22,9 @@ export default async function generateCanvas(manifestId, name) { console.log('Filename: ' + filename); - let label = name - .replace(/c(\w{1,2})0+(\d+).*(\.\w{2,3})?$/i, function (str, c, number) { + let label = name.replace( + /c(\w{1,2})0+(\d+).*(\.\w{2,3})?$/i, + function (str, c, number) { return `C${c}. ${number}`; }); // Add PCA to canvas label for HSI images diff --git a/src/common.js b/src/common.js index 0a891d0..1150eda 100644 --- a/src/common.js +++ b/src/common.js @@ -105,6 +105,8 @@ Common.getParamsFromFolders = async function() { * @returns {string[]} */ Common.getImageList = async function (manifestId) { + // Regex to exclude images with certain patterns in filename + const regexFilter = /(c2r|copertin.|camice|tit)/ig; let folderName = manifestId.replace(/pherc-(\d+)-(\w+)$/, function (_match, g1, g2) { return `PHerc_${g1}_${g2.toUpperCase()}`; }); @@ -115,7 +117,7 @@ Common.getImageList = async function (manifestId) { `${process.env.IMAGES_DIR}/${baseFolder}/${folderName}` ); - files = files.filter(file => !/(c2r|copertin.|camice|tit)/.test(file) && !file.startsWith('.')); + files = files.filter(file => !regexFilter.test(file) && !file.startsWith('.')); return files; } @@ -191,8 +193,9 @@ Common.createCanvas = async function (manifest, filename) { let canvasName = filename.split('_')[namePos[manifest.technique]] .replace(/\.\w{1,3}$/, ''); - let label = canvasName - .replace(/c(\w{1,2})0+(\d+).*(\.\w{2,3})?$/i, function (str, c, number) { + let label = canvasName.replace( + /c(\w{1,2})0+(\d+).*(\.\w{2,3})?$/i, + function (str, c, number) { return `C${c}. ${number}`; }); // Add PCA to canvas label for HSI images @@ -254,7 +257,6 @@ Common.populateCanvases = async function (manifest, images) { return manifest; } /** - * @todo Implement... * @param {Manifest} manifest The Manifest object * @param {string} imgFilename * @returns {ManifestMetadata}