feat: add more infomation for mini tracker

src/parser.ts

@@ -26,6 +26,7 @@ import {
 import { getActivityDataKey } from './util/helper'
 import { isArray, isNumber } from 'lodash-es'
 import type { Column } from '@tanstack/react-table'
+import { planRecordSchema } from './schemas'
 
 export class MdTableParser {
   static parse(markupOrLines: string | string[]) {
@@ -136,6 +137,7 @@ export class Parser {
     const activitiesRows = table
       .getRows()
       .slice(2)
+      .filter(row => row.getWidth() === (Object.keys(planRecordSchema.shape).length))
       .map((row) => row.getCells().map((cell) => cell.content))
 
     const activitiesData: Activity[] = activitiesRows.map((row) =>

src/scheduler.ts

@@ -36,7 +36,7 @@ export class Scheduler {
         actLen: 0,
       }
     })
-
+    
     this.activities = activities
     this.schedule()
 
@@ -70,7 +70,7 @@ export class Scheduler {
       duration: p.duration,
       activities: this.schedulePart(p.duration, p.activities),
     }))
-
+    
     const scheduledActivities: ScheduledActivity[] = this.mergeParts(parts)
     this.activities = scheduledActivities
   }

src/tracker/plan-tracker.ts

@@ -17,7 +17,12 @@ export type TrackerState = {
   upcoming: Upcoming | null
 }
 
-type Ongoing = { activity: ScheduledActivity; leftSecs: number; progress: number }
+type Ongoing = {
+  activity: ScheduledActivity
+  leftMins: number
+  timeoutMins: number
+  progress: number
+}
 type Upcoming = { activity: ScheduledActivity }
 
 export type Observer = {
@@ -138,7 +143,7 @@ export class PlanTracker {
       progress: 0,
       leftSecs: 0,
       leftMins: 0,
-      isAllDone: false,
+      timeoutMins: 0,
     }
 
     if (!this.scheduler) return initialState
@@ -149,38 +154,35 @@ export class PlanTracker {
       (a) => nowMins >= a.start && a.isFixed
     )
     const now = this.scheduler.activities[nowIndex]
-
-    if (nowIndex === this.scheduler.activities.length - 1 && nowMins >= now.stop) {
-      return {
-        ...initialState,
-        now,
-        isAllDone: true,
-      }
-    }
+    const nowIsLast = nowIndex === this.scheduler.activities.length - 1
 
     const durationMins = nowMins - now.start
     const durationSecs = durationMins * 60 + new Date().getSeconds()
     const totalMins = now.actLen
     const totalSecs = totalMins * 60
-    const progress = (durationSecs / totalSecs) * 100
-
-    const next = find(this.scheduler.activities, (a) => a.actLen >= 0, nowIndex + 1)
-
+    const progress = totalMins > 0 ? (durationSecs / totalSecs) * 100 : 100
+
+    console.log({ durationMins, durationSecs, totalMins, progress, totalSecs })
+
+    const next = nowIsLast
+      ? null
+      : find(this.scheduler.activities, (a) => a.actLen >= 0, nowIndex + 1)
+
     return {
       ...initialState,
       now,
       next,
-      progress: progress <= 100 ? progress : 100,
+      progress,
       leftSecs: totalSecs - durationSecs,
       leftMins: totalMins - durationMins,
-      isAllDone: false,
+      timeoutMins: durationMins - totalMins,
     }
   }
 
   private async onTick() {
     if (!this.scheduler) return
 
-    const { leftSecs, ...props } = this.computeProgress()
+    const { leftMins, timeoutMins, ...props } = this.computeProgress()
 
     this.updateStatusBar(props)
     const { now, next, progress } = props
@@ -190,20 +192,21 @@ export class PlanTracker {
       this.now = now
     }
 
-    const ongoing: Ongoing | null = now
+    const ongoing: Maybe<Ongoing> = now
       ? {
           activity: now,
-          leftSecs,
+          leftMins,
+          timeoutMins,
           progress,
         }
       : null
 
-    const upcoming: Upcoming | null = next
+    const upcoming: Maybe<Upcoming> = next
       ? {
           activity: next,
         }
       : null
-
+      
     this.notifyObservers({ ongoing, upcoming })
 
     // ================== Notification ==================

src/window/mini-tracker/MiniClock.svelte

@@ -2,7 +2,7 @@
   export let progress = 0
   export let size: number
 
-  $: angle = (360 * progress) / 100
+  $: angle = progress >= 0 && progress <= 100 ? (360 * progress) / 100 : 360
 </script>
 
 <div

src/window/mini-tracker/MiniTrackerWindow.svelte

@@ -7,7 +7,18 @@
   let now: Maybe<ScheduledActivity> = null
   let next: Maybe<ScheduledActivity> = null
   let progress = 0
-
+  let leftMins = 0
+  let timeoutMins = 0
+  
+  let estimatedLeftMins = 0
+  $: {
+    if (now) {
+      estimatedLeftMins = leftMins - (leftMins % 5) 
+      console.log({ leftMins, estimatedLeftMins, timeoutMins, next })
+      estimatedLeftMins = estimatedLeftMins >= 0 ? estimatedLeftMins : 5
+    }
+  }
+  
   const ipcRenderer = require('electron').ipcRenderer
   ipcRenderer.on('update', (e, payload: TrackerState) => {
     if (!payload) return
@@ -16,6 +27,8 @@
     if (ongoing) {
       now = ongoing.activity
       progress = ongoing.progress
+      leftMins = ongoing.leftMins
+      timeoutMins = -leftMins
     }
     
     if (upcoming) {
@@ -78,7 +91,8 @@
     <div class="col-span-3 space-y-1">
       <div class="text-gray-900 truncate">{now?.activity ?? 'No activity'}</div>
       <div class="text-xs text-gray-400 truncate">
-        {next ? `Next: ${next.activity}` : 'All done'}
+        { timeoutMins < 0 ? `~${estimatedLeftMins}` : `+${timeoutMins}` } mins
+        { next ? `> ${next.activity}` : ''}
       </div>
     </div>
   </div>

src/window/mini-tracker/mini-tracker.ts

@@ -9,7 +9,7 @@ const SNAPPING_DISTANCE = 24
 const SNAPPING_VISIBLE_EDGE = 16
 
 const Size = {
-  WIDTH: 180,
+  WIDTH: 200,
   HEIGHT: 60,
 }
 
@@ -23,8 +23,6 @@ export class MiniTracker {
 
   private onCloseCallbacks: (() => void)[] = []
 
-  private isSnapping = false
-
   private constructor(private store: DataStore, private tracker: PlanTracker) {}
 
   static new(store: DataStore, tracker: PlanTracker) {