From b43d6d8374a8aacc7d12764f6caeb39279dad7c6 Mon Sep 17 00:00:00 2001 From: Luc Patiny Date: Fri, 5 Apr 2024 08:41:13 +0200 Subject: [PATCH] feat: use title to display spectrum name by default (#21) --- src/__tests__/createGeneralTOC.test.js | 2 +- src/__tests__/general/Group1/Data1/index.json | 3 +++ src/commands/toc/processGeneralFolder.js | 8 +++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/__tests__/createGeneralTOC.test.js b/src/__tests__/createGeneralTOC.test.js index 8c8182b..b68ee1d 100644 --- a/src/__tests__/createGeneralTOC.test.js +++ b/src/__tests__/createGeneralTOC.test.js @@ -17,5 +17,5 @@ test('createGeneralTOC', async () => { .map((file) => { return statSync(file).size; }); - expect(sizes).toStrictEqual([1221, 384, 566, 483, 250]); + expect(sizes).toStrictEqual([1221, 443, 566, 483, 250]); }); diff --git a/src/__tests__/general/Group1/Data1/index.json b/src/__tests__/general/Group1/Data1/index.json index b6697c3..b7095d6 100644 --- a/src/__tests__/general/Group1/Data1/index.json +++ b/src/__tests__/general/Group1/Data1/index.json @@ -3,6 +3,9 @@ { "source": { "jcampURL": "./1h.jdx" + }, + "display": { + "name": "Experiment 1" } } ], diff --git a/src/commands/toc/processGeneralFolder.js b/src/commands/toc/processGeneralFolder.js index c8322e1..a7670f7 100644 --- a/src/commands/toc/processGeneralFolder.js +++ b/src/commands/toc/processGeneralFolder.js @@ -58,11 +58,9 @@ export async function processGeneralFolder(basename, folder, toc) { }, }; - if (!title) { - spectrum.display = { - name: filename.replace(/^.*\//, ''), - }; - } + spectrum.display = { + name: title || filename.replace(/^.*\//, ''), + }; spectra.push(spectrum); }