gian/incus-mirror
1
0
Fork 0
mirror of https://github.com/lxc/incus synced 2026-08-02 05:26:46 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

incus/storage_bucket: Fix progress reporting on stdin import

Browse Source 
Signed-off-by: Benjamin Somers <benjamin.somers@imt-atlantique.fr>
This commit is contained in:
Benjamin Somers 2026-07-19 02:31:44 +00:00
parent c68f48dc7f
commit 999c8de084
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/incus/storage_bucket.go
View File

@ -1510,8 +1510,10 @@ func (c *cmdStorageBucketImport) run(cmd *cobra.Command, args []string) error {
}
var file *os.File
usePercentage := true
if isStdin(backupFile) {
file = os.Stdin
usePercentage = false
} else {
file, err = os.Open(backupFile)
if err != nil {
@ -1537,8 +1539,12 @@ func (c *cmdStorageBucketImport) run(cmd *cobra.Command, args []string) error {
ReadCloser: file,
Tracker: &ioprogress.ProgressTracker{
Length: fstat.Size(),
Handler: func(percent int64, speed int64) {
progress.UpdateProgress(ioprogress.ProgressData{Text: fmt.Sprintf("%d%% (%s/s)", percent, units.GetByteSizeString(speed, 2))})
Handler: func(v int64, speed int64) {
if usePercentage {
progress.UpdateProgress(ioprogress.ProgressData{Text: fmt.Sprintf("%d%% (%s/s)", v, units.GetByteSizeString(speed, 2))})
} else {
progress.UpdateProgress(ioprogress.ProgressData{Text: fmt.Sprintf("%s (%s/s)", units.GetByteSizeString(v, 2), units.GetByteSizeString(speed, 2))})
}
},
},
},