feat: add short session option in confirmation dialog

- add 's' key in confirmation dialog to start a 2min short session
- short sessions extend current session without counting as a new session
- refactor session start logic to eliminate code duplication

Closes #5

Author: Bahaaio

ui/confirm/confirm.go

@@ -49,6 +49,7 @@ type ConfirmChoice int
 const (
 	Confirm ConfirmChoice = iota
 	Cancel
+	ShortSession
 )
 
 type ChoiceMsg struct {
@@ -121,6 +122,9 @@ func (m *Model) HandleKeys(msg tea.KeyMsg) tea.Cmd {
 		}
 		return m.Choice(Cancel)
 
+	case key.Matches(msg, Keys.ShortSession):
+		return m.Choice(ShortSession)
+
 	case key.Matches(msg, Keys.Quit):
 		m.quitting = true
 		return m.Choice(Cancel)

ui/confirm/keys.go

@@ -5,19 +5,20 @@ import (
 )
 
 type KeyMap struct {
-	Toggle  key.Binding
-	Confirm key.Binding
-	Cancel  key.Binding
-	Submit  key.Binding
-	Quit    key.Binding
+	Toggle       key.Binding
+	Confirm      key.Binding
+	Cancel       key.Binding
+	Submit       key.Binding
+	ShortSession key.Binding
+	Quit         key.Binding
 }
 
 func (k KeyMap) ShortHelp() []key.Binding {
 	return []key.Binding{
 		k.Toggle,
 		k.Submit,
-		k.Confirm,
-		k.Cancel,
+		k.ShortSession,
+		k.Quit,
 	}
 }
 
@@ -42,6 +43,10 @@ var Keys = KeyMap{
 		key.WithKeys("enter"),
 		key.WithHelp("enter", "submit"),
 	),
+	ShortSession: key.NewBinding(
+		key.WithKeys("s"),
+		key.WithHelp("s", "short session"),
+	),
 	Quit: key.NewBinding(
 		key.WithKeys("ctrl+c", "q"),
 		key.WithHelp("q", "quit"),

ui/handlers.go

@@ -5,6 +5,7 @@ import (
 	"time"
 
 	"github.com/Bahaaio/pomo/actions"
+	"github.com/Bahaaio/pomo/config"
 	"github.com/Bahaaio/pomo/ui/confirm"
 	"github.com/charmbracelet/bubbles/key"
 	"github.com/charmbracelet/bubbles/progress"
@@ -57,6 +58,8 @@ func (m *Model) handleConfirmChoice(msg confirm.ChoiceMsg) tea.Cmd {
 	switch msg.Choice {
 	case confirm.Confirm:
 		return m.nextSession()
+	case confirm.ShortSession:
+		return m.shortSession()
 	case confirm.Cancel:
 		return m.Quit()
 	}
@@ -132,18 +135,36 @@ func (m *Model) handleCompletion() tea.Cmd {
 	m.recordSession()
 	actions.RunPostActions(&m.currentTask).Wait()
 
+	// show confirmation dialog if configured to do so
 	if m.shouldAskToContinue {
 		m.sessionState = ShowingConfirm
 		return nil
 	}
 
+	// else, quit
 	return m.Quit()
 }
 
-// updates model with next task and starts the timer
+// starts session with the opposite task type (work <-> break)
 func (m *Model) nextSession() tea.Cmd {
-	m.currentTaskType = m.currentTaskType.Opposite()
-	m.currentTask = *m.currentTaskType.GetTask()
+	nextTaskType := m.currentTaskType.Opposite()
+	return m.startSession(nextTaskType, *nextTaskType.GetTask(), false)
+}
+
+// starts a short session of the current task type
+func (m *Model) shortSession() tea.Cmd {
+	shortTask := m.currentTask
+	shortTask.Duration = 2 * time.Minute // TODO: make configurable
+	shortTask.Title = "short " + m.currentTaskType.GetTask().Title
+
+	return m.startSession(m.currentTaskType, shortTask, true)
+}
+
+// initializes and starts a new session with the given task
+func (m *Model) startSession(taskType config.TaskType, task config.Task, isShortSession bool) tea.Cmd {
+	m.isShortSession = isShortSession
+	m.currentTaskType = taskType
+	m.currentTask = task
 
 	m.elapsed = 0
 	m.duration = m.currentTask.Duration
@@ -158,6 +179,12 @@ func (m *Model) nextSession() tea.Cmd {
 
 // records the current session into the session summary
 func (m *Model) recordSession() {
+	// short sessions extend the current session without incrementing the count
+	if m.isShortSession {
+		m.sessionSummary.AddDuration(m.currentTaskType, m.elapsed)
+		return
+	}
+
 	m.sessionSummary.AddSession(m.currentTaskType, m.elapsed)
 }
 

ui/model.go

@@ -32,6 +32,7 @@ type Model struct {
 	currentTaskType     config.TaskType
 	currentTask         config.Task
 	sessionSummary      summary.SessionSummary
+	isShortSession      bool
 
 	// ASCII art
 	useTimerArt     bool

ui/summary/session_summary.go

@@ -25,10 +25,19 @@ type SessionSummary struct {
 func (t *SessionSummary) AddSession(taskType config.TaskType, elapsed time.Duration) {
 	if taskType == config.WorkTask {
 		t.totalWorkSessions++
-		t.totalWorkDuration += elapsed
 	} else {
 		t.totalBreakSessions++
-		t.totalBreakDuration += elapsed
+	}
+
+	t.AddDuration(taskType, elapsed)
+}
+
+// AddDuration adds a duration to the summary based on the task type.
+func (t *SessionSummary) AddDuration(taskType config.TaskType, duration time.Duration) {
+	if taskType == config.WorkTask {
+		t.totalWorkDuration += duration
+	} else {
+		t.totalBreakDuration += duration
 	}
 }