Deploying from phrase/strings-openapi@e78ab704

Author: Phrase

cmd/internal/push.go

@@ -30,6 +30,12 @@ type PushCommand struct {
 	Tag                string
 }
 
+type PushResult struct {
+	ProjectID string
+	Branch    string
+	UploadIDs []string
+}
+
 func (cmd *PushCommand) Run() error {
 	if cmd.Config.Debug {
 		// suppresses content output
@@ -141,24 +147,51 @@ func (cmd *PushCommand) Run() error {
 		}
 	}
 
+	pushResults := []*PushResult{}
+
 	for _, source := range sources {
-		err := source.Push(client, cmd.Wait, cmd.Cleanup, cmd.Branch, cmd.Tag)
+		pushResult, err := source.Push(client, cmd.Wait, cmd.Branch, cmd.Tag)
 		if err != nil {
 			return err
 		}
+		if cmd.Wait && cmd.Cleanup {
+			// collect all upload ids for cleanup by project and branch
+			found := false
+			for _, result := range pushResults {
+				if result.ProjectID == pushResult.ProjectID && result.Branch == pushResult.Branch {
+					result.UploadIDs = append(result.UploadIDs, pushResult.UploadIDs...)
+					found = true
+					break
+				}
+			}
+			if !found {
+				pushResults = append(pushResults, pushResult)
+			}
+		}
+	}
+	for _, pushResult := range pushResults {
+		UploadCleanup(client, true, pushResult.UploadIDs, pushResult.Branch, pushResult.ProjectID)
 	}
 
 	return nil
 }
 
-func (source *Source) Push(client *phrase.APIClient, waitForResults bool, cleanup bool, branch string, tag string) error {
+func (source *Source) Push(client *phrase.APIClient, waitForResults bool, branch string, tag string) (*PushResult, error) {
 	localeFiles, err := source.LocaleFiles()
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	noErrors := true
-	uploadIds := []string{}
+	pushResult := &PushResult{
+		ProjectID: source.ProjectID,
+		Branch:    source.Params.Branch.Value(),
+		UploadIDs: []string{},
+	}
+	if branch != "" {
+		pushResult.Branch = branch
+	}
+
 	for _, localeFile := range localeFiles {
 		print.NonBatchPrintf("Uploading %s... ", localeFile.RelPath())
 
@@ -179,9 +212,9 @@ func (source *Source) Push(client *phrase.APIClient, waitForResults bool, cleanu
 			if openapiError, ok := err.(phrase.GenericOpenAPIError); ok {
 				print.Warn("\nAPI response: %s", openapiError.Body())
 			}
-			return err
+			return nil, err
 		}
-		uploadIds = append(uploadIds, upload.Id)
+		pushResult.UploadIDs = append(pushResult.UploadIDs, upload.Id)
 
 		if waitForResults {
 			print.NonBatchPrintf("\n")
@@ -198,7 +231,7 @@ func (source *Source) Push(client *phrase.APIClient, waitForResults bool, cleanu
 			print.NonBatchPrintf("\n")
 
 			if err := <-taskErr; err != nil {
-				return err
+				return nil, err
 			}
 
 			switch <-taskResult {
@@ -218,14 +251,10 @@ func (source *Source) Push(client *phrase.APIClient, waitForResults bool, cleanu
 		}
 	}
 	if noErrors {
-		if waitForResults && cleanup {
-			return UploadCleanup(client, true, uploadIds, branch, source.ProjectID)
-		}
+		return pushResult, nil
 	} else {
-		return errors.New("not all files were uploaded successfully")
+		return nil, errors.New("not all files were uploaded successfully")
 	}
-
-	return nil
 }
 
 func outputUpload(upload *phrase.Upload) {

cmd/internal/shared.go

@@ -5,7 +5,6 @@ import (
 	"errors"
 	"fmt"
 	"reflect"
-	"sort"
 	"strings"
 
 	"github.com/antihax/optional"
@@ -15,7 +14,6 @@ import (
 	"github.com/phrase/phrase-cli/cmd/internal/shared"
 	"github.com/phrase/phrase-go/v4"
 	"github.com/spf13/viper"
-	"golang.org/x/exp/maps"
 )
 
 var Debug bool
@@ -212,66 +210,11 @@ func StringToInterface() mapstructure.DecodeHookFunc {
 	}
 }
 
-func findCommonUnmentionedKeys(client *phrase.APIClient, ids []string, branch string, projectId string) ([]phrase.TranslationKey, error) {
-	commonUnmentionedKeys := map[string]phrase.TranslationKey{}
-	alreadyInitialized := false
-	for _, id := range ids {
-		q := "unmentioned_in_upload:" + id
-		keysListLocalVarOptionals := phrase.KeysListOpts{
-			Page:    optional.NewInt32(1),
-			PerPage: optional.NewInt32(100),
-			Q:       optional.NewString(q),
-			Branch:  optional.NewString(branch),
-		}
-		allUnmentionedKeysInUpload := map[string]phrase.TranslationKey{}
-		keys, _, err := client.KeysApi.KeysList(Auth, projectId, &keysListLocalVarOptionals)
-		if err != nil {
-			return nil, err
-		}
-		for len(keys) != 0 {
-			for _, key := range keys {
-				allUnmentionedKeysInUpload[key.Id] = key
-			}
-
-			keysListLocalVarOptionals.Page = optional.NewInt32(keysListLocalVarOptionals.Page.Value() + 1)
-
-			keys, _, err = client.KeysApi.KeysList(Auth, projectId, &keysListLocalVarOptionals)
-			if err != nil {
-				return nil, err
-			}
-		}
-
-		if alreadyInitialized {
-			newUnmentioned := map[string]phrase.TranslationKey{}
-			for id, key := range allUnmentionedKeysInUpload {
-				if _, ok := commonUnmentionedKeys[id]; ok {
-					newUnmentioned[id] = key
-				}
-			}
-			commonUnmentionedKeys = newUnmentioned
-		} else {
-			commonUnmentionedKeys = allUnmentionedKeysInUpload
-			alreadyInitialized = true
-		}
-	}
-
-	return maps.Values(commonUnmentionedKeys), nil
-}
-
-func deleteKeys(client *phrase.APIClient, confirm bool, branch string, projectId string, keys []phrase.TranslationKey) error {
-	ids := make([]string, len(keys))
-	names := make([]string, len(keys))
-	for i, key := range keys {
-		ids[i] = key.Id
-		names[i] = key.Name
-	}
-
+func UploadCleanup(client *phrase.APIClient, confirm bool, ids []string, branch string, projectId string) error {
 	if !shared.BatchMode {
-		fmt.Println("Following key(s) are about to be deleted from your project:")
-		sort.Strings(names)
-		fmt.Println(strings.Join(names, "\n"))
+		fmt.Println("Keys not mentioned in the following uploads will be deleted:")
+		fmt.Println(strings.Join(ids, "\n"))
 	}
-
 	if !confirm {
 		if shared.BatchMode {
 			return errors.New("Can't ask for confirmation in batch mode. Aborting")
@@ -288,50 +231,28 @@ func deleteKeys(client *phrase.APIClient, confirm bool, branch string, projectId
 		}
 	}
 
-	const ChunkSize = 100
-	totalAffected := int32(0)
-
-	for i := 0; i < len(ids); i += ChunkSize {
-		end := i + ChunkSize
-
-		if end > len(ids) {
-			end = len(ids)
-		}
-
-		q := "ids:" + strings.Join(ids[i:end], ",")
-		keysDeletelocalVarOptionals := phrase.KeysDeleteCollectionOpts{
-			Q:      optional.NewString(q),
-			Branch: optional.NewString(branch),
-		}
-		affected, _, err := client.KeysApi.KeysDeleteCollection(Auth, projectId, &keysDeletelocalVarOptionals)
-
-		if err != nil {
-			return err
-		}
-		totalAffected += affected.RecordsAffected
-		if shared.BatchMode {
-			jsonBuf, jsonErr := json.MarshalIndent(affected, "", " ")
-			if jsonErr != nil {
-				print.Error(jsonErr)
-			}
-			fmt.Printf("%s\n", string(jsonBuf))
-		}
+	q := "unmentioned_in_upload:" + strings.Join(ids, ",")
+	optionalBranch := optional.String{}
+	if branch != "" {
+		optionalBranch = optional.NewString(branch)
 	}
-
-	if !shared.BatchMode {
-		print.Success("%d key(s) successfully deleted.\n", totalAffected)
+	keysDeletelocalVarOptionals := phrase.KeysDeleteCollectionOpts{
+		Q:      optional.NewString(q),
+		Branch: optionalBranch,
 	}
-	return nil
-}
+	affected, _, err := client.KeysApi.KeysDeleteCollection(Auth, projectId, &keysDeletelocalVarOptionals)
 
-func UploadCleanup(client *phrase.APIClient, confirm bool, ids []string, branch string, projectId string) error {
-	keys, error := findCommonUnmentionedKeys(client, ids, branch, projectId)
-	if error != nil {
-		return error
+	if err != nil {
+		return err
 	}
-	if len(keys) == 0 {
-		print.Success("There were no keys unmentioned in the uploads.")
-		return nil
+	if shared.BatchMode {
+		jsonBuf, jsonErr := json.MarshalIndent(affected, "", " ")
+		if jsonErr != nil {
+			print.Error(jsonErr)
+		}
+		fmt.Printf("%s\n", string(jsonBuf))
+	} else {
+		print.Success("%d key(s) successfully deleted.\n", affected.RecordsAffected)
 	}
-	return deleteKeys(client, confirm, branch, projectId, keys)
+	return nil
 }

go.mod

@@ -26,14 +26,14 @@ require (
 	github.com/spf13/cast v1.7.1 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
-	golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67
 	golang.org/x/oauth2 v0.24.0 // indirect
 	golang.org/x/sys v0.28.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 )
 
 require (
+	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/pelletier/go-toml v1.2.0 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/stretchr/testify v1.9.0 // indirect

go.sum

@@ -301,8 +301,6 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0
 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4=
 golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM=
 golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU=
-golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 h1:1UoZQm6f0P/ZO0w1Ri+f+ifG/gXhegadRdwBIXEFWDo=
-golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67/go.mod h1:qj5a5QZpwLU2NLQudwIN5koi3beDhSAlJwa67PuM98c=
 golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
 golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=