synchronously waits for timer to finish

Signed-off-by: Omri Bornstein <[email protected]>
AppleGamer22 · Oct 21, 2024 · f942225 · f942225
1 parent 8569606
commit f942225
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/main.go b/main.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"fmt"
 	"os"
 
 	"github.com/AppleGamer22/cocainate/commands"
@@ -12,5 +11,4 @@ func main() {
 		// _, _ = fmt.Fprintf(os.Stderr, "%v\n", err)
 		os.Exit(1)
 	}
-	fmt.Print("\r")
 }
diff --git a/progress_bar/model.go b/progress_bar/model.go
@@ -60,6 +60,7 @@ func (m model) Update(message tea.Msg) (tea.Model, tea.Cmd) {
 	case time.Time:
 		m.percentage += m.amount
 		if m.percentage >= 1.0 {
+			m.percentage = 1.0
 			return m, quitMessage
 		}
 		return m, renderMessage()
@@ -70,7 +71,7 @@ func (m model) Update(message tea.Msg) (tea.Model, tea.Cmd) {
 }
 
 func (m model) View() string {
-	if m.percentage >= 1 {
+	if m.percentage >= 1.0 {
 		return ""
 	}
 	return fmt.Sprintf(

diff --git a/session/session.go b/session/session.go
@@ -59,6 +59,9 @@ func (s *Session) Wait(quiet bool) error {
 		timer := time.NewTimer(s.Duration)
 		select {
 		case <-timer.C:
+			if !quiet {
+				program.Wait()
+			}
 		case <-s.Signals:
 			timer.Stop()
 			if !quiet {