Crop state field if necessary

grisu48 · grisu48 · commit 656077a4b432 · 2023-03-09T13:35:23.000+01:00
Limit the state field of jobs to 12 characters.
diff --git a/cmd/openqa-revtui/openqa-revtui.go b/cmd/openqa-revtui/openqa-revtui.go
@@ -350,7 +350,6 @@ func parseProgramArgs() error {
 }
 
 func printUsage() {
-	// TODO: Write this
 	fmt.Printf("Usage: %s [OPTIONS] [FLAVORS]\n", os.Args[0])
 	fmt.Println("")
 	fmt.Println("OPTIONS")
diff --git a/cmd/openqa-revtui/tui.go b/cmd/openqa-revtui/tui.go
@@ -577,6 +577,13 @@ func (tui *TUI) formatJobLine(job gopenqa.Job, width int) string {
 		}
 	}
 
+	// Crop the state field, if necessary
+	if state == "timeout_exceeded" {
+		state = "timeout"
+	} else if len(state) > 12 {
+		state = state[0:12]
+	}
+
 	// Full status line requires 89 characters (20+4+8+1+12+1+40+3) plus name
 	if width > 90 {
 		// Crop the name, if necessary

Original file line number	Diff line number	Diff line change
`@@ -350,7 +350,6 @@ func parseProgramArgs() error {`
`350`	`350`	`}`
`351`	`351`
`352`	`352`	`func printUsage() {`
`353`		`- // TODO: Write this`
`354`	`353`	`fmt.Printf("Usage: %s [OPTIONS] [FLAVORS]\n", os.Args[0])`
`355`	`354`	`fmt.Println("")`
`356`	`355`	`fmt.Println("OPTIONS")`
Original file line number	Diff line number	Diff line change
`@@ -577,6 +577,13 @@ func (tui *TUI) formatJobLine(job gopenqa.Job, width int) string {`
`577`	`577`	`}`
`578`	`578`	`}`
`579`	`579`
	`580`	`+ // Crop the state field, if necessary`
	`581`	`+ if state == "timeout_exceeded" {`
	`582`	`+ state = "timeout"`
	`583`	`+ } else if len(state) > 12 {`
	`584`	`+ state = state[0:12]`
	`585`	`+ }`
	`586`	`+`
`580`	`587`	`// Full status line requires 89 characters (20+4+8+1+12+1+40+3) plus name`
`581`	`588`	`if width > 90 {`
`582`	`589`	`// Crop the name, if necessary`