@@ -38,8 +38,10 @@ import (
3838
3939 "github.com/cenkalti/backoff"
4040 "github.com/dustin/go-humanize"
41+ "github.com/k0kubun/go-ansi"
4142 "github.com/miolini/datacounter"
4243 "github.com/nightlyone/lockfile"
44+ "github.com/schollz/progressbar/v3"
4345 "golang.org/x/sync/errgroup"
4446
4547 "github.com/someone1/zfsbackup-go/backends"
@@ -320,6 +322,7 @@ func Backup(pctx context.Context, jobInfo *files.JobInfo) error {
320322
321323 // Prepare backends and setup plumbing
322324 for _ , destination := range jobInfo .Destinations {
325+ log .AppLogger .Infof ("Initializing backend for destination %s" , destination )
323326 backend , berr := prepareBackend (ctx , jobInfo , destination , uploadBuffer )
324327 if berr != nil {
325328 log .AppLogger .Errorf ("Could not initialize backend due to error - %v." , berr )
@@ -416,16 +419,19 @@ func Backup(pctx context.Context, jobInfo *files.JobInfo) error {
416419 } else {
417420 fmt .Fprintf (
418421 config .Stdout ,
419- "Done.\n \t Total ZFS Stream Bytes: %d (%s)\n \t Total Bytes Written: %d (%s)\n \t Elapsed Time: %v\n \t Total Files Uploaded: %d\n " ,
422+ "Done.\n \t Total ZFS Stream Bytes: %d (%s)\n \t Total Bytes Written: %d (%s)\n \t Elapsed Time: %v\n \t Total Files Uploaded: %d\n \t Average Upload Rate: %s \n " ,
420423 jobInfo .ZFSStreamBytes ,
421424 humanize .IBytes (jobInfo .ZFSStreamBytes ),
422425 totalWrittenBytes ,
423426 humanize .IBytes (totalWrittenBytes ),
424427 time .Since (jobInfo .StartTime ),
425428 len (jobInfo .Volumes )+ 1 ,
429+ fmt .Sprintf ("%.2f TB/hr" , float64 (totalWrittenBytes )/ 1e12 / time .Since (jobInfo .StartTime ).Hours ()),
426430 )
427431 }
428432
433+ fmt .Printf ("Backup of %s completed successfully.\n " , jobInfo .VolumeName )
434+
429435 log .AppLogger .Debugf ("Cleaning up resources..." )
430436
431437 for _ , backend := range usedBackends {
@@ -478,6 +484,7 @@ func saveManifest(ctx context.Context, j *files.JobInfo, final bool) (*files.Vol
478484}
479485
480486// nolint:funlen,gocyclo // Difficult to break this apart
487+
481488func sendStream (ctx context.Context , j * files.JobInfo , c chan <- * files.VolumeInfo , buffer <- chan bool ) error {
482489 var group * errgroup.Group
483490 group , ctx = errgroup .WithContext (ctx )
@@ -493,6 +500,39 @@ func sendStream(ctx context.Context, j *files.JobInfo, c chan<- *files.VolumeInf
493500 usingPipe = true
494501 }
495502
503+ // Get total dataset size for progress tracking
504+ totalSize , err := zfs .GetDatasetSize (ctx , j .VolumeName )
505+ if err != nil {
506+ return err
507+ }
508+
509+ // Initialize progress bar
510+ bar := progressbar .NewOptions64 (int64 (totalSize ),
511+ progressbar .OptionSetWriter (ansi .NewAnsiStdout ()),
512+ progressbar .OptionEnableColorCodes (true ),
513+ progressbar .OptionShowBytes (true ),
514+ progressbar .OptionSetWidth (50 ),
515+ progressbar .OptionThrottle (65 * time .Millisecond ),
516+ progressbar .OptionShowCount (),
517+ progressbar .OptionSetDescription ("[cyan]Backing up...[reset]" ),
518+ progressbar .OptionOnCompletion (func () {
519+ fmt .Fprint (ansi .NewAnsiStdout (), "\n " )
520+ }),
521+ progressbar .OptionSpinnerType (14 ),
522+ progressbar .OptionFullWidth (),
523+ progressbar .OptionSetTheme (progressbar.Theme {
524+ Saucer : "[green]=[reset]" ,
525+ SaucerHead : "[green]>[reset]" ,
526+ SaucerPadding : " " ,
527+ BarStart : "[" ,
528+ BarEnd : "]" ,
529+ }),
530+ )
531+
532+ // Initialize chunk tracking variables
533+ totalChunks := int (totalSize / (j .VolumeSize * humanize .MiByte ))
534+ var processedChunks int
535+
496536 group .Go (func () error {
497537 var lastTotalBytes uint64
498538 defer close (c )
@@ -527,6 +567,8 @@ func sendStream(ctx context.Context, j *files.JobInfo, c chan<- *files.VolumeInf
527567 if ! usingPipe {
528568 c <- volume
529569 }
570+ processedChunks ++
571+ bar .Describe (fmt .Sprintf ("Backing up... (%d/%d chunks)" , processedChunks , totalChunks ))
530572 }
531573 <- buffer
532574 volume , err = files .CreateBackupVolume (ctx , j , volNum )
@@ -542,7 +584,7 @@ func sendStream(ctx context.Context, j *files.JobInfo, c chan<- *files.VolumeInf
542584 }
543585
544586 // Write a little at a time and break the output between volumes as needed
545- _ , ierr := io .CopyN (volume , counter , files .BufferSize * 2 )
587+ bytesWritten , ierr := io .CopyN (volume , counter , files .BufferSize * 2 )
546588 if ierr == io .EOF {
547589 // We are done!
548590 log .AppLogger .Debugf ("Finished creating volume %s" , volume .ObjectName )
@@ -554,17 +596,21 @@ func sendStream(ctx context.Context, j *files.JobInfo, c chan<- *files.VolumeInf
554596 if ! usingPipe {
555597 c <- volume
556598 }
599+ processedChunks ++
600+ bar .Describe (fmt .Sprintf ("Backing up... (%d/%d chunks)" , processedChunks , totalChunks ))
557601 return nil
558602 } else if ierr != nil {
559603 log .AppLogger .Errorf ("Error while trying to read from the zfs stream for volume %s - %v" , volume .ObjectName , ierr )
560604 return ierr
561605 }
606+ // Update progress bar
607+ bar .Add64 (int64 (bytesWritten ))
562608 }
563609 })
564610
565611 // Start the zfs send command
566612 log .AppLogger .Infof ("Starting zfs send command: %s" , strings .Join (cmd .Args , " " ))
567- err : =cmd .Start ()
613+ err = cmd .Start ()
568614 if err != nil {
569615 log .AppLogger .Errorf ("Error starting zfs command - %v" , err )
570616 return err
0 commit comments