Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(stopwatch): timer was not accurate #437

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(stopwatch): timer was not accurate #437

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions stopwatch/stopwatch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ type ResetMsg struct {
// Model for the stopwatch component.
type Model struct {
d time.Duration
sT time.Time
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i would name this start instead 🤔

Suggested change
sT time.Time
start time.Time

id int
running bool

Expand Down Expand Up @@ -118,6 +119,12 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
if msg.ID != m.id {
return m, nil
}
if msg.running && !m.running {
m.sT = time.Now()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
m.sT = time.Now()
m.start = time.Now()

}
if !msg.running && m.running {
m.d += time.Since(m.sT)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
m.d += time.Since(m.sT)
m.d += time.Since(m.start)

}
m.running = msg.running
case ResetMsg:
if msg.ID != m.id {
Expand All @@ -128,7 +135,6 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {
if !m.running || msg.ID != m.id {
break
}
m.d += m.Interval
return m, tick(m.id, m.Interval)
}

Expand All @@ -137,12 +143,15 @@ func (m Model) Update(msg tea.Msg) (Model, tea.Cmd) {

// Elapsed returns the time elapsed.
func (m Model) Elapsed() time.Duration {
if m.running {
return m.d + time.Since(m.sT)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
return m.d + time.Since(m.sT)
return m.d + time.Since(m.start)

}
return m.d
}

// View of the timer component.
func (m Model) View() string {
return m.d.String()
return m.Elapsed().Round(m.Interval).String()
}

func tick(id int, d time.Duration) tea.Cmd {
Expand Down