Skip to content

Commit

Permalink
fix(tui): Fix logging marshaling/unmarshaling
Browse files Browse the repository at this point in the history
this was a cause of some weirdness before, should be nicer now
  • Loading branch information
ja-he committed Jul 2, 2024
1 parent c28c446 commit ea62bf9
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion internal/potatolog/potatolog.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
)

// LogEntry is a single log entry.
type LogEntry = map[string]string
type LogEntry = map[string]any

// GlobalMemoryLogReaderWriter is a global MemoryLogReaderWriter.
var GlobalMemoryLogReaderWriter = MemoryLogReaderWriter{
Expand Down
15 changes: 8 additions & 7 deletions internal/ui/panes/log_pane.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package panes

import (
"fmt"
"sort"

"github.com/ja-he/dayplan/internal/potatolog"
Expand Down Expand Up @@ -59,17 +60,17 @@ func (p *LogPane) Draw() {
}
return p.Stylesheet.LogDefault
}(),
util.PadCenter(entry["level"], levelLen),
util.PadCenter(fmt.Sprint(entry["level"]), levelLen),
)
x = extraDataIndentWidth

p.Renderer.DrawText(x, y+row, w, 1, p.Stylesheet.LogDefault, entry["message"])
x += len(entry["message"]) + 1
p.Renderer.DrawText(x, y+row, w, 1, p.Stylesheet.LogDefault, fmt.Sprint(entry["message"]))
x += len(fmt.Sprint(entry["message"])) + 1

p.Renderer.DrawText(x, y+row, w, 1, p.Stylesheet.LogEntryLocation, entry["caller"])
x += len(entry["caller"]) + 1
p.Renderer.DrawText(x, y+row, w, 1, p.Stylesheet.LogEntryLocation, fmt.Sprint(entry["caller"]))
x += len(fmt.Sprint(entry["caller"])) + 1

timeStr := entry["time"]
timeStr := fmt.Sprint(entry["time"])
p.Renderer.DrawText(x, y+row, w, 1, p.Stylesheet.LogEntryTime, timeStr)

x = extraDataIndentWidth
Expand All @@ -85,7 +86,7 @@ func (p *LogPane) Draw() {
for _, k := range keys {
if k != "caller" && k != "message" && k != "time" && k != "level" {
p.Renderer.DrawText(x, y+row, w, 1, p.Stylesheet.LogEntryTime, k)
p.Renderer.DrawText(x+len(k)+2, y+row, w, 1, p.Stylesheet.LogEntryLocation, entry[k])
p.Renderer.DrawText(x+len(k)+2, y+row, w, 1, p.Stylesheet.LogEntryLocation, fmt.Sprint(entry[k]))
row++
}
}
Expand Down

0 comments on commit ea62bf9

Please sign in to comment.