tag v0.165.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.165.0 ---------------- * distro: move rhel9 into a generic distro (osbuild/images#1645) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger * Revert "distro: drop `ImageType.BasePartitionTable()`" (osbuild/images#1691) * Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza * Update dependencies 2025-07-20 (osbuild/images#1675) * Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger * defs: add missing `bootstrap_containers` (osbuild/images#1679) * Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza * disk: handle adding `PReP` partition on PPC64/s390x (HMS-8884) (osbuild/images#1681) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger * distro: bring per-distro checkOptions back (osbuild/images#1678) * Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza * distro: cleanups in the pkg/distro/generic area (osbuild/images#1686) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger * distro: move rhel8 into a generic distro (osbuild/images#1643) * Author: Michael Vogt, Reviewers: Nobody * distro: small followups for PR#1682 (osbuild/images#1689) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger, Tomáš Hozza * distro: unify transform/match into a single concept (osbuild/images#1682) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Tomáš Hozza * distros: de-duplicate runner build packages for centos10 (osbuild/images#1680) * Author: Michael Vogt, Reviewers: Simon de Vlieger, Tomáš Hozza * github: disable Go dep updates through dependabot (osbuild/images#1683) * Author: Achilleas Koutsou, Reviewers: Simon de Vlieger, Tomáš Hozza * repos: include almalinux 9.6 (osbuild/images#1677) * Author: Simon de Vlieger, Reviewers: Lukáš Zapletal, Tomáš Hozza * rhel9: wsl distribution config (osbuild/images#1694) * Author: Simon de Vlieger, Reviewers: Michael Vogt, Sanne Raymaekers * test/manifests/all-customizations: don't embed local file via URI (osbuild/images#1684) * Author: Tomáš Hozza, Reviewers: Achilleas Koutsou, Brian C. Lane — Somewhere on the Internet, 2025-07-28 --- tag v0.166.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.166.0 ---------------- * customizations/subscription: conditionally enable semanage call (HMS-8866) (osbuild/images#1673) * Author: Sanne Raymaekers, Reviewers: Achilleas Koutsou, Michael Vogt * distro/rhel-10: versionlock shim-x64 in the azure-cvm image (osbuild/images#1697) * Author: Achilleas Koutsou, Reviewers: Michael Vogt, Simon de Vlieger * manifestmock: move container/pkg/commit mocks into helper (osbuild/images#1700) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger * rhel9: `vagrant-libvirt`, `vagrant-virtualbox` (osbuild/images#1693) * Author: Simon de Vlieger, Reviewers: Michael Vogt, Sanne Raymaekers * rhel{9,10}: centos WSL refinement (HMS-8922) (osbuild/images#1690) * Author: Simon de Vlieger, Reviewers: Ondřej Budai, Sanne Raymaekers, Tomáš Hozza — Somewhere on the Internet, 2025-07-29 --- tag v0.167.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.167.0 ---------------- * RHEL/Azure: drop obsolete WAAgentConfig keys [RHEL-93894] and remove loglevel kernel option [RHEL-102372] (osbuild/images#1611) * Author: Achilleas Koutsou, Reviewers: Michael Vogt, Ondřej Budai, Sanne Raymaekers * Update dependencies 2025-07-27 (osbuild/images#1699) * Author: SchutzBot, Reviewers: Achilleas Koutsou, Simon de Vlieger * distro/rhel9: set default_kernel to kernel-uki-virt (osbuild/images#1704) * Author: Achilleas Koutsou, Reviewers: Ondřej Budai, Simon de Vlieger * distro: drop legacy loaders and update tests (osbuild/images#1687) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Tomáš Hozza * distro: fix issues with yaml distro definitions and enable yaml checks (osbuild/images#1702) * Author: Achilleas Koutsou, Reviewers: Michael Vogt, Ondřej Budai, Simon de Vlieger — Somewhere on the Internet, 2025-07-30 --- tag v0.168.0 Tagger: imagebuilder-bot <imagebuilder-bots+imagebuilder-bot@redhat.com> Changes with 0.168.0 ---------------- * distro: fix bug in variable substitution for static distros (osbuild/images#1710) * Author: Michael Vogt, Reviewers: Achilleas Koutsou, Simon de Vlieger * rhel{9,10}: azure for non-RHEL (HMS-8949) (osbuild/images#1707) * Author: Simon de Vlieger, Reviewers: Achilleas Koutsou, Michael Vogt — Somewhere on the Internet, 2025-07-30 ---
221 lines
5.5 KiB
Go
221 lines
5.5 KiB
Go
package mpb
|
|
|
|
import (
|
|
"bytes"
|
|
"io"
|
|
|
|
"github.com/vbauerster/mpb/v8/decor"
|
|
)
|
|
|
|
// BarOption is a func option to alter default behavior of a bar.
|
|
type BarOption func(*bState)
|
|
|
|
// PrependDecorators let you inject decorators to the bar's left side.
|
|
func PrependDecorators(decorators ...decor.Decorator) BarOption {
|
|
var group []decor.Decorator
|
|
for _, decorator := range decorators {
|
|
if decorator != nil {
|
|
group = append(group, decorator)
|
|
}
|
|
}
|
|
return func(s *bState) {
|
|
s.decorGroups[0] = group
|
|
}
|
|
}
|
|
|
|
// AppendDecorators let you inject decorators to the bar's right side.
|
|
func AppendDecorators(decorators ...decor.Decorator) BarOption {
|
|
var group []decor.Decorator
|
|
for _, decorator := range decorators {
|
|
if decorator != nil {
|
|
group = append(group, decorator)
|
|
}
|
|
}
|
|
return func(s *bState) {
|
|
s.decorGroups[1] = group
|
|
}
|
|
}
|
|
|
|
// BarID sets bar id.
|
|
func BarID(id int) BarOption {
|
|
return func(s *bState) {
|
|
s.id = id
|
|
}
|
|
}
|
|
|
|
// BarWidth sets bar width independent of the container.
|
|
func BarWidth(width int) BarOption {
|
|
return func(s *bState) {
|
|
s.reqWidth = width
|
|
}
|
|
}
|
|
|
|
// BarQueueAfter puts this (being constructed) bar into the queue.
|
|
// BarPriority will be inherited from the argument bar.
|
|
// When argument bar completes or aborts queued bar replaces its place.
|
|
func BarQueueAfter(bar *Bar) BarOption {
|
|
return func(s *bState) {
|
|
s.waitBar = bar
|
|
}
|
|
}
|
|
|
|
// BarRemoveOnComplete removes both bar's filler and its decorators
|
|
// on complete event.
|
|
func BarRemoveOnComplete() BarOption {
|
|
return func(s *bState) {
|
|
s.rmOnComplete = true
|
|
}
|
|
}
|
|
|
|
// BarFillerClearOnComplete clears bar's filler on complete event.
|
|
// It's shortcut for BarFillerOnComplete("").
|
|
func BarFillerClearOnComplete() BarOption {
|
|
return BarFillerOnComplete("")
|
|
}
|
|
|
|
// BarFillerOnComplete replaces bar's filler with message, on complete event.
|
|
func BarFillerOnComplete(message string) BarOption {
|
|
return BarFillerMiddleware(func(base BarFiller) BarFiller {
|
|
return BarFillerFunc(func(w io.Writer, st decor.Statistics) error {
|
|
if st.Completed {
|
|
_, err := io.WriteString(w, message)
|
|
return err
|
|
}
|
|
return base.Fill(w, st)
|
|
})
|
|
})
|
|
}
|
|
|
|
// BarFillerClearOnAbort clears bar's filler on abort event.
|
|
// It's shortcut for BarFillerOnAbort("").
|
|
func BarFillerClearOnAbort() BarOption {
|
|
return BarFillerOnAbort("")
|
|
}
|
|
|
|
// BarFillerOnAbort replaces bar's filler with message, on abort event.
|
|
func BarFillerOnAbort(message string) BarOption {
|
|
return BarFillerMiddleware(func(base BarFiller) BarFiller {
|
|
return BarFillerFunc(func(w io.Writer, st decor.Statistics) error {
|
|
if st.Aborted {
|
|
_, err := io.WriteString(w, message)
|
|
return err
|
|
}
|
|
return base.Fill(w, st)
|
|
})
|
|
})
|
|
}
|
|
|
|
// BarFillerMiddleware provides a way to augment the underlying BarFiller.
|
|
func BarFillerMiddleware(middle func(BarFiller) BarFiller) BarOption {
|
|
if middle == nil {
|
|
return nil
|
|
}
|
|
return func(s *bState) {
|
|
s.filler = middle(s.filler)
|
|
}
|
|
}
|
|
|
|
// BarPriority sets bar's priority. Zero is highest priority, i.e. bar
|
|
// will be on top. This option isn't effective with `BarQueueAfter` option.
|
|
func BarPriority(priority int) BarOption {
|
|
return func(s *bState) {
|
|
s.priority = priority
|
|
}
|
|
}
|
|
|
|
// BarExtender extends bar with arbitrary lines. Provided BarFiller will be
|
|
// called at each render/flush cycle. Any lines written to the underlying
|
|
// io.Writer will extend the bar either in above (rev = true) or below
|
|
// (rev = false) direction.
|
|
func BarExtender(filler BarFiller, rev bool) BarOption {
|
|
if filler == nil {
|
|
return nil
|
|
}
|
|
if f, ok := filler.(BarFillerFunc); ok && f == nil {
|
|
return nil
|
|
}
|
|
fn := makeExtenderFunc(filler, rev)
|
|
return func(s *bState) {
|
|
s.extender = fn
|
|
}
|
|
}
|
|
|
|
func makeExtenderFunc(filler BarFiller, rev bool) extenderFunc {
|
|
buf := new(bytes.Buffer)
|
|
base := func(stat decor.Statistics, rows ...io.Reader) ([]io.Reader, error) {
|
|
err := filler.Fill(buf, stat)
|
|
if err != nil {
|
|
buf.Reset()
|
|
return rows, err
|
|
}
|
|
for {
|
|
line, err := buf.ReadBytes('\n')
|
|
if err != nil {
|
|
buf.Reset()
|
|
break
|
|
}
|
|
rows = append(rows, bytes.NewReader(line))
|
|
}
|
|
return rows, err
|
|
}
|
|
if !rev {
|
|
return base
|
|
}
|
|
return func(stat decor.Statistics, rows ...io.Reader) ([]io.Reader, error) {
|
|
rows, err := base(stat, rows...)
|
|
if err != nil {
|
|
return rows, err
|
|
}
|
|
for left, right := 0, len(rows)-1; left < right; left, right = left+1, right-1 {
|
|
rows[left], rows[right] = rows[right], rows[left]
|
|
}
|
|
return rows, err
|
|
}
|
|
}
|
|
|
|
// BarFillerTrim removes leading and trailing space around the underlying BarFiller.
|
|
func BarFillerTrim() BarOption {
|
|
return func(s *bState) {
|
|
s.trimSpace = true
|
|
}
|
|
}
|
|
|
|
// BarNoPop disables bar pop out of container. Effective when
|
|
// PopCompletedMode of container is enabled.
|
|
func BarNoPop() BarOption {
|
|
return func(s *bState) {
|
|
s.noPop = true
|
|
}
|
|
}
|
|
|
|
// BarOptional will return provided option only when cond is true.
|
|
func BarOptional(option BarOption, cond bool) BarOption {
|
|
if cond {
|
|
return option
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// BarOptOn will return provided option only when predicate evaluates to true.
|
|
func BarOptOn(option BarOption, predicate func() bool) BarOption {
|
|
if predicate() {
|
|
return option
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// BarFuncOptional will call option and return its value only when cond is true.
|
|
func BarFuncOptional(option func() BarOption, cond bool) BarOption {
|
|
if cond {
|
|
return option()
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// BarFuncOptOn will call option and return its value only when predicate evaluates to true.
|
|
func BarFuncOptOn(option func() BarOption, predicate func() bool) BarOption {
|
|
if predicate() {
|
|
return option()
|
|
}
|
|
return nil
|
|
}
|