From ea7f3120c4108a3e497c950af17057d078e94d29 Mon Sep 17 00:00:00 2001 From: skovranek <59619403+skovranek@users.noreply.github.com> Date: Tue, 17 Nov 2026 16:15:36 -0500 Subject: [PATCH 1/2] remove double lesson title on confirmation --- cmd/submit.go | 16 +++++++++++----- render/header.go | 19 ++++++++++--------- render/models.go | 2 +- render/render.go | 2 +- render/view.go | 4 +--- 5 files changed, 24 insertions(+), 19 deletions(-) diff --git a/cmd/submit.go b/cmd/submit.go index ad74b83..0812888 100644 --- a/cmd/submit.go +++ b/cmd/submit.go @@ -42,6 +42,7 @@ func submissionHandler(cmd *cobra.Command, args []string) error { isSubmit := cmd.Name() == "submit" || forceSubmit var lessonUUID string + var confirmedTitle string if len(args) > 0 { lessonUUID = args[0] } else { @@ -53,11 +54,12 @@ func submissionHandler(cmd *cobra.Command, args []string) error { if isSubmit { if !promptToContinue( "Submitting next lesson:", - lessonLabel, + render.RenderLessonTitle(lessonLabel), "Continue?", ) { return errors.New("submission canceled") } + confirmedTitle = lessonLabel } lessonUUID = nextLesson.LessonUUID } @@ -70,7 +72,9 @@ func submissionHandler(cmd *cobra.Command, args []string) error { lessonTitle := fmt.Sprintf("%d.%d - %s", lesson.ChapterNumber, lesson.LessonNumber, lesson.Lesson.Title) lessonAction := lessonRunAction(isSubmit, len(args) == 0) reportValidationError := func(err error) error { - fmt.Printf("%s\n%s\n", lessonAction, lessonTitle) + if lessonTitle != confirmedTitle { + fmt.Printf("%s\n%s\n", lessonAction, lessonTitle) + } return err } if lesson.Lesson.Type != "type_cli" { @@ -87,9 +91,11 @@ func submissionHandler(cmd *cobra.Command, args []string) error { overrideBaseURL := viper.GetString("override_base_url") runContext := render.RunContext{ - Action: lessonAction, - LessonTitle: lessonTitle, - BaseURL: data.BaseURLDefault, + BaseURL: data.BaseURLDefault, + } + if lessonTitle != confirmedTitle { + runContext.Action = lessonAction + runContext.LessonTitle = lessonTitle } if overrideBaseURL != "" { runContext.BaseURL = overrideBaseURL diff --git a/render/header.go b/render/header.go index f25b8eb..0035976 100644 --- a/render/header.go +++ b/render/header.go @@ -14,17 +14,16 @@ type RunContext struct { BaseURLOverridden bool } +func RenderLessonTitle(title string) string { + return lipgloss.NewStyle().Bold(true).Render(title) +} + func renderRunHeader(context RunContext) string { - if context.LessonTitle == "" { - return "" - } var str strings.Builder - action := context.Action - if action == "" { - action = "Running lesson:" + if context.LessonTitle != "" { + fmt.Fprintln(&str, context.Action) + fmt.Fprintln(&str, RenderLessonTitle(context.LessonTitle)) } - fmt.Fprintln(&str, action) - fmt.Fprintln(&str, lipgloss.NewStyle().Bold(true).Render(context.LessonTitle)) if context.BaseURL != "" { if context.BaseURLOverridden { fmt.Fprintf(&str, "%s %s\n", warningStyle.Render("Using overridden base_url:"), context.BaseURL) @@ -33,6 +32,8 @@ func renderRunHeader(context RunContext) string { fmt.Fprintf(&str, "%s %s\n", secondaryStyle.Render("base_url:"), context.BaseURL) } } - str.WriteByte('\n') + if str.Len() > 0 { + str.WriteByte('\n') + } return str.String() } diff --git a/render/models.go b/render/models.go index a0d3a14..c11b6dd 100644 --- a/render/models.go +++ b/render/models.go @@ -24,7 +24,7 @@ type stepModel struct { } type rootModel struct { - runContext RunContext + runHeader string terminalWidth int steps []stepModel spinner spinner.Model diff --git a/render/render.go b/render/render.go index c7a2c46..6e2e69b 100644 --- a/render/render.go +++ b/render/render.go @@ -120,7 +120,7 @@ func StartRenderer(isSubmit bool, verbose bool, showOmitLessonIDTip bool, runCon if terminalWidth, _, err := term.GetSize(int(os.Stdout.Fd())); err == nil { m.terminalWidth = terminalWidth } - m.runContext = runContext + m.runHeader = renderRunHeader(runContext) m.showOmitLessonIDTip = showOmitLessonIDTip interactive := term.IsTerminal(int(os.Stdin.Fd())) && term.IsTerminal(int(os.Stdout.Fd())) options := []tea.ProgramOption{tea.WithoutSignalHandler(), tea.WithInput(nil)} diff --git a/render/view.go b/render/view.go index a5a325d..09c21a0 100644 --- a/render/view.go +++ b/render/view.go @@ -50,7 +50,7 @@ func (m rootModel) View() string { } s := m.spinner.View() var str strings.Builder - str.WriteString(renderRunHeader(m.runContext)) + str.WriteString(m.runHeader) failedStepIndex := -1 if m.isSubmit && m.failure != nil && m.failure.FailedStepIndex >= 0 && m.failure.FailedStepIndex < len(m.steps) { failedStepIndex = m.failure.FailedStepIndex @@ -125,8 +125,6 @@ func (m rootModel) View() string { str.WriteByte('\n') str.WriteByte('\n') } else if m.isSubmit && m.result == api.VerificationResultSlugNoop { - str.WriteByte('\n') - str.WriteByte('\n') str.WriteString(informationStyle.Render(safeStepIcon) + " " + informationStyle.Render("This was a safe step.") + "\n") str.WriteString("You haven't passed, but you also haven't lost armor or Sharpshooter progress.\n\n") } From aa82ea91bfe06852da0e85a0c686b40365512c58 Mon Sep 17 00:00:00 2001 From: skovranek <59619403+skovranek@users.noreply.github.com> Date: Tue, 17 Nov 2026 16:15:55 -0500 Subject: [PATCH 2/2] increment patch version --- version.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.txt b/version.txt index cde949b..9efd800 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v1.33.0 +v1.33.1