fix(FileSystem): file modified date

pedrolamas · pedrolamas · commit 7b9c14347406 · 2025-03-06T10:50:42.000Z
Signed-off-by: Pedro Lamas &lt;pedrolamas@gmail.com&gt;
diff --git a/src/store/files/getters.ts b/src/store/files/getters.ts
@@ -1,10 +1,30 @@
 import Vue from 'vue'
 import type { GetterTree } from 'vuex'
-import type { AppDirectory, AppFile, AppFileMeta, AppFileWithMeta, FileBrowserEntry, FilesState, RootProperties } from './types'
+import type { AppDirectory, AppFile, AppFileMeta, AppFileWithMeta, FileBrowserEntry, FilesState, MoonrakerFile, MoonrakerFileWithMeta, RootProperties } from './types'
 import type { RootState } from '../types'
 import type { HistoryItem } from '../history/types'
 import { SupportedImageFormats, SupportedMarkdownFormats, SupportedVideoFormats } from '@/globals'
 
+const toAppFileMetaWithHistory = (file: MoonrakerFile | MoonrakerFileWithMeta, rootGetters: any) => {
+  const metadata: Partial<AppFileMeta> & Pick<AppFileWithMeta, 'history'> = {}
+
+  if ('job_id' in file && file.job_id) {
+    const history: HistoryItem | undefined = rootGetters['history/getHistoryById'](file.job_id)
+
+    metadata.history = history
+  }
+
+  if ('filament_name' in file && file.filament_name) {
+    metadata.filament_name = Vue.$filters.getStringArray(file.filament_name)
+  }
+
+  if ('filament_type' in file && file.filament_type) {
+    metadata.filament_type = Vue.$filters.getStringArray(file.filament_type)
+  }
+
+  return metadata
+}
+
 export const getters: GetterTree<FilesState, RootState> = {
   /**
    * Returns a directory of files and sub-directories.
@@ -35,7 +55,7 @@ export const getters: GetterTree<FilesState, RootState> = {
           ...dir,
           type: 'directory',
           name: dir.dirname,
-          modified: new Date(dir.modified).getTime()
+          modified: Vue.$filters.moonrakerDateAsUnixTime(dir.modified)
         }
 
         items.push(item)
@@ -50,21 +70,7 @@ export const getters: GetterTree<FilesState, RootState> = {
         : undefined
 
       for (const file of pathContent.files) {
-        const metadata: Partial<AppFileMeta> & Pick<AppFileWithMeta, 'history'> = {}
-
-        if ('job_id' in file && file.job_id) {
-          const history: HistoryItem | undefined = rootGetters['history/getHistoryById'](file.job_id)
-
-          metadata.history = history
-        }
-
-        if ('filament_name' in file && file.filament_name) {
-          metadata.filament_name = Vue.$filters.getStringArray(file.filament_name)
-        }
-
-        if ('filament_type' in file && file.filament_type) {
-          metadata.filament_type = Vue.$filters.getStringArray(file.filament_type)
-        }
+        const metadata = toAppFileMetaWithHistory(file, rootGetters)
 
         const extensionIndex = file.filename.lastIndexOf('.')
         const extension = extensionIndex > -1 ? file.filename.substring(extensionIndex) : ''
@@ -92,7 +98,7 @@ export const getters: GetterTree<FilesState, RootState> = {
           name: file.filename,
           extension,
           path: pathFilename,
-          modified: new Date(file.modified).getTime()
+          modified: Vue.$filters.moonrakerDateAsUnixTime(file.modified)
         }
 
         items.push(item)
@@ -192,21 +198,7 @@ export const getters: GetterTree<FilesState, RootState> = {
     const file = pathContent?.files.find(file => file.filename === filename)
 
     if (file) {
-      const metadata: Partial<AppFileMeta> & Pick<AppFileWithMeta, 'history'> = {}
-
-      if ('job_id' in file && file.job_id) {
-        const history: HistoryItem | undefined = rootGetters['history/getHistoryById'](file.job_id)
-
-        metadata.history = history
-      }
-
-      if ('filament_name' in file && file.filament_name) {
-        metadata.filament_name = Vue.$filters.getStringArray(file.filament_name)
-      }
-
-      if ('filament_type' in file && file.filament_type) {
-        metadata.filament_type = Vue.$filters.getStringArray(file.filament_type)
-      }
+      const metadata = toAppFileMetaWithHistory(file, rootGetters)
 
       const [, ...restOfPath] = path.split('/')
       const pathFilename = restOfPath.join('/')
@@ -221,7 +213,7 @@ export const getters: GetterTree<FilesState, RootState> = {
         name: file.filename,
         extension,
         path: pathFilename,
-        modified: new Date(file.modified).getDate()
+        modified: Vue.$filters.moonrakerDateAsUnixTime(file.modified)
       }
 
       return item
diff --git a/src/store/history/getters.ts b/src/store/history/getters.ts
@@ -19,7 +19,7 @@ export const getters: GetterTree<HistoryState, RootState> = {
 
           item.metadata = {
             ...restOfMetadata,
-            modified: new Date(metadata.modified).getTime()
+            modified: Vue.$filters.moonrakerDateAsUnixTime(metadata.modified)
           }
 
           if (filament_name != null) {
diff --git a/src/util/date-time-formatters.ts b/src/util/date-time-formatters.ts
@@ -38,6 +38,14 @@ export const isThisYear = (value: number | string | Date) => {
   return date.getFullYear() === today.getFullYear()
 }
 
+export const moonrakerDateAsUnixTime = (value: string | number) => {
+  if (typeof value === 'string') {
+    return new Date(value).getTime() / 1000
+  }
+
+  return value
+}
+
 export const buildDateTimeFormatters = (getDefaultDateFormat: GetDefaultDateTimeFormatFunction, getDefaultTimeFormat: GetDefaultDateTimeFormatFunction) => {
   const instance = {
     getDateFormat: (override?: string): DateTimeFormat => {

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ export const getters: GetterTree<HistoryState, RootState> = {`
`19`	`19`
`20`	`20`	`item.metadata = {`
`21`	`21`	`...restOfMetadata,`
`22`		`- modified: new Date(metadata.modified).getTime()`
	`22`	`+ modified: Vue.$filters.moonrakerDateAsUnixTime(metadata.modified)`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`if (filament_name != null) {`