Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0f27d75359 | |||
| 8fc28f592d |
@@ -2,6 +2,7 @@ package app
|
|||||||
|
|
||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"path/filepath"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
"gitea.mixdep.ru/mix/gosentry/src/domain"
|
"gitea.mixdep.ru/mix/gosentry/src/domain"
|
||||||
@@ -32,6 +33,19 @@ func EventText(e domain.RunRecord) string {
|
|||||||
return fmt.Sprintf("%s %s %s %s %s", e.Time, trigger, e.JobName, e.State, e.Detail)
|
return fmt.Sprintf("%s %s %s %s %s", e.Time, trigger, e.JobName, e.State, e.Detail)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// EventLine formats a run record as a compact single line for the jobs log
|
||||||
|
// view, using only the base name of the log file instead of the full path.
|
||||||
|
func EventLine(e domain.RunRecord) string {
|
||||||
|
trigger := e.Trigger
|
||||||
|
if trigger == "" {
|
||||||
|
trigger = "Unknown"
|
||||||
|
}
|
||||||
|
if e.LogFile != "" {
|
||||||
|
return fmt.Sprintf("%s %s %s %s %s %s", e.Time, trigger, e.JobName, e.State, e.Detail, filepath.Base(e.LogFile))
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("%s %s %s %s %s", e.Time, trigger, e.JobName, e.State, e.Detail)
|
||||||
|
}
|
||||||
|
|
||||||
// DisplayFolder formats a job's folder for display: "(No folder)" if empty,
|
// DisplayFolder formats a job's folder for display: "(No folder)" if empty,
|
||||||
// else the trimmed folder name.
|
// else the trimmed folder name.
|
||||||
func DisplayFolder(folder string) string {
|
func DisplayFolder(folder string) string {
|
||||||
|
|||||||
+6
-2
@@ -77,9 +77,13 @@ func newJobsView(w fyne.Window, svc *app.Service) (fyne.CanvasObject, func()) {
|
|||||||
selectedLogs := append([]event(nil), selectedRuntime.Logs...)
|
selectedLogs := append([]event(nil), selectedRuntime.Logs...)
|
||||||
jobLogs := widget.NewList(
|
jobLogs := widget.NewList(
|
||||||
func() int { return len(selectedLogs) },
|
func() int { return len(selectedLogs) },
|
||||||
func() fyne.CanvasObject { return widget.NewLabel("log") },
|
func() fyne.CanvasObject {
|
||||||
|
l := widget.NewLabel("log")
|
||||||
|
l.Wrapping = fyne.TextTruncate
|
||||||
|
return l
|
||||||
|
},
|
||||||
func(id widget.ListItemID, item fyne.CanvasObject) {
|
func(id widget.ListItemID, item fyne.CanvasObject) {
|
||||||
item.(*widget.Label).SetText(app.EventText(selectedLogs[id]))
|
item.(*widget.Label).SetText(app.EventLine(selectedLogs[id]))
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user