Skip to content

Commit dfdbfbe

Browse files
committed
fix issue in filetransfer for large file count
1 parent df3b2da commit dfdbfbe

File tree

2 files changed

+10
-17
lines changed

2 files changed

+10
-17
lines changed

utils/progressbar/progressbarmng.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ func (bm *ProgressBarMng) newTasksProgressBar(getVal func() (numerator, denomina
241241
}
242242

243243
// Initializing a counter progress bar
244-
func (bm *ProgressBarMng) newCounterProgressBar(getVal func() (value int, err error), headLine string, counterDescription decor.Decorator) *TasksProgressBar {
244+
func (bm *ProgressBarMng) newCounterProgressBar(getVal func() (value uint64, err error), headLine string, counterDescription decor.Decorator) *TasksProgressBar {
245245
pb := &TasksProgressBar{}
246246
pb.bar = bm.container.MustAdd(0,
247247
nil,
@@ -253,7 +253,7 @@ func (bm *ProgressBarMng) newCounterProgressBar(getVal func() (value int, err er
253253
if err != nil {
254254
log.Error(err)
255255
}
256-
s1 := strconv.Itoa(value)
256+
s1 := strconv.FormatUint(value, 10)
257257
return color.Green.Render(s1)
258258
}),
259259
),

utils/progressbar/transferprogressbarmanager.go

+8-15
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package progressbar
22

33
import (
44
"fmt"
5-
"github.com/jfrog/gofrog/safeconvert"
65
"sync"
76
"time"
87

@@ -266,9 +265,9 @@ func (tpm *TransferProgressMng) NewGeneralProgBar() *TasksProgressBar {
266265
}
267266

268267
func (tpm *TransferProgressMng) NewWorkingThreadsProg() *TasksProgressBar {
269-
getVal := func() (workingThreadsNum int, err error) {
268+
getVal := func() (workingThreadsNum uint64, err error) {
270269
err = tpm.stateMng.Action(func(*state.TransferState) error {
271-
workingThreadsNum = tpm.stateMng.WorkingThreads
270+
workingThreadsNum = uint64(tpm.stateMng.WorkingThreads)
272271
return nil
273272
})
274273
return workingThreadsNum, err
@@ -304,40 +303,34 @@ func (tpm *TransferProgressMng) NewTimeEstBar() *TasksProgressBar {
304303
}
305304

306305
func (tpm *TransferProgressMng) NewVisitedFoldersBar() *TasksProgressBar {
307-
getVals := func() (int, error) {
306+
getVals := func() (uint64, error) {
308307
if tpm.ignoreState {
309308
return 0, nil
310309
}
311-
signedVisitedFolders, err := safeconvert.Uint64ToInt(tpm.stateMng.VisitedFolders)
312-
if err != nil {
313-
return 0, fmt.Errorf("failed to convert visited folders to int: %w", err)
314-
}
310+
signedVisitedFolders := tpm.stateMng.VisitedFolders
315311
return signedVisitedFolders, nil
316312
}
317313
return tpm.barMng.newCounterProgressBar(getVals, tpm.transferLabels.VisitedFolders, nil)
318314
}
319315

320316
func (tpm *TransferProgressMng) NewDelayedBar() *TasksProgressBar {
321-
getVals := func() (int, error) {
317+
getVals := func() (uint64, error) {
322318
if tpm.ignoreState {
323319
return 0, nil
324320
}
325-
signedDelayedFiles, err := safeconvert.Uint64ToInt(tpm.stateMng.DelayedFiles)
326-
if err != nil {
327-
return 0, fmt.Errorf("failed to convert delayed files to int: %w", err)
328-
}
321+
signedDelayedFiles := tpm.stateMng.DelayedFiles
329322
return signedDelayedFiles, nil
330323
}
331324
counterDescription := func() string { return DelayedFilesContentNote }
332325
return tpm.barMng.newCounterProgressBar(getVals, tpm.transferLabels.DelayedFiles, tpm.createCounterDescription(counterDescription))
333326
}
334327

335328
func (tpm *TransferProgressMng) NewErrorBar() *TasksProgressBar {
336-
getVals := func() (transferFailures int, err error) {
329+
getVals := func() (transferFailures uint64, err error) {
337330
if tpm.ignoreState {
338331
return 0, nil
339332
}
340-
signedTransferFailures, err := safeconvert.Uint64ToInt(tpm.stateMng.TransferFailures)
333+
signedTransferFailures := tpm.stateMng.TransferFailures
341334
if err != nil {
342335
return 0, fmt.Errorf("failed to convert transfer failures to int: %w", err)
343336
}

0 commit comments

Comments
 (0)