Skip to content

(Worker pool) Show number of successful tasks in progress bar #189

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
kbairak wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

(Worker pool) Show number of successful tasks in progress bar #189

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
5 changes: 3 additions & 2 deletions internal/txlib/merge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ type MergeResourcePollTask struct {
args MergeCommandArguments
}

func (task *MergeResourcePollTask) Run(send func(string), abort func()) {
func (task *MergeResourcePollTask) Run(send func(string), abort func()) bool {
merge := task.merge
args := task.args

Expand Down Expand Up @@ -124,7 +124,8 @@ func (task *MergeResourcePollTask) Run(send func(string), abort func()) {
if !args.Skip {
abort()
}
return
return false
}
sendMessage("Done", false)
return true
}
38 changes: 20 additions & 18 deletions internal/txlib/pull.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ type ResourcePullTask struct {
cfg *config.Config
}

func (task *ResourcePullTask) Run(send func(string), abort func()) {
func (task *ResourcePullTask) Run(send func(string), abort func()) bool {
cfgResource := task.cfgResource
api := task.api
args := task.args
Expand Down Expand Up @@ -177,7 +177,7 @@ func (task *ResourcePullTask) Run(send func(string), abort func()) {
if !args.Skip {
abort()
}
return
return false
}
if resource == nil {
sendMessage(
Expand All @@ -188,7 +188,7 @@ func (task *ResourcePullTask) Run(send func(string), abort func()) {
),
true,
)
return
return false
}

projectRelationship, err := resource.Fetch("project")
Expand All @@ -197,7 +197,7 @@ func (task *ResourcePullTask) Run(send func(string), abort func()) {
if !args.Skip {
abort()
}
return
return false
}
project := projectRelationship.DataSingular
sourceLanguage := project.Relationships["source_language"].DataSingular
Expand All @@ -213,7 +213,7 @@ func (task *ResourcePullTask) Run(send func(string), abort func()) {
if !args.Skip {
abort()
}
return
return false
}

if args.Source {
Expand Down Expand Up @@ -242,7 +242,7 @@ func (task *ResourcePullTask) Run(send func(string), abort func()) {
if !args.Skip {
abort()
}
return
return false
}
fileFilter := setFileTypeExtensions(args.FileType, cfgResource.FileFilter)
if args.Pseudo {
Expand Down Expand Up @@ -329,6 +329,7 @@ func (task *ResourcePullTask) Run(send func(string), abort func()) {
}
}
sendMessage("Done", false)
return true
}

type FilePullTask struct {
Expand All @@ -342,7 +343,7 @@ type FilePullTask struct {
remoteToLocalLanguageMappings map[string]string
}

func (task *FilePullTask) Run(send func(string), abort func()) {
func (task *FilePullTask) Run(send func(string), abort func()) bool {
cfgResource := task.cfgResource
languageCode := task.languageCode
args := task.args
Expand Down Expand Up @@ -381,7 +382,7 @@ func (task *FilePullTask) Run(send func(string), abort func()) {
if err == nil && args.DisableOverwrite {
if !args.KeepNewFiles {
sendMessage("Disable overwrite enabled, skipping", false)
return
return true
} else {
sourceFile = sourceFile + ".new"
}
Expand All @@ -398,11 +399,11 @@ func (task *FilePullTask) Run(send func(string), abort func()) {
if !args.Skip {
abort()
}
return
return false
}
if shouldSkip {
sendMessage("Local file is newer than remote, skipping", false)
return
return true
}
}

Expand All @@ -429,7 +430,7 @@ func (task *FilePullTask) Run(send func(string), abort func()) {
if !args.Skip {
abort()
}
return
return false
}

// Polling
Expand All @@ -446,15 +447,15 @@ func (task *FilePullTask) Run(send func(string), abort func()) {
if !args.Skip {
abort()
}
return
return false
}
} else {
if filePath != "" {
// Remote language file exists and so does local
if args.DisableOverwrite {
if !args.KeepNewFiles {
sendMessage("Disable overwrite enabled, skipping", false)
return
return true
} else {
filePath = filePath + ".new"
}
Expand All @@ -470,7 +471,7 @@ func (task *FilePullTask) Run(send func(string), abort func()) {
(!stringSliceContains(args.Languages, remoteLanguageCode) &&
!stringSliceContains(args.Languages, localLanguageCode)) {
sendMessage("File was not found locally, skipping", false)
return
return true
}
pseudo_postfix := ""
if args.Pseudo {
Expand Down Expand Up @@ -503,11 +504,11 @@ func (task *FilePullTask) Run(send func(string), abort func()) {
if !args.Skip {
abort()
}
return
return false
}
if shouldSkip {
sendMessage(feedbackMessage, false)
return
return true
}

// Creating download job
Expand Down Expand Up @@ -544,7 +545,7 @@ func (task *FilePullTask) Run(send func(string), abort func()) {
if !args.Skip {
abort()
}
return
return false
}

// Polling
Expand All @@ -561,10 +562,11 @@ func (task *FilePullTask) Run(send func(string), abort func()) {
if !args.Skip {
abort()
}
return
return false
}
}
sendMessage("Done", false)
return true
}

func shouldSkipDownload(
Expand Down
Loading