Skip to content
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

added branch id support #472

Merged
merged 11 commits into from
Sep 14, 2022
Merged

added branch id support #472

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
be28a54
Card number-248: added branch id support
Volodymyr95 Sep 8, 2022
8355867
Card number-248: fix pr comments
Volodymyr95 Sep 12, 2022
cc42a8e
Card number-248: fix pr comments
Volodymyr95 Sep 12, 2022
b2539f0
Update src/main/java/com/crowdin/cli/client/CrowdinProjectClient.java
andrii-bodnar Sep 13, 2022
5fa0ad4
Fix formatting issues
andrii-bodnar Sep 13, 2022
43217f8
Card number-248: fix issue when branchName no present
Volodymyr95 Sep 13, 2022
312ea15
Merge remote-tracking branch 'origin/feature/248' into feature/248
Volodymyr95 Sep 13, 2022
98c65be
Card number-248: formatting
Volodymyr95 Sep 13, 2022
7a43b2a
Card number-248: formatting
Volodymyr95 Sep 13, 2022
872fd7d
Card number-248: npe fix
Volodymyr95 Sep 13, 2022
8867426
Minor update
andrii-bodnar Sep 14, 2022
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
2 changes: 1 addition & 1 deletion build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ dependencies {

implementation 'info.picocli:picocli:4.6.1'

implementation 'com.github.crowdin:crowdin-api-client-java:1.3.17'
implementation 'com.github.crowdin:crowdin-api-client-java:1.4.1'

testImplementation 'org.junit.jupiter:junit-jupiter:5.7.2'
testImplementation 'org.hamcrest:hamcrest:2.2'
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/crowdin/cli/client/CrowdinProjectClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ private void populateProjectWithStructure(CrowdinProjectFull project) {
project.setFiles(executeRequestFullList((limit, offset) -> this.client.getSourceFilesApi()
.listFiles(this.projectId, null, null, null, null, limit, offset)));
project.setDirectories(executeRequestFullList((limit, offset) -> this.client.getSourceFilesApi()
.listDirectories(this.projectId, null, null, null, limit, offset)));
.listDirectories(this.projectId, null, null, null,null, limit, offset)));
andrii-bodnar marked this conversation as resolved.
Show resolved Hide resolved
project.setBranches(this.listBranches());
}

Expand Down
32 changes: 6 additions & 26 deletions src/main/java/com/crowdin/cli/commands/actions/DownloadAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@
import com.crowdin.cli.client.ProjectClient;
import com.crowdin.cli.commands.NewAction;
import com.crowdin.cli.commands.Outputter;
import com.crowdin.cli.commands.functionality.FilesInterface;
import com.crowdin.cli.commands.functionality.ProjectFilesUtils;
import com.crowdin.cli.commands.functionality.PropertiesBeanUtils;
import com.crowdin.cli.commands.functionality.RequestBuilder;
import com.crowdin.cli.commands.functionality.SourcesUtils;
import com.crowdin.cli.commands.functionality.TranslationsUtils;
import com.crowdin.cli.commands.functionality.*;
import com.crowdin.cli.properties.FileBean;
import com.crowdin.cli.properties.PropertiesWithFiles;
import com.crowdin.cli.properties.PseudoLocalization;
Expand All @@ -32,28 +27,13 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
andrii-bodnar marked this conversation as resolved.
Show resolved Hide resolved
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
import java.util.*;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.stream.Collectors;

import static com.crowdin.cli.BaseCli.CHECK_WAITING_TIME_FIRST;
import static com.crowdin.cli.BaseCli.CHECK_WAITING_TIME_INCREMENT;
import static com.crowdin.cli.BaseCli.CHECK_WAITING_TIME_MAX;
import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
import static com.crowdin.cli.utils.console.ExecutionStatus.ERROR;
import static com.crowdin.cli.utils.console.ExecutionStatus.OK;
import static com.crowdin.cli.utils.console.ExecutionStatus.WARNING;
import static com.crowdin.cli.BaseCli.*;
andrii-bodnar marked this conversation as resolved.
Show resolved Hide resolved
import static com.crowdin.cli.utils.console.ExecutionStatus.*;

class DownloadAction implements NewAction<PropertiesWithFiles, ProjectClient> {

Expand Down Expand Up @@ -133,8 +113,8 @@ public void act(Outputter out, PropertiesWithFiles pb, ProjectClient client) {
PseudoLocalization pl = pb.getPseudoLocalization();
BuildProjectTranslationRequest request = (pl != null)
? RequestBuilder.crowdinTranslationCreateProjectPseudoBuildForm(
true, pl.getLengthCorrection(), pl.getPrefix(), pl.getSuffix(), pl.getCharTransformation())
: RequestBuilder.crowdinTranslationCreateProjectPseudoBuildForm(true, null, null, null, null);
branch.get().getId(),true, pl.getLengthCorrection(), pl.getPrefix(), pl.getSuffix(), pl.getCharTransformation())
andrii-bodnar marked this conversation as resolved.
Show resolved Hide resolved
: RequestBuilder.crowdinTranslationCreateProjectPseudoBuildForm(1L,true, null, null, null, null);
andrii-bodnar marked this conversation as resolved.
Show resolved Hide resolved
Pair<File, List<String>> downloadedFiles = this.download(request, client, pb.getBasePath());
for (FileBean fb : pb.getFiles()) {
Map<String, String> filesWithMapping = this.getFiles(fb, pb.getBasePath(), serverLanguageMapping, forLanguages, placeholderUtil, new ArrayList<>(serverSources.keySet()), pb.getPreserveHierarchy());
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/com/crowdin/cli/commands/functionality/RequestBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,10 +159,11 @@ public static ExportProjectTranslationRequest exportProjectTranslation(ExportPro
return copy;
}

public static CrowdinTranslationCraeteProjectPseudoBuildForm crowdinTranslationCreateProjectPseudoBuildForm(
Boolean pseudo, Integer lengthCorrection, String prefix, String suffix, CharTransformation charTransformation
public static CrowdinTranslationCraeteProjectPseudoBuildForm crowdinTranslationCreateProjectPseudoBuildForm(long branchId,
Boolean pseudo, Integer lengthCorrection, String prefix, String suffix, CharTransformation charTransformation
andrii-bodnar marked this conversation as resolved.
Show resolved Hide resolved
) {
CrowdinTranslationCraeteProjectPseudoBuildForm request = new CrowdinTranslationCraeteProjectPseudoBuildForm();
request.setBranchId(branchId);
request.setPseudo(pseudo);
request.setLengthTransformation(lengthCorrection);
request.setPrefix(prefix);
Expand Down