Skip to content

Commit dcac4c3

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

File tree

2 files changed

+15
-17
lines changed

2 files changed

+15
-17
lines changed

utils/progressbar/progressbarmng.go

Lines changed: 2 additions & 2 deletions
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

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -266,12 +266,16 @@ func (tpm *TransferProgressMng) NewGeneralProgBar() *TasksProgressBar {
266266
}
267267

268268
func (tpm *TransferProgressMng) NewWorkingThreadsProg() *TasksProgressBar {
269-
getVal := func() (workingThreadsNum int, err error) {
269+
getVal := func() (workingThreadsNumUint64 uint64, err error) {
270270
err = tpm.stateMng.Action(func(*state.TransferState) error {
271-
workingThreadsNum = tpm.stateMng.WorkingThreads
271+
workingThreadsNum, errConv := safeconvert.IntToUint(tpm.stateMng.WorkingThreads)
272+
if errConv != nil {
273+
log.Error(err)
274+
}
275+
workingThreadsNumUint64 = uint64(workingThreadsNum)
272276
return nil
273277
})
274-
return workingThreadsNum, err
278+
return workingThreadsNumUint64, err
275279
}
276280

277281
return tpm.barMng.newCounterProgressBar(getVal, tpm.transferLabels.WorkingThreads, nil)
@@ -304,40 +308,34 @@ func (tpm *TransferProgressMng) NewTimeEstBar() *TasksProgressBar {
304308
}
305309

306310
func (tpm *TransferProgressMng) NewVisitedFoldersBar() *TasksProgressBar {
307-
getVals := func() (int, error) {
311+
getVals := func() (uint64, error) {
308312
if tpm.ignoreState {
309313
return 0, nil
310314
}
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-
}
315+
signedVisitedFolders := tpm.stateMng.VisitedFolders
315316
return signedVisitedFolders, nil
316317
}
317318
return tpm.barMng.newCounterProgressBar(getVals, tpm.transferLabels.VisitedFolders, nil)
318319
}
319320

320321
func (tpm *TransferProgressMng) NewDelayedBar() *TasksProgressBar {
321-
getVals := func() (int, error) {
322+
getVals := func() (uint64, error) {
322323
if tpm.ignoreState {
323324
return 0, nil
324325
}
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-
}
326+
signedDelayedFiles := tpm.stateMng.DelayedFiles
329327
return signedDelayedFiles, nil
330328
}
331329
counterDescription := func() string { return DelayedFilesContentNote }
332330
return tpm.barMng.newCounterProgressBar(getVals, tpm.transferLabels.DelayedFiles, tpm.createCounterDescription(counterDescription))
333331
}
334332

335333
func (tpm *TransferProgressMng) NewErrorBar() *TasksProgressBar {
336-
getVals := func() (transferFailures int, err error) {
334+
getVals := func() (transferFailures uint64, err error) {
337335
if tpm.ignoreState {
338336
return 0, nil
339337
}
340-
signedTransferFailures, err := safeconvert.Uint64ToInt(tpm.stateMng.TransferFailures)
338+
signedTransferFailures := tpm.stateMng.TransferFailures
341339
if err != nil {
342340
return 0, fmt.Errorf("failed to convert transfer failures to int: %w", err)
343341
}

0 commit comments

Comments
 (0)