From dcac4c305355444a9d179066a238d15014400a99 Mon Sep 17 00:00:00 2001 From: Shahin Date: Mon, 10 Mar 2025 15:44:26 +0530 Subject: [PATCH] fix issue in filetransfer for large file count --- utils/progressbar/progressbarmng.go | 4 +-- .../progressbar/transferprogressbarmanager.go | 28 +++++++++---------- 2 files changed, 15 insertions(+), 17 deletions(-) diff --git a/utils/progressbar/progressbarmng.go b/utils/progressbar/progressbarmng.go index ea59dfa13..0266efed7 100644 --- a/utils/progressbar/progressbarmng.go +++ b/utils/progressbar/progressbarmng.go @@ -241,7 +241,7 @@ func (bm *ProgressBarMng) newTasksProgressBar(getVal func() (numerator, denomina } // Initializing a counter progress bar -func (bm *ProgressBarMng) newCounterProgressBar(getVal func() (value int, err error), headLine string, counterDescription decor.Decorator) *TasksProgressBar { +func (bm *ProgressBarMng) newCounterProgressBar(getVal func() (value uint64, err error), headLine string, counterDescription decor.Decorator) *TasksProgressBar { pb := &TasksProgressBar{} pb.bar = bm.container.MustAdd(0, nil, @@ -253,7 +253,7 @@ func (bm *ProgressBarMng) newCounterProgressBar(getVal func() (value int, err er if err != nil { log.Error(err) } - s1 := strconv.Itoa(value) + s1 := strconv.FormatUint(value, 10) return color.Green.Render(s1) }), ), diff --git a/utils/progressbar/transferprogressbarmanager.go b/utils/progressbar/transferprogressbarmanager.go index db42b2ad8..c550ec97b 100644 --- a/utils/progressbar/transferprogressbarmanager.go +++ b/utils/progressbar/transferprogressbarmanager.go @@ -266,12 +266,16 @@ func (tpm *TransferProgressMng) NewGeneralProgBar() *TasksProgressBar { } func (tpm *TransferProgressMng) NewWorkingThreadsProg() *TasksProgressBar { - getVal := func() (workingThreadsNum int, err error) { + getVal := func() (workingThreadsNumUint64 uint64, err error) { err = tpm.stateMng.Action(func(*state.TransferState) error { - workingThreadsNum = tpm.stateMng.WorkingThreads + workingThreadsNum, errConv := safeconvert.IntToUint(tpm.stateMng.WorkingThreads) + if errConv != nil { + log.Error(err) + } + workingThreadsNumUint64 = uint64(workingThreadsNum) return nil }) - return workingThreadsNum, err + return workingThreadsNumUint64, err } return tpm.barMng.newCounterProgressBar(getVal, tpm.transferLabels.WorkingThreads, nil) @@ -304,28 +308,22 @@ func (tpm *TransferProgressMng) NewTimeEstBar() *TasksProgressBar { } func (tpm *TransferProgressMng) NewVisitedFoldersBar() *TasksProgressBar { - getVals := func() (int, error) { + getVals := func() (uint64, error) { if tpm.ignoreState { return 0, nil } - signedVisitedFolders, err := safeconvert.Uint64ToInt(tpm.stateMng.VisitedFolders) - if err != nil { - return 0, fmt.Errorf("failed to convert visited folders to int: %w", err) - } + signedVisitedFolders := tpm.stateMng.VisitedFolders return signedVisitedFolders, nil } return tpm.barMng.newCounterProgressBar(getVals, tpm.transferLabels.VisitedFolders, nil) } func (tpm *TransferProgressMng) NewDelayedBar() *TasksProgressBar { - getVals := func() (int, error) { + getVals := func() (uint64, error) { if tpm.ignoreState { return 0, nil } - signedDelayedFiles, err := safeconvert.Uint64ToInt(tpm.stateMng.DelayedFiles) - if err != nil { - return 0, fmt.Errorf("failed to convert delayed files to int: %w", err) - } + signedDelayedFiles := tpm.stateMng.DelayedFiles return signedDelayedFiles, nil } counterDescription := func() string { return DelayedFilesContentNote } @@ -333,11 +331,11 @@ func (tpm *TransferProgressMng) NewDelayedBar() *TasksProgressBar { } func (tpm *TransferProgressMng) NewErrorBar() *TasksProgressBar { - getVals := func() (transferFailures int, err error) { + getVals := func() (transferFailures uint64, err error) { if tpm.ignoreState { return 0, nil } - signedTransferFailures, err := safeconvert.Uint64ToInt(tpm.stateMng.TransferFailures) + signedTransferFailures := tpm.stateMng.TransferFailures if err != nil { return 0, fmt.Errorf("failed to convert transfer failures to int: %w", err) }