obitools/obitools4
2
0
Fork 0
mirror of https://github.com/metabarcoding/obitools4.git synced 2026-03-25 13:30:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add progress bar configuration and conditional display

Browse Source 
This commit introduces a new configuration module `obidefault` to manage progress bar settings, allowing users to disable progress bars via a `--no-progressbar` option. It updates various packages to conditionally display progress bars based on this new configuration, improving user experience by providing control over progress bar output. The changes also include improvements to progress bar handling in several packages, ensuring they are only displayed when appropriate (e.g., when stderr is a terminal and stdout is not piped).
This commit is contained in:
Eric Coissac
2026-02-08 16:13:27 +01:00
parent b2d16721f0
commit 1a28d5ed64
11 changed files with 193 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
pkg/obicorazick/worker.go
View File

@@ -14,35 +14,39 @@ func AhoCorazickWorker(slot string, patterns []string) obiseq.SeqWorker {
sizebatch:=10000000
nmatcher := len(patterns) / sizebatch + 1
log.Infof("Building AhoCorasick %d matcher for %d patterns in slot %s",
log.Infof("Building AhoCorasick %d matcher for %d patterns in slot %s",
nmatcher, len(patterns), slot)
if nmatcher == 0 {
log.Errorln("No patterns provided")
}
matchers := make([]*ahocorasick.Matcher, nmatcher)
ieme := make(chan int)
ieme := make(chan int)
mutex := &sync.WaitGroup{}
npar := min(obidefault.ParallelWorkers(), nmatcher)
mutex.Add(npar)
pbopt := make([]progressbar.Option, 0, 5)
pbopt = append(pbopt,
progressbar.OptionSetWriter(os.Stderr),
progressbar.OptionSetWidth(15),
progressbar.OptionShowCount(),
progressbar.OptionShowIts(),
progressbar.OptionSetDescription("Building AhoCorasick matcher..."),
)
var bar *progressbar.ProgressBar
if obidefault.ProgressBar() {
pbopt := make([]progressbar.Option, 0, 5)
pbopt = append(pbopt,
progressbar.OptionSetWriter(os.Stderr),
progressbar.OptionSetWidth(15),
progressbar.OptionShowCount(),
progressbar.OptionShowIts(),
progressbar.OptionSetDescription("Building AhoCorasick matcher..."),
)
bar := progressbar.NewOptions(nmatcher, pbopt...)
bar.Add(0)
bar = progressbar.NewOptions(nmatcher, pbopt...)
}
builder := func() {
for i := range ieme {
for i := range ieme {
matchers[i] = ahocorasick.CompileStrings(patterns[i*sizebatch:min((i+1)*sizebatch,len(patterns))])
bar.Add(1)
if bar != nil {
bar.Add(1)
}
}
mutex.Done()
}