-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #130 from transifex/devel
version 1.5.0
- Loading branch information
Showing
12 changed files
with
826 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| package txlib | ||
|
|
||
| import ( | ||
| "errors" | ||
| "fmt" | ||
| "strings" | ||
| "time" | ||
|
|
||
| "github.com/transifex/cli/internal/txlib/config" | ||
| "github.com/transifex/cli/pkg/jsonapi" | ||
| "github.com/transifex/cli/pkg/txapi" | ||
| "github.com/transifex/cli/pkg/worker_pool" | ||
| ) | ||
|
|
||
| type MergeCommandArguments struct { | ||
| ResourceId string | ||
| Branch string | ||
| ConflictResolution string | ||
| Force bool | ||
| Skip bool | ||
| Silent bool | ||
| } | ||
|
|
||
| func MergeCommand( | ||
| cfg *config.Config, | ||
| api jsonapi.Connection, | ||
| args MergeCommandArguments, | ||
| ) error { | ||
| args.Branch = figureOutBranch(args.Branch) | ||
|
|
||
| cfgResources, err := figureOutResources([]string{args.ResourceId}, cfg) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| applyBranchToResources(cfgResources, args.Branch) | ||
|
|
||
| cfgResource := cfgResources[0] | ||
|
|
||
| err = mergeResource(&api, cfgResource, args) | ||
|
|
||
| return err | ||
| } | ||
|
|
||
| func mergeResource( | ||
| api *jsonapi.Connection, cfgResource *config.Resource, args MergeCommandArguments, | ||
| ) error { | ||
| isValidPolicy := isValidResolutionPolicy(args.ConflictResolution) | ||
| if !isValidPolicy { | ||
| return fmt.Errorf("invalid resolution policy %s", args.ConflictResolution) | ||
| } | ||
|
|
||
| resourceId := fmt.Sprintf( | ||
| "o:%s:p:%s:r:%s", | ||
| cfgResource.OrganizationSlug, | ||
| cfgResource.ProjectSlug, | ||
| cfgResource.ResourceSlug, | ||
| ) | ||
|
|
||
| // Get Resource from Server | ||
| resource, err := txapi.GetResourceById(api, resourceId) | ||
| if err != nil { | ||
| return fmt.Errorf("error getting resource '%s - %s - %s'", | ||
| cfgResource.OrganizationSlug, | ||
| cfgResource.ProjectSlug, | ||
| cfgResource.ResourceSlug) | ||
| } | ||
|
|
||
| if resource == nil { | ||
| return fmt.Errorf("resource not found '%s - %s - %s'", | ||
| cfgResource.OrganizationSlug, | ||
| cfgResource.ProjectSlug, | ||
| cfgResource.ResourceSlug) | ||
| } | ||
|
|
||
| var merge *jsonapi.Resource | ||
| merge, err = txapi.CreateAsyncResourceMerge(api, resource, args.ConflictResolution, args.Force) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| pool := worker_pool.New(1, 1, args.Silent) | ||
| pool.Add(&MergeResourcePollTask{merge, args}) | ||
| pool.Start() | ||
| <-pool.Wait() | ||
| if pool.IsAborted { | ||
| return errors.New("Aborted") | ||
| } | ||
|
|
||
| return nil | ||
| } | ||
|
|
||
| type MergeResourcePollTask struct { | ||
| merge *jsonapi.Resource | ||
| args MergeCommandArguments | ||
| } | ||
|
|
||
| func (task *MergeResourcePollTask) Run(send func(string), abort func()) { | ||
| merge := task.merge | ||
| args := task.args | ||
|
|
||
| parts := strings.Split(merge.Relationships["base"].DataSingular.Id, ":") | ||
| sendMessage := func(body string, force bool) { | ||
| if args.Silent && !force { | ||
| return | ||
| } | ||
| send(fmt.Sprintf( | ||
| "%s.%s - %s", parts[3], parts[5], body, | ||
| )) | ||
| } | ||
|
|
||
| err := handleThrottling( | ||
| func() error { | ||
| return txapi.PollResourceMerge( | ||
| merge, | ||
| time.Second, | ||
| ) | ||
| }, | ||
| "Polling merge task status", | ||
| func(msg string) { sendMessage(msg, false) }, | ||
| ) | ||
| if err != nil { | ||
| sendMessage(err.Error(), true) | ||
| if !args.Skip { | ||
| abort() | ||
| } | ||
| return | ||
| } | ||
| sendMessage("Done", false) | ||
| } |
Oops, something went wrong.