Add TotalProgress field to State

Author: bougou

task.go

@@ -20,11 +20,12 @@ type Task struct {
 
 // State contains information about rsync process
 type State struct {
-	Remain   int     `json:"remain"`
-	Total    int     `json:"total"`
-	Speed    string  `json:"speed"`
-	Progress float64 `json:"progress"`
-	Filename string  `json:"filename"`
+	TotalProgress int     `json:"total_progress"`
+	Remain        int     `json:"remain"`
+	Total         int     `json:"total"`
+	Speed         string  `json:"speed"`
+	Progress      float64 `json:"progress"`
+	Filename      string  `json:"filename"`
 }
 
 // Log contains raw stderr and stdout outputs
@@ -121,6 +122,7 @@ func processStdout(wg *sync.WaitGroup, task *Task, stdout io.Reader) {
 
 	progressMatcher := newMatcher(`\(.+-chk=(\d+.\d+)`)
 	speedMatcher := newMatcher(`(\d+\.\d+.{2}\/s)`)
+	totalProgressMatcher := newMatcher(`(\d+)%`)
 
 	// Extract data from strings:
 	//         999,999 99%  999.99kB/s    0:00:59 (xfr#9, to-chk=999/9999)
@@ -139,6 +141,9 @@ func processStdout(wg *sync.WaitGroup, task *Task, stdout io.Reader) {
 			task.state.Speed = getTaskSpeed(speedMatcher.ExtractAllStringSubmatch(logStr, 2))
 		}
 
+		if totalProgressMatcher.Match(logStr) {
+			task.state.TotalProgress = getTaskTotalProgress(totalProgressMatcher.Extract(logStr))
+		}
 		if isFilename(logStr) {
 			task.state.Filename = logStr
 		}
@@ -157,6 +162,11 @@ func processStderr(wg *sync.WaitGroup, task *Task, stderr io.Reader) {
 	}
 }
 
+func getTaskTotalProgress(totalProgress string) int {
+	total, _ := strconv.Atoi(totalProgress)
+	return total
+}
+
 func getTaskProgress(remTotalString string) (int, int) {
 	const remTotalSeparator = "/"
 	const numbersCount = 2

task_test.go

@@ -39,3 +39,11 @@ func TestTaskSpeedParse(t *testing.T) {
 	speed := getTaskSpeed(speedMatcher.ExtractAllStringSubmatch(taskInfoString, 2))
 	assert.Equal(t, "999.99kB/s", speed)
 }
+
+func TestTaskTotalProgress(t *testing.T) {
+	totalProgressMatcher := newMatcher(`(\d+)%`)
+	const taskInfoString = `123,456 78%  87.65kB/s    0:00:59 (xfr#9, to-chk=999/9999)`
+	total := getTaskTotalProgress(totalProgressMatcher.Extract(taskInfoString))
+
+	assert.Equal(t, total, 78)
+}