Refactor date and clock widgets to simplify periodic updates and remove redundant ticker logic.
This commit is contained in:
parent
4ac47429cd
commit
ec85f87377
@ -26,32 +26,23 @@ func createClock(ctx context.Context, _ terminalapi.Terminal, _ interface{}) wid
|
|||||||
widget := util.PanicOnErrorWithResult(segmentdisplay.New())
|
widget := util.PanicOnErrorWithResult(segmentdisplay.New())
|
||||||
|
|
||||||
go util.Periodic(ctx, util.RedrawInterval, func() error {
|
go util.Periodic(ctx, util.RedrawInterval, func() error {
|
||||||
ticker := time.NewTicker(1 * time.Second)
|
now := time.Now()
|
||||||
defer ticker.Stop()
|
nowStr := now.Format("15 04")
|
||||||
for {
|
parts := strings.Split(nowStr, " ")
|
||||||
select {
|
|
||||||
case <-ticker.C:
|
|
||||||
now := time.Now()
|
|
||||||
nowStr := now.Format("15 04")
|
|
||||||
parts := strings.Split(nowStr, " ")
|
|
||||||
|
|
||||||
spacer := " "
|
spacer := " "
|
||||||
if now.Second()%2 == 0 {
|
if now.Second()%2 == 0 {
|
||||||
spacer = ":"
|
spacer = ":"
|
||||||
}
|
|
||||||
chunks := []*segmentdisplay.TextChunk{
|
|
||||||
segmentdisplay.NewChunk(parts[0], segmentdisplay.WriteCellOpts(cell.FgColor(cell.ColorWhite))),
|
|
||||||
segmentdisplay.NewChunk(spacer),
|
|
||||||
segmentdisplay.NewChunk(parts[1], segmentdisplay.WriteCellOpts(cell.FgColor(cell.ColorWhite))),
|
|
||||||
}
|
|
||||||
if err := widget.Write(chunks, segmentdisplay.AlignHorizontal(align.HorizontalCenter), segmentdisplay.AlignVertical(align.VerticalBottom)); err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
case <-ctx.Done():
|
|
||||||
return nil
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
chunks := []*segmentdisplay.TextChunk{
|
||||||
|
segmentdisplay.NewChunk(parts[0], segmentdisplay.WriteCellOpts(cell.FgColor(cell.ColorWhite))),
|
||||||
|
segmentdisplay.NewChunk(spacer),
|
||||||
|
segmentdisplay.NewChunk(parts[1], segmentdisplay.WriteCellOpts(cell.FgColor(cell.ColorWhite))),
|
||||||
|
}
|
||||||
|
if err := widget.Write(chunks, segmentdisplay.AlignHorizontal(align.HorizontalCenter), segmentdisplay.AlignVertical(align.VerticalBottom)); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
return nil
|
||||||
})
|
})
|
||||||
return widget
|
return widget
|
||||||
}
|
}
|
||||||
|
|||||||
@ -22,20 +22,12 @@ func createDate(ctx context.Context, _ terminalapi.Terminal, _ interface{}) widg
|
|||||||
widget := util.PanicOnErrorWithResult(text.New())
|
widget := util.PanicOnErrorWithResult(text.New())
|
||||||
|
|
||||||
go util.Periodic(ctx, 1*time.Second, func() error {
|
go util.Periodic(ctx, 1*time.Second, func() error {
|
||||||
ticker := time.NewTicker(1 * time.Second)
|
now := time.Now()
|
||||||
defer ticker.Stop()
|
|
||||||
for {
|
|
||||||
select {
|
|
||||||
case <-ticker.C:
|
|
||||||
now := time.Now()
|
|
||||||
if err := widget.Write(now.Format("Monday 2.1.2006"), text.WriteReplace()); err != nil {
|
|
||||||
panic(err)
|
|
||||||
}
|
|
||||||
|
|
||||||
case <-ctx.Done():
|
if err := widget.Write(now.Format("Monday 2.1.2006"), text.WriteReplace()); err != nil {
|
||||||
return nil
|
return err
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
return nil
|
||||||
})
|
})
|
||||||
|
|
||||||
return widget
|
return widget
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user