fix: time estimations display Infinity

Author: cadriel

src/components/widgets/filesystem/FileSystemBrowser.vue

@@ -188,10 +188,9 @@
               </v-list-item>
             </v-list>
           </v-col>
-          <v-col class="px-2 d-none d-sm-flex">
+          <v-col class="px-2 d-none d-sm-flex" v-if="contextMenu.item.thumbnails && contextMenu.item.thumbnails.length">
             <img
-              v-if="contextMenu.item.thumbnails && contextMenu.item.thumbnails.length"
-              class="mr-1 file-icon-thumb"
+              class="mr-2 ml-2"
               :src="getThumb(contextMenu.item, true).data"
               :height="150"
             />

src/plugins/filters.ts

@@ -1,5 +1,5 @@
 import _Vue from 'vue'
-import { camelCase, startCase, capitalize } from 'lodash-es'
+import { camelCase, startCase, capitalize, isFinite } from 'lodash-es'
 
 const Filters = {
 
@@ -8,8 +8,9 @@ const Filters = {
    * Expects to be passed seconds.
    */
   formatCounterTime: (seconds: number) => {
+    seconds = Number(seconds)
+    if (isNaN(+seconds) || !isFinite(seconds)) seconds = 0
     let isNeg = false
-    if (isNaN(seconds)) seconds = 0
     if (seconds < 0) {
       seconds = Math.abs(seconds)
       isNeg = true
@@ -22,7 +23,6 @@ const Filters = {
     if (m > 0) r = m + 'm ' + r
     if (h > 0) r = h + 'h ' + r
 
-    // const r = `${h}h ${m}m ${s}s`
     return (isNeg) ? '-' + r : r
   },
 

src/scss/global.scss

@@ -37,12 +37,7 @@
     user-select: none;
   }
 
-  // .v-data-table > .v-data-table__wrapper > table > tbody > tr > td,
-  // .v-data-table > .v-data-table__wrapper > table > thead > tr > td,
-  // .v-data-table > .v-data-table__wrapper > table > tfoot > tr > td {
-  //   height: 40px;
-  // }
-
+  // gcode thumbnails in the file list
   .file-icon-thumb {
     align-items: center;
     display: inline-flex;

src/store/socket/actions.ts

@@ -49,12 +49,12 @@ export const actions: ActionTree<SocketState, RootState> = {
    * Another case might be during a klippy disconnect.
    */
   async onSocketError ({ commit }, payload) {
-    if (payload.code >= 400 && payload.code < 500) {
-      // clear any associated waits.
-      if (payload.__request__ && payload.__request__.wait) {
-        commit('removeWait', payload.__request__.wait)
-      }
+    // clear any associated waits.
+    if (payload.__request__ && payload.__request__.wait) {
+      commit('removeWait', payload.__request__.wait)
+    }
 
+    if (payload.code >= 400 && payload.code < 500) {
       // If our message contains json, we should try to parse it.
       // This is pretty bad, should get moonraker to fix this response.
       let message = ''

src/store/socket/getters.ts

@@ -5,7 +5,7 @@ import { Thumbnail } from '@/store/files/types'
 import { RootState } from '../types'
 import { chartConfiguration } from '@/globals'
 import { TinyColor } from '@ctrl/tinycolor'
-import { get } from 'lodash-es'
+import { get, isFinite } from 'lodash-es'
 import { getThumb } from '../helpers'
 
 export const getters: GetterTree<SocketState, RootState> = {
@@ -120,21 +120,37 @@ export const getters: GetterTree<SocketState, RootState> = {
    * Returns an object representing the time estimates of a current print.
    */
   getTimeEstimates: (state) => (type: 'slicer' | 'file' | 'filament' | 'totals'): TimeEstimates => {
-    const progress = (state.printer.display_status.progress && !isNaN(state.printer.display_status.progress))
-      ? state.printer.display_status.progress
-      : 0
-    // state.printer.print_stats.total_duration
-    const duration = (state.printer.print_stats.print_duration && !isNaN(state.printer.print_stats.print_duration))
-      ? state.printer.print_stats.print_duration
-      : 0
-
-    const usedFilament = (state.printer.print_stats.filament_used && !isNaN(state.printer.print_stats.filament_used))
-      ? state.printer.print_stats.filament_used
-      : 0
-
-    const estimatedFilament = (state.printer.current_file.filament_total && !isNaN(state.printer.current_file.filament_total))
-      ? state.printer.current_file.filament_total
-      : 0
+    const progress = (
+      !state.printer.virtual_sdcard.progress ||
+      isNaN(+state.printer.virtual_sdcard.progress) ||
+      !isFinite(+state.printer.virtual_sdcard.progress)
+    )
+      ? 0
+      : state.printer.virtual_sdcard.progress
+
+    const duration = (
+      !state.printer.print_stats.print_duration ||
+      isNaN(+state.printer.print_stats.print_duration) ||
+      !isFinite(+state.printer.print_stats.print_duration)
+    )
+      ? 0
+      : state.printer.print_stats.print_duration
+
+    const usedFilament = (
+      !state.printer.print_stats.filament_used ||
+      isNaN(+state.printer.print_stats.filament_used) ||
+      !isFinite(+state.printer.print_stats.filament_used)
+    )
+      ? 0
+      : state.printer.print_stats.filament_used
+
+    const estimatedFilament = (
+      !state.printer.current_file.filament_total ||
+      isNaN(+state.printer.current_file.filament_total) ||
+      !isFinite(+state.printer.current_file.filament_total)
+    )
+      ? 0
+      : state.printer.current_file.filament_total
 
     let timeLeft = 0
     let totalDuration = 0
@@ -161,11 +177,25 @@ export const getters: GetterTree<SocketState, RootState> = {
         break
       }
       default: { // totals only.
-        totalDuration = duration / (progress * 100) - duration
-        timeLeft = totalDuration - duration
+        totalDuration = 0
+        timeLeft = 0
       }
     }
 
+    totalDuration = (
+      isNaN(+totalDuration) ||
+      !isFinite(+totalDuration)
+    )
+      ? 0
+      : totalDuration
+
+    timeLeft = (
+      isNaN(+timeLeft) ||
+      !isFinite(+timeLeft)
+    )
+      ? 0
+      : timeLeft
+
     const o = {
       type,
       progress: (progress * 100).toFixed(),

src/store/socket/index.ts

@@ -55,12 +55,19 @@ export const getDefaultState = (): SocketState => {
       print_stats: {
         state: '',
         print_duration: 0,
+        total_duration: 0,
+        filament_used: 0,
         filename: ''
       },
       display_status: {
         progress: 0,
         message: ''
       },
+      virtual_sdcard: {
+        file_position: 0,
+        is_active: false,
+        progress: 0
+      },
       toolhead: {
         estimated_print_time: 0,
         homed_axes: '',