1
0
mirror of https://github.com/taigrr/wtf synced 2025-01-18 04:03:14 -08:00

Fix a bunch of minor issues found by running staticcheck

Signed-off-by: Chris Cummer <chriscummer@me.com>
This commit is contained in:
Chris Cummer
2020-05-06 22:44:24 -07:00
parent a19c9c3e33
commit 9cd9a58759
12 changed files with 36 additions and 93 deletions

View File

@@ -69,9 +69,9 @@ func (widget *Widget) generateQueueJobLine(id int64, parameters []sdk.Parameter,
triggeredBy := getVarsInPbj("cds.triggered_by.username", parameters)
row := make([]string, 6)
row[0] = pad(fmt.Sprintf(sdk.Round(duration, time.Second).String()), 9)
row[0] = pad(sdk.Round(duration, time.Second).String(), 9)
row[2] = pad(run, 7)
row[3] = fmt.Sprintf("%s", pad(prj+"/"+workflow+"/"+node, 40))
row[3] = pad(prj+"/"+workflow+"/"+node, 40)
if status == sdk.StatusBuilding {
row[1] = pad(fmt.Sprintf(" %s.%s ", executedJob.WorkerName, executedJob.WorkerID), 27)
@@ -95,24 +95,6 @@ func (widget *Widget) generateQueueJobLine(id int64, parameters []sdk.Parameter,
return fmt.Sprintf("[%s]%s [grey]%s %s %s %s\n", c, row[0], row[1], row[2], row[3], row[4])
}
func getStatusColor(status string) string {
switch status {
case sdk.StatusSuccess:
return "green"
case sdk.StatusBuilding, sdk.StatusWaiting:
return "blue"
case sdk.StatusFail:
return "red"
case sdk.StatusStopped:
return "red"
case sdk.StatusSkipped:
return "grey"
case sdk.StatusDisabled:
return "grey"
}
return "red"
}
func pad(t string, size int) string {
if len(t) > size {
return t[0:size-3] + "..."

View File

@@ -17,7 +17,6 @@ type Widget struct {
view.KeyboardWidget
view.TextWidget
jobs []sdk.WorkflowNodeJobRun
filters []string
client cdsclient.Interface

View File

@@ -103,19 +103,3 @@ func getStatusColor(status string) string {
}
return "red"
}
func pad(t string, size int) string {
if len(t) > size {
return t[0:size-3] + "..."
}
return t + strings.Repeat(" ", size-len(t))
}
func getVarsInPbj(key string, ps []sdk.Parameter) string {
for _, p := range ps {
if p.Name == key {
return p.Value
}
}
return ""
}

View File

@@ -17,7 +17,6 @@ type Widget struct {
view.KeyboardWidget
view.TextWidget
jobs []sdk.WorkflowNodeJobRun
filters []string
client cdsclient.Interface
@@ -119,19 +118,6 @@ func (widget *Widget) HelpText() string {
/* -------------------- Unexported Functions -------------------- */
func (widget *Widget) currentFilter() string {
if len(widget.filters) == 0 {
return sdk.StatusWaiting
}
if widget.Idx < 0 || widget.Idx >= len(widget.filters) {
widget.Idx = 0
return sdk.StatusWaiting
}
return widget.filters[widget.Idx]
}
func (widget *Widget) openWorkflow() {
currentSelection := widget.View.GetHighlights()
if widget.Selected >= 0 && currentSelection[0] != "" {