marc/scotty
1
0
Fork 0
mirror of https://git.sr.ht/~phw/scotty synced 2025-05-31 10:58:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

For import progress show actually processed and total count

Browse source
This commit is contained in:
Philipp Wolfer 2025-05-05 17:39:47 +02:00
parent b8e6ccffdb
commit 17cee9cb8b
No known key found for this signature in database
GPG key ID: 8FDF744D4919943B
1 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

20
internal/cli/progress.go
View file

@ -51,8 +51,8 @@ func setupProgressBars(updateChan chan models.TransferProgress) progressBarUpdat
u := progressBarUpdater{
wg: wg,
progress: p,
exportBar: initProgressBar(p, i18n.Tr("exporting")),
importBar: initProgressBar(p, i18n.Tr("importing")),
exportBar: initExportProgressBar(p, i18n.Tr("exporting")),
importBar: initImportProgressBar(p, i18n.Tr("importing")),
updateChan: updateChan,
}
@ -112,8 +112,18 @@ func (u *progressBarUpdater) updateImportProgress(progress *models.Progress) {
bar.SetTotal(progress.Total, progress.Completed)
}
func initProgressBar(p *mpb.Progress, name string) *mpb.Bar {
func initExportProgressBar(p *mpb.Progress, name string) *mpb.Bar {
return initProgressBar(p, name,
decor.EwmaETA(decor.ET_STYLE_GO, 0, decor.WC{C: decor.DSyncWidth}))
}
func initImportProgressBar(p *mpb.Progress, name string) *mpb.Bar {
return initProgressBar(p, name, decor.Counters(0, "%d / %d"))
}
func initProgressBar(p *mpb.Progress, name string, progressDecorator decor.Decorator) *mpb.Bar {
green := color.New(color.FgGreen).SprintFunc()
red := color.New(color.FgHiRed, color.Bold).SprintFunc()
return p.New(0,
mpb.BarStyle(),
mpb.PrependDecorators(
@ -127,8 +137,8 @@ func initProgressBar(p *mpb.Progress, name string) *mpb.Bar {
mpb.AppendDecorators(
decor.OnComplete(
decor.OnAbort(
decor.EwmaETA(decor.ET_STYLE_GO, 0, decor.WC{C: decor.DSyncWidth}),
i18n.Tr("aborted"),
progressDecorator,
red(i18n.Tr("aborted")),
),
i18n.Tr("done"),
),