Skip to content

fix issue in filetransfer for large file count #1360

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix issue in filetransfer for large file count #1360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions utils/progressbar/progressbarmng.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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)
}),
),
Expand Down
28 changes: 13 additions & 15 deletions utils/progressbar/transferprogressbarmanager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -304,40 +308,34 @@ 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 }
return tpm.barMng.newCounterProgressBar(getVals, tpm.transferLabels.DelayedFiles, tpm.createCounterDescription(counterDescription))
}

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)
}
Expand Down
Loading