mirror of
https://git.sr.ht/~phw/scotty
synced 2025-05-09 18:07:03 +02:00
For import progress show actually processed and total count
This commit is contained in:
parent
b8e6ccffdb
commit
17cee9cb8b
1 changed files with 15 additions and 5 deletions
|
@ -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"),
|
||||
),
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue