yesBad/proton-bridge
1
0
Fork 0
Code Actions Activity

Percentage available on progress count struct

Browse Source
This commit is contained in:
Michal Horejsek
2020-11-04 13:57:23 +01:00
parent 5b7eabe21a
commit a40018cdf9
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/frontend/qt-ie/frontend.go
View File

@ -344,7 +344,7 @@ func (f *FrontendQt) setProgressManager(progress *transfer.Progress) {
f.Qml.SetProgressFails(int(counts.Failed)) f.Qml.SetProgressFails(int(counts.Failed))
f.Qml.SetProgressDescription(progress.PauseReason()) f.Qml.SetProgressDescription(progress.PauseReason())
if counts.Total > 0 { if counts.Total > 0 {
newProgress := float32(counts.Imported+counts.Skipped+counts.Failed) / float32(counts.Total) newProgress := counts.Progress()
if newProgress >= 0 && newProgress != f.Qml.Progress() { if newProgress >= 0 && newProgress != f.Qml.Progress() {
f.Qml.SetProgress(newProgress) f.Qml.SetProgress(newProgress)
f.Qml.ProgressChanged(newProgress) f.Qml.ProgressChanged(newProgress)

7
internal/transfer/progress_counts.go
View File

@ -26,3 +26,10 @@ type ProgressCounts struct {
Added, Added,
Total uint Total uint
} }
// Progress returns ratio between processed messages (fully imported, skipped
// and failed ones) and total number of messages as percentage (0 - 1).
func (c *ProgressCounts) Progress() float32 {
progressed := c.Imported + c.Skipped + c.Failed
return float32(progressed) / float32(c.Total)
}