Ensure that a 'Completed' download progress is always sent

cmaglie · cmaglie · commit c1f7fd5b7e76 · 2022-09-07T15:26:43.000+02:00
diff --git a/arduino/httpclient/httpclient.go b/arduino/httpclient/httpclient.go
@@ -50,6 +50,7 @@ func DownloadFile(path *paths.Path, URL string, label string, downloadCB rpc.Dow
 		Url:       d.URL,
 		TotalSize: d.Size(),
 	})
+	defer downloadCB(&rpc.DownloadProgress{Completed: true})
 
 	err = d.RunAndPoll(func(downloaded int64) {
 		downloadCB(&rpc.DownloadProgress{Downloaded: downloaded})
@@ -63,7 +64,6 @@ func DownloadFile(path *paths.Path, URL string, label string, downloadCB rpc.Dow
 		return &arduino.FailedDownloadError{Message: tr("Server responded with: %s", d.Resp.Status)}
 	}
 
-	downloadCB(&rpc.DownloadProgress{Completed: true})
 	return nil
 }
 

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ func DownloadFile(path *paths.Path, URL string, label string, downloadCB rpc.Dow`
`50`	`50`	`Url: d.URL,`
`51`	`51`	`TotalSize: d.Size(),`
`52`	`52`	`})`
	`53`	`+ defer downloadCB(&rpc.DownloadProgress{Completed: true})`
`53`	`54`
`54`	`55`	`err = d.RunAndPoll(func(downloaded int64) {`
`55`	`56`	`downloadCB(&rpc.DownloadProgress{Downloaded: downloaded})`
`@@ -63,7 +64,6 @@ func DownloadFile(path *paths.Path, URL string, label string, downloadCB rpc.Dow`
`63`	`64`	`return &arduino.FailedDownloadError{Message: tr("Server responded with: %s", d.Resp.Status)}`
`64`	`65`	`}`
`65`	`66`
`66`		`- downloadCB(&rpc.DownloadProgress{Completed: true})`
`67`	`67`	`return nil`
`68`	`68`	`}`
`69`	`69`