go-pkg/asynq
2
0
Fork 0
mirror of https://github.com/hibiken/asynq.git synced 2025-10-03 05:12:01 +08:00
Code Issues Projects Releases Wiki Activity

(cli): Fix withModal helper

Browse Source
This commit is contained in:
Ken Hibino
2022-05-27 15:26:18 -07:00
parent f105a2c3c3
commit 19411c538a
1 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
tools/asynq/cmd/dash/draw.go
View File

@@ -536,46 +536,46 @@ func drawTaskModal(d *ScreenDrawer, state *State) {
if task == nil { if task == nil {
// task no longer found // task no longer found
contents := []*rowContent{ contents := []*rowContent{
{" === Task Summary ===", baseStyle.Bold(true)}, {"=== Task Summary ===", baseStyle.Bold(true)},
{"", baseStyle}, {"", baseStyle},
{fmt.Sprintf(" Task %q no longer exists", state.taskID), baseStyle}, {fmt.Sprintf("Task %q no longer exists", state.taskID), baseStyle},
} }
withModal(d, contents) withModal(d, contents)
return return
} }
contents := []*rowContent{ contents := []*rowContent{
{" === Task Summary ===", baseStyle.Bold(true)}, {"=== Task Summary ===", baseStyle.Bold(true)},
{"", baseStyle}, {"", baseStyle},
{fmt.Sprintf(" ID: %s", task.ID), baseStyle}, {fmt.Sprintf("ID: %s", task.ID), baseStyle},
{fmt.Sprintf(" Type: %s", task.Type), baseStyle}, {fmt.Sprintf("Type: %s", task.Type), baseStyle},
{fmt.Sprintf(" State: %s", task.State.String()), baseStyle}, {fmt.Sprintf("State: %s", task.State.String()), baseStyle},
{fmt.Sprintf(" Queue: %s", task.Queue), baseStyle}, {fmt.Sprintf("Queue: %s", task.Queue), baseStyle},
{fmt.Sprintf(" Retried: %d/%d", task.Retried, task.MaxRetry), baseStyle}, {fmt.Sprintf("Retried: %d/%d", task.Retried, task.MaxRetry), baseStyle},
} }
if task.LastErr != "" { if task.LastErr != "" {
contents = append(contents, &rowContent{ contents = append(contents, &rowContent{
fmt.Sprintf(" Last Failure: %s", task.LastErr), fmt.Sprintf("Last Failure: %s", task.LastErr),
baseStyle, baseStyle,
}) })
contents = append(contents, &rowContent{ contents = append(contents, &rowContent{
fmt.Sprintf(" Last Failure Time: %v", task.LastFailedAt), fmt.Sprintf("Last Failure Time: %v", task.LastFailedAt),
baseStyle, baseStyle,
}) })
} }
if !task.NextProcessAt.IsZero() { if !task.NextProcessAt.IsZero() {
contents = append(contents, &rowContent{ contents = append(contents, &rowContent{
fmt.Sprintf(" Next Process Time: %v", task.NextProcessAt), fmt.Sprintf("Next Process Time: %v", task.NextProcessAt),
baseStyle, baseStyle,
}) })
} }
if !task.CompletedAt.IsZero() { if !task.CompletedAt.IsZero() {
contents = append(contents, &rowContent{ contents = append(contents, &rowContent{
fmt.Sprintf(" Completion Time: %v", task.CompletedAt), fmt.Sprintf("Completion Time: %v", task.CompletedAt),
baseStyle, baseStyle,
}) })
} }
contents = append(contents, &rowContent{ contents = append(contents, &rowContent{
fmt.Sprintf(" Payload: %s", formatByteSlice(task.Payload)), fmt.Sprintf("Payload: %s", formatByteSlice(task.Payload)),
baseStyle, baseStyle,
}) })
withModal(d, contents) withModal(d, contents)
@@ -614,7 +614,6 @@ type rowContent struct {
} }
func withModal(d *ScreenDrawer, contents []*rowContent) { func withModal(d *ScreenDrawer, contents []*rowContent) {
modalStyle := baseStyle //.Background(tcell.ColorDarkMagenta)
w, h := d.Screen().Size() w, h := d.Screen().Size()
var ( var (
modalWidth = int(math.Floor(float64(w) * 0.6)) modalWidth = int(math.Floor(float64(w) * 0.6))
@@ -626,26 +625,27 @@ func withModal(d *ScreenDrawer, contents []*rowContent) {
return // no content can be shown return // no content can be shown
} }
d.Goto(colOffset, rowOffset) d.Goto(colOffset, rowOffset)
d.Print(string(tcell.RuneULCorner), modalStyle) d.Print(string(tcell.RuneULCorner), baseStyle)
d.Print(strings.Repeat(string(tcell.RuneHLine), modalWidth-2), modalStyle) d.Print(strings.Repeat(string(tcell.RuneHLine), modalWidth-2), baseStyle)
d.Print(string(tcell.RuneURCorner), modalStyle) d.Print(string(tcell.RuneURCorner), baseStyle)
d.NL() d.NL()
contentWidth := modalWidth - 4 /* borders + paddings */
for i := 1; i < modalHeight-1; i++ { for i := 1; i < modalHeight-1; i++ {
d.Goto(colOffset, rowOffset+i) d.Goto(colOffset, rowOffset+i)
d.Print(string(tcell.RuneVLine), modalStyle) d.Print(fmt.Sprintf("%c ", tcell.RuneVLine), baseStyle)
cnt := &rowContent{strings.Repeat(" ", modalWidth-2), baseStyle} cnt := &rowContent{strings.Repeat(" ", contentWidth), baseStyle}
if i <= len(contents) { if i <= len(contents) {
cnt = contents[i-1] cnt = contents[i-1]
cnt.s = adjustWidth(cnt.s, modalWidth-2) cnt.s = adjustWidth(cnt.s, contentWidth)
} }
d.Print(truncate(cnt.s, modalWidth-2), cnt.style) d.Print(truncate(cnt.s, contentWidth), cnt.style)
d.Print(string(tcell.RuneVLine), modalStyle) d.Print(fmt.Sprintf(" %c", tcell.RuneVLine), baseStyle)
d.NL() d.NL()
} }
d.Goto(colOffset, rowOffset+modalHeight-1) d.Goto(colOffset, rowOffset+modalHeight-1)
d.Print(string(tcell.RuneLLCorner), modalStyle) d.Print(string(tcell.RuneLLCorner), baseStyle)
d.Print(strings.Repeat(string(tcell.RuneHLine), modalWidth-2), modalStyle) d.Print(strings.Repeat(string(tcell.RuneHLine), modalWidth-2), baseStyle)
d.Print(string(tcell.RuneLRCorner), modalStyle) d.Print(string(tcell.RuneLRCorner), baseStyle)
d.NL() d.NL()
} }