add speed to progress bar (#25)

Co-authored-by: Tanq16 <[email protected]>

Author: Tanq16

internal/downloader.go

@@ -119,7 +119,7 @@ func BatchDownload(entries []utils.DownloadEntry, numLinks, connectionsPerLink i
 
 					if err == utils.ErrRangeRequestsNotSupported {
 						outputMgr.SetStatus(entryFunctionId, "warning")
-						outputMgr.SetMessage(entryFunctionId, fmt.Sprintf("Downloading %s with 1 connection (range requests unsupported)", entry.OutputPath))
+						outputMgr.SetMessage(entryFunctionId, fmt.Sprintf("[range unsupported] Downloading %s with 1-thread (%s)", entry.OutputPath, utils.FormatBytes(uint64(fileSize))))
 					} else if err != nil {
 						outputMgr.ReportError(entryFunctionId, fmt.Errorf("error getting file size for %s: %v", entry.OutputPath, err))
 						outputMgr.SetMessage(entryFunctionId, fmt.Sprintf("Error getting file size for %s", entry.OutputPath))
@@ -136,8 +136,8 @@ func BatchDownload(entries []utils.DownloadEntry, numLinks, connectionsPerLink i
 						var totalDownloaded int64
 						for bytesDownloaded := range progCh {
 							totalDownloaded += bytesDownloaded
-							progressString := fmt.Sprintf("%s / %s", utils.FormatBytes(uint64(totalDownloaded)), utils.FormatBytes(uint64(totalFileSize)))
-							outputMgr.AddProgressBarToStream(funcId, totalDownloaded, totalFileSize, progressString)
+							// progressString := , utils.FormatBytes(uint64(totalFileSize)))
+							outputMgr.AddProgressBarToStream(funcId, totalDownloaded, totalFileSize, utils.FormatBytes(uint64(totalDownloaded)))
 						}
 					}(entryFunctionId, fileSize, progressCh)
 
@@ -268,8 +268,8 @@ func BatchDownload(entries []utils.DownloadEntry, numLinks, connectionsPerLink i
 						var totalDownloaded int64
 						for bytesDownloaded := range progCh {
 							totalDownloaded += bytesDownloaded
-							progressString := fmt.Sprintf("%s / %s", utils.FormatBytes(uint64(totalDownloaded)), utils.FormatBytes(uint64(totalFileSize)))
-							outputMgr.AddProgressBarToStream(entryFunctionId, totalDownloaded, totalFileSize, progressString)
+							// progressString := fmt.Sprintf("%s / %s", , utils.FormatBytes(uint64(totalFileSize)))
+							outputMgr.AddProgressBarToStream(entryFunctionId, totalDownloaded, totalFileSize, utils.FormatBytes(uint64(totalDownloaded)))
 						}
 					}(entry.OutputPath, size, progressCh)
 
@@ -393,6 +393,7 @@ func BatchDownload(entries []utils.DownloadEntry, numLinks, connectionsPerLink i
 						totoalJobSize += s3Job.Size
 					}
 					close(s3JobsCh)
+					outputMgr.SetMessage(entryFunctionId, fmt.Sprintf("Downloading S3 key %s (%s)", entry.URL, utils.FormatBytes(uint64(totoalJobSize))))
 
 					// Internal goroutine to forward progress updates to the manager
 					progressWg.Add(1)
@@ -401,8 +402,8 @@ func BatchDownload(entries []utils.DownloadEntry, numLinks, connectionsPerLink i
 						var totalDownloaded int64
 						for bytesDownloaded := range progCh {
 							totalDownloaded += bytesDownloaded
-							progressString := fmt.Sprintf("%s / %s", utils.FormatBytes(uint64(totalDownloaded)), utils.FormatBytes(uint64(totalFileSize)))
-							outputMgr.AddProgressBarToStream(entryFunctionId, totalDownloaded, totalFileSize, progressString)
+							// progressString := fmt.Sprintf("%s / %s", utils.FormatBytes(uint64(totalDownloaded)), utils.FormatBytes(uint64(totalFileSize)))
+							outputMgr.AddProgressBarToStream(entryFunctionId, totalDownloaded, totalFileSize, utils.FormatBytes(uint64(totalDownloaded)))
 						}
 					}(entry.OutputPath, totoalJobSize, progressCh)
 
@@ -488,9 +489,9 @@ func BatchDownload(entries []utils.DownloadEntry, numLinks, connectionsPerLink i
 						}
 						entry.OutputPath = config.OutputPath
 					}
-					outputMgr.SetMessage(entryFunctionId, fmt.Sprintf("Downloading GDrive file %s", entry.OutputPath))
 					fileSize := metadata["size"].(string)
 					fileSizeInt, _ := strconv.ParseInt(fileSize, 10, 64)
+					outputMgr.SetMessage(entryFunctionId, fmt.Sprintf("Downloading GDrive file %s (%s)", entry.OutputPath, utils.FormatBytes(uint64(fileSizeInt))))
 
 					var progressWg sync.WaitGroup
 					progressWg.Add(1)
@@ -499,8 +500,8 @@ func BatchDownload(entries []utils.DownloadEntry, numLinks, connectionsPerLink i
 						var totalDownloaded int64
 						for bytesDownloaded := range progCh {
 							totalDownloaded += bytesDownloaded
-							progressString := fmt.Sprintf("%s / %s", utils.FormatBytes(uint64(totalDownloaded)), utils.FormatBytes(uint64(filesize)))
-							outputMgr.AddProgressBarToStream(entryFunctionId, totalDownloaded, filesize, progressString)
+							// progressString := fmt.Sprintf("%s / %s", utils.FormatBytes(uint64(totalDownloaded)), utils.FormatBytes(uint64(filesize)))
+							outputMgr.AddProgressBarToStream(entryFunctionId, totalDownloaded, filesize, utils.FormatBytes(uint64(totalDownloaded)))
 						}
 					}(entry.OutputPath, fileSizeInt, progressCh)
 

utils/functions.go

@@ -217,6 +217,15 @@ func FormatBytes(bytes uint64) string {
 	return fmt.Sprintf("%.2f %cB", float64(bytes)/float64(div), "KMGTPE"[exp])
 }
 
+func FormatSpeed(bytes int64, elapsed float64) string {
+	if elapsed == 0 {
+		return "0 B/s"
+	}
+	bps := float64(bytes) / elapsed
+	formatted := FormatBytes(uint64(bps))
+	return formatted[:len(formatted)-1] + "B/s" // Slice off "B" and add "B/s"
+}
+
 func Clean(outputPath string) error {
 	tempDir := filepath.Join(filepath.Dir(outputPath), ".danzo-temp")
 	if err := os.RemoveAll(tempDir); err != nil {

utils/output-manager.go

@@ -413,7 +413,8 @@ func (m *Manager) AddProgressBarToStream(name string, outof, final int64, text s
 	defer m.mutex.Unlock()
 	if info, exists := m.outputs[name]; exists {
 		progressBar := PrintProgressBar(max(0, outof), final, 30)
-		display := progressBar + debugStyle.Render(text)
+		elapsed := time.Since(info.StartTime).Round(time.Second).Seconds()
+		display := fmt.Sprintf("%s%s %s %s", progressBar, debugStyle.Render(text), StyleSymbols["bullet"], debugStyle.Render(FormatSpeed(outof, elapsed)))
 		info.StreamLines = []string{display} // Set as only stream so nothing else is displayed
 		info.LastUpdated = time.Now()
 	}