Improve download progress reporting

Author: Xpl0itU

cmd/WiiUDownloader/main.go

@@ -85,6 +85,7 @@ func main() {
 
 	client := &http.Client{
 		Transport: &http.Transport{
+			Proxy: http.ProxyFromEnvironment,
 			DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) {
 				dialer := &net.Dialer{
 					Timeout:   30 * time.Second,

cmd/WiiUDownloader/progressWindow.go

@@ -79,9 +79,17 @@ func (pw *ProgressWindow) SetGameTitle(title string) {
 }
 
 func (pw *ProgressWindow) UpdateDownloadProgress(downloaded int64, filename string) {
+	if downloaded == 0 {
+		return
+	}
 	glib.IdleAdd(func() bool {
 		pw.cancelButton.SetSensitive(true)
 		pw.progressMutex.Lock()
+		if _, ok := pw.progressPerFile[filename]; !ok {
+			// This file was already marked as done, don't re-add it
+			pw.progressMutex.Unlock()
+			return false
+		}
 		pw.progressPerFile[filename] += downloaded
 		total := pw.totalDownloaded
 		for _, v := range pw.progressPerFile {

downloader.go

@@ -185,6 +185,7 @@ func downloadFile(progressReporter ProgressReporter, client *http.Client, downlo
 
 		_, err = io.Copy(writerProgress, watchdog)
 		timer.Stop()
+		writerProgress.Close()
 
 		if err != nil {
 			file.Close()
@@ -197,6 +198,7 @@ func downloadFile(progressReporter ProgressReporter, client *http.Client, downlo
 		}
 		file.Close()
 		resp.Body.Close()
+		progressReporter.MarkFileAsDone(filepath.Base(dstPath))
 		break
 	}
 

writerProgress.go

@@ -14,16 +14,10 @@ type WriterProgress struct {
 }
 
 func newWriterProgress(writer io.Writer, progressReporter ProgressReporter, filename string) *WriterProgress {
-	return &WriterProgress{writer: writer, progressReporter: progressReporter, updateProgressTicker: time.NewTicker(25 * time.Millisecond), downloadToReport: 0, filename: filename}
+	return &WriterProgress{writer: writer, progressReporter: progressReporter, updateProgressTicker: time.NewTicker(100 * time.Millisecond), downloadToReport: 0, filename: filename}
 }
 
 func (r *WriterProgress) Write(p []byte) (n int, err error) {
-	select {
-	case <-r.updateProgressTicker.C:
-		r.progressReporter.UpdateDownloadProgress(r.downloadToReport, r.filename)
-		r.downloadToReport = 0
-	default:
-	}
 	if r.progressReporter.Cancelled() {
 		return 0, nil
 	}
@@ -32,10 +26,23 @@ func (r *WriterProgress) Write(p []byte) (n int, err error) {
 		return n, err
 	}
 	r.downloadToReport += int64(n)
+
+	select {
+	case <-r.updateProgressTicker.C:
+		if r.downloadToReport > 0 {
+			r.progressReporter.UpdateDownloadProgress(r.downloadToReport, r.filename)
+			r.downloadToReport = 0
+		}
+	default:
+	}
 	return n, err
 }
 
 func (r *WriterProgress) Close() error {
 	r.updateProgressTicker.Stop()
+	if r.downloadToReport > 0 {
+		r.progressReporter.UpdateDownloadProgress(r.downloadToReport, r.filename)
+		r.downloadToReport = 0
+	}
 	return nil
 }