From e0f5f78d348adc75851d9c468685c15cc454be2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niccol=C3=B2=20Maggioni?= Date: Sat, 17 Aug 2024 16:39:36 +0200 Subject: [PATCH] feat(console): add debug prefix (#1973) --- src/components/console/ConsoleTableEntry.vue | 4 ++-- src/plugins/helpers.ts | 2 ++ src/store/server/actions.ts | 5 ++++- src/store/server/mutations.ts | 5 ++++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/components/console/ConsoleTableEntry.vue b/src/components/console/ConsoleTableEntry.vue index 21c2af4d9..e00ff72c2 100644 --- a/src/components/console/ConsoleTableEntry.vue +++ b/src/components/console/ConsoleTableEntry.vue @@ -19,7 +19,7 @@ export default class ConsoleTableEntry extends Mixins(BaseMixin) { get entryStyle() { const classes = ['ma-0', 'flex-nowrap'] classes.push(this.$store.state.gui.console.entryStyle ?? 'default') - if (this.event.type === 'action') classes.push('text--disabled') + if (['action', 'debug'].includes(this.event.type)) classes.push('text--disabled') return classes } @@ -31,7 +31,7 @@ export default class ConsoleTableEntry extends Mixins(BaseMixin) { get messageClass() { const classes = ['console-message'] - if (this.event.type === 'action') classes.push('text--disabled') + if (['action', 'debug'].includes(this.event.type)) classes.push('text--disabled') else if (this.event.message.startsWith('!! ')) classes.push('error--text') else classes.push('text--primary') diff --git a/src/plugins/helpers.ts b/src/plugins/helpers.ts index c0be39dab..f0727ff93 100644 --- a/src/plugins/helpers.ts +++ b/src/plugins/helpers.ts @@ -72,6 +72,8 @@ export function formatConsoleMessage(message: string): string { message = message.replace(/\n\/\/ /g, '\n') // remove echo message = message.replace(/^echo:/g, '') + // remove debug + message = message.replace(/^debug:/g, '') // replace linebreaks with html
message = message.replace('\n// ', '
') message = message.replace(/\r\n|\r|\n/g, '
') diff --git a/src/store/server/actions.ts b/src/store/server/actions.ts index 75c11cc30..270b3e7e7 100644 --- a/src/store/server/actions.ts +++ b/src/store/server/actions.ts @@ -258,7 +258,10 @@ export const actions: ActionTree = { else if ('error' in payload) message = message.error.message let formatMessage = formatConsoleMessage(message) - if (type === 'response' && message.startsWith('// action:')) type = 'action' + if (type === 'response') { + if (message.startsWith('// action:')) type = 'action' + else if (message.startsWith('// debug:')) type = 'debug' + } const filters = rootGetters['gui/console/getConsolefilterRules'] let boolImport = true diff --git a/src/store/server/mutations.ts b/src/store/server/mutations.ts index da2777490..c11d5160a 100644 --- a/src/store/server/mutations.ts +++ b/src/store/server/mutations.ts @@ -103,7 +103,10 @@ export const mutations: MutationTree = { let type = message.type if (type === 'command') formatMessage = '' + formatMessage + '' - if (type === 'response' && message.message.startsWith('// action:')) type = 'action' + if (type === 'response') { + if (message.message.startsWith('// action:')) type = 'action' + else if (message.message.startsWith('// debug:')) type = 'debug' + } state.events.push({ date,