ConsoleDownloadProgressHandler should print progress as well. Refactor and rephrase.

Author: MMulthaupt

cmd/launcher/gui/gui_progress_handler.go

@@ -83,8 +83,8 @@ func (handler *GuiDownloadProgressHandler) HandleBadHttpResponse(fromURL string,
 	NotifyProblem(fmt.Sprintf("HTTP Status %d", code), false)
 }
 
-func (handler *GuiDownloadProgressHandler) HandleReadError(fromURL string, err error, firstByteIndex int64) {
-	log.Warnf("GET %s interrupted: %v. Continuing from byte %d", fromURL, err, firstByteIndex)
+func (handler *GuiDownloadProgressHandler) HandleReadError(fromURL string, err error, receivedByteCount int64) {
+	log.Warnf("GET %s interrupted after receiving %d bytes: %v.", fromURL, receivedByteCount, err)
 	handler.progressMutex.Lock()
 	defer handler.progressMutex.Unlock()
 	handler.problemUrl = fromURL

pkg/fetching/downloader_test.go

@@ -39,7 +39,7 @@ func (handler *ErrorRecordingHandler) HandleBadHttpResponse(fromURL string, code
 	handler.ErrChan <- fmt.Errorf("HTTP %d: %s", code, http.StatusText(code))
 }
 
-func (handler *ErrorRecordingHandler) HandleReadError(fromURL string, err error, firstByteIndex int64) {
+func (handler *ErrorRecordingHandler) HandleReadError(fromURL string, err error, receivedByteCount int64) {
 	handler.ErrChan <- err
 }
 

pkg/fetching/handler.go

@@ -47,8 +47,8 @@ func (handler *ConsoleDownloadProgressHandler) HandleBadHttpResponse(fromURL str
 	os.Exit(1)
 }
 
-func (handler *ConsoleDownloadProgressHandler) HandleReadError(fromURL string, err error, firstByteIndex int64) {
-	log.Errorf("Could not copy bytes from \"%s\": %v", fromURL, err)
+func (handler *ConsoleDownloadProgressHandler) HandleReadError(fromURL string, err error, receivedByteCount int64) {
+	log.Errorf("Could not copy bytes from \"%s\" (failed after %d bytes): %v", fromURL, receivedByteCount, err)
 	os.Exit(1)
 }
 
@@ -73,5 +73,5 @@ func (handler *EmptyHandler) HandleHttpGetError(fromURL string, err error) {
 func (handler *EmptyHandler) HandleBadHttpResponse(fromURL string, code int) {
 }
 
-func (handler *EmptyHandler) HandleReadError(fromURL string, err error, firstByteIndex int64) {
+func (handler *EmptyHandler) HandleReadError(fromURL string, err error, receivedByteCount int64) {
 }