feat: update Moonraker analysis support

pedrolamas · pedrolamas · commit e181b3ae0ed7 · 2025-02-18T11:06:01.000Z
Signed-off-by: Pedro Lamas &lt;pedrolamas@gmail.com&gt;
diff --git a/src/api/socketActions.ts b/src/api/socketActions.ts
@@ -792,17 +792,31 @@ export const SocketActions = {
     )
   },
 
-  async serverAnalysisEstimate (filename: string, estimator_config?: string, update_metadata?: boolean) {
+  async serverAnalysisEstimate (filename: string, estimator_config?: string) {
     const wait = `${Waits.onFileSystem}/gcodes/${filename}`
     baseEmit(
       'server.analysis.estimate', {
+        params: {
+          filename,
+          estimator_config
+        },
+        wait,
+        dispatch: 'void'
+      }
+    )
+  },
+
+  async serverAnalysisProcess (filename: string, estimator_config?: string, force?: boolean) {
+    const wait = `${Waits.onFileSystem}/gcodes/${filename}`
+    baseEmit(
+      'server.analysis.process', {
         params: {
           filename,
           estimator_config,
-          update_metadata
+          force
         },
         wait,
-        dispatch: 'analysis/onAnalysisEstimate'
+        dispatch: 'analysis/onAnalysisProcess'
       }
     )
   },
diff --git a/src/components/widgets/filesystem/FileSystem.vue b/src/components/widgets/filesystem/FileSystem.vue
@@ -412,6 +412,12 @@ export default class FileSystem extends Mixins(StateMixin, FilesMixin, ServicesM
               visible: false,
               cellClass: 'text-no-wrap'
             },
+            {
+              text: this.$tc('app.general.table.header.file_processors'),
+              value: 'file_processors',
+              visible: false,
+              cellClass: 'text-no-wrap'
+            },
             {
               text: this.$tc('app.general.table.header.last_printed'),
               value: 'print_start_time',
@@ -824,7 +830,7 @@ export default class FileSystem extends Mixins(StateMixin, FilesMixin, ServicesM
       .map(file => file.path ? `${file.path}/${file.filename}` : file.filename)
 
     for (const filename of filenames) {
-      SocketActions.serverAnalysisEstimate(filename, undefined, true)
+      SocketActions.serverAnalysisProcess(filename, undefined, true)
     }
   }
 
diff --git a/src/components/widgets/filesystem/FileSystemBrowser.vue b/src/components/widgets/filesystem/FileSystemBrowser.vue
@@ -215,6 +215,14 @@
             </template>
           </template>
 
+          <template #[`item.file_processors`]="{ value }">
+            {{
+              value != null && value.length > 0
+                ? value.map($filters.prettyCase).join(', ')
+                : '--'
+            }}
+          </template>
+
           <template #[`item.print_start_time`]="{ value }">
             {{
               value != null
diff --git a/src/locales/en.yaml b/src/locales/en.yaml
@@ -428,6 +428,7 @@ app:
         filament_type: Filament type
         filament_used: Used filament
         filament_weight_total: Filament weight
+        file_processors: File processors
         first_layer_bed_temp: First layer bed temp
         first_layer_extr_temp: First layer extruder temp
         first_layer_height: First layer height
diff --git a/src/store/analysis/actions.ts b/src/store/analysis/actions.ts
@@ -1,5 +1,5 @@
 import type { ActionTree } from 'vuex'
-import type { AnalysisState, AnalysisStatus, AnalysisEstimate } from './types'
+import type { AnalysisState, AnalysisStatus, AnalysisProcess } from './types'
 import type { RootState } from '../types'
 import { SocketActions } from '@/api/socketActions'
 import type { ObjectWithRequest } from '@/plugins/socketClient'
@@ -15,11 +15,11 @@ export const actions: ActionTree<AnalysisState, RootState> = {
     }
   },
 
-  async onAnalysisEstimate (_, payload: ObjectWithRequest<AnalysisEstimate>) {
+  async onAnalysisProcess (_, payload: ObjectWithRequest<AnalysisProcess>) {
     if (payload) {
-      const { filename, update_metadata } = payload.__request__.params ?? {}
+      const { filename } = payload.__request__.params ?? {}
 
-      if (update_metadata) {
+      if (!payload.bypassed) {
         SocketActions.serverFilesMetadata(filename)
       }
     }
diff --git a/src/store/analysis/types.ts b/src/store/analysis/types.ts
@@ -29,3 +29,9 @@ export interface AnalysisEstimate {
   kind_times: Record<string, number>;
   layer_times: [number, number][]
 }
+
+export interface AnalysisProcess {
+  prev_processed: boolean;
+  version: string;
+  bypassed: boolean;
+}
diff --git a/src/store/files/types.metadata.ts b/src/store/files/types.metadata.ts
@@ -19,6 +19,7 @@ export interface MoonrakerFileMeta {
   object_height?: number;
   slicer?: string;
   slicer_version?: string;
+  file_processors?: string[];
   thumbnails?: MoonrakerFileMetaThumbnail[];
 }
 

Original file line number	Diff line number	Diff line change
`@@ -412,6 +412,12 @@ export default class FileSystem extends Mixins(StateMixin, FilesMixin, ServicesM`
`412`	`412`	`visible: false,`
`413`	`413`	`cellClass: 'text-no-wrap'`
`414`	`414`	`},`
	`415`	`+ {`
	`416`	`+ text: this.$tc('app.general.table.header.file_processors'),`
	`417`	`+ value: 'file_processors',`
	`418`	`+ visible: false,`
	`419`	`+ cellClass: 'text-no-wrap'`
	`420`	`+ },`
`415`	`421`	`{`
`416`	`422`	`text: this.$tc('app.general.table.header.last_printed'),`
`417`	`423`	`value: 'print_start_time',`
`@@ -824,7 +830,7 @@ export default class FileSystem extends Mixins(StateMixin, FilesMixin, ServicesM`
`824`	`830`	.map(file => file.path ? `${file.path}/${file.filename}` : file.filename)
`825`	`831`
`826`	`832`	`for (const filename of filenames) {`
`827`		`- SocketActions.serverAnalysisEstimate(filename, undefined, true)`
	`833`	`+ SocketActions.serverAnalysisProcess(filename, undefined, true)`
`828`	`834`	`}`
`829`	`835`	`}`
`830`	`836`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import type { ActionTree } from 'vuex'`
`2`		`-import type { AnalysisState, AnalysisStatus, AnalysisEstimate } from './types'`
	`2`	`+import type { AnalysisState, AnalysisStatus, AnalysisProcess } from './types'`
`3`	`3`	`import type { RootState } from '../types'`
`4`	`4`	`import { SocketActions } from '@/api/socketActions'`
`5`	`5`	`import type { ObjectWithRequest } from '@/plugins/socketClient'`
`@@ -15,11 +15,11 @@ export const actions: ActionTree<AnalysisState, RootState> = {`
`15`	`15`	`}`
`16`	`16`	`},`
`17`	`17`
`18`		`- async onAnalysisEstimate (_, payload: ObjectWithRequest<AnalysisEstimate>) {`
	`18`	`+ async onAnalysisProcess (_, payload: ObjectWithRequest<AnalysisProcess>) {`
`19`	`19`	`if (payload) {`
`20`		`- const { filename, update_metadata } = payload.__request__.params ?? {}`
	`20`	`+ const { filename } = payload.__request__.params ?? {}`
`21`	`21`
`22`		`- if (update_metadata) {`
	`22`	`+ if (!payload.bypassed) {`
`23`	`23`	`SocketActions.serverFilesMetadata(filename)`
`24`	`24`	`}`
`25`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ export interface MoonrakerFileMeta {`
`19`	`19`	`object_height?: number;`
`20`	`20`	`slicer?: string;`
`21`	`21`	`slicer_version?: string;`
	`22`	`+ file_processors?: string[];`
`22`	`23`	`thumbnails?: MoonrakerFileMetaThumbnail[];`
`23`	`24`	`}`
`24`	`25`