Refactor Smartsource header reading configuration.

- Use a fixed width name parser rather than regular expressions
- Move the Smartsource header files configuration to a different
  part of the configuration object.
This commit is contained in:
D. Berge
2023-11-13 22:34:15 +01:00
parent 6cebf376d0
commit 66a758d91f
3 changed files with 150 additions and 96 deletions

View File

@@ -154,7 +154,7 @@ import DougalProjectSettingsRawP111 from '@/components/project-settings/input-ra
import DougalProjectSettingsFinalP111 from '@/components/project-settings/input-final-p111';
import DougalProjectSettingsRawNTBP from '@/components/project-settings/input-raw-ntbp';
import DougalProjectSettingsFinalPending from '@/components/project-settings/input-final-pending';
import DougalProjectSettingsSmartsource from '@/components/project-settings/input-smartsource';
import DougalProjectSettingsSmartsourceHeader from '@/components/project-settings/input-smartsource-header';
import DougalProjectSettingsPlanner from '@/components/project-settings/planner';
import DougalProjectSettingsOnlineLineNameFormat from '@/components/project-settings/online-line-name-format';
import DougalProjectSettingsASAQC from '@/components/project-settings/asaqc';
@@ -171,7 +171,7 @@ const components = {
preplots: DougalProjectSettingsPreplots,
//raw_data: DougalProjectSettingsNotImplemented,
raw_data_p111: DougalProjectSettingsRawP111,
raw_data_smartsource: DougalProjectSettingsSmartsource,
raw_data_smsrc_header: DougalProjectSettingsSmartsourceHeader,
raw_data_ntbp: DougalProjectSettingsRawNTBP,
//final_data: DougalProjectSettingsNotImplemented,
final_data_p111: DougalProjectSettingsFinalP111,
@@ -265,15 +265,19 @@ export default {
{
id: "raw_data_smsrc",
name: "Smartsource",
values: (obj) => ({
rootPath: obj.rootPath,
globs: [...obj.raw.smsrc.globs],
paths: [...obj.raw.smsrc.paths],
pattern: structuredClone(obj.raw.smsrc.pattern)
}),
save: async (data, cfg) => {
await this.patch({raw: {smsrc: {...data}}});
}
children: [
{
id: "raw_data_smsrc_header",
name: "Headers",
values: (obj) => ({
rootPath: obj.rootPath,
globs: obj?.raw?.source?.smsrc?.header?.globs,
paths: obj?.raw?.source?.smsrc?.header?.paths,
pattern: obj?.raw?.source?.smsrc?.header?.pattern,
lineNameInfo: obj?.raw?.source?.smsrc?.header?.lineNameInfo
})
},
]
},
{
id: "raw_data_ntbp",