Merge pull request #327 from crowdin/add-download-sources

Add 'download sources' command and add export options to config file

build.gradle

@@ -55,7 +55,7 @@ dependencies {
 
     implementation 'info.picocli:picocli:4.5.0'
 
-    implementation 'com.github.crowdin:crowdin-api-client-java:1.2.12'
+    implementation 'com.github.crowdin:crowdin-api-client-java:1.3.0'
 
     testImplementation 'org.junit.jupiter:junit-jupiter:5.5.2'
     testImplementation 'org.hamcrest:hamcrest:2.2'

src/main/java/com/crowdin/cli/client/CrowdinProjectClient.java

@@ -1,6 +1,7 @@
 package com.crowdin.cli.client;
 
 import com.crowdin.client.core.model.PatchRequest;
+import com.crowdin.client.labels.model.AddLabelRequest;
 import com.crowdin.client.labels.model.Label;
 import com.crowdin.client.projectsgroups.model.ProjectSettings;
 import com.crowdin.client.sourcefiles.model.AddBranchRequest;
@@ -186,7 +187,7 @@ public SourceString addSourceString(AddSourceStringRequest request) {
     @Override
     public List<SourceString> listSourceString(Long fileId, String labelIds, String filter) {
         return executeRequestFullList((limit, offset) -> this.client.getSourceStringsApi()
-            .listSourceStrings(this.projectId, fileId, null, labelIds, filter, limit, offset));
+            .listSourceStrings(this.projectId, fileId, null, labelIds, filter, null, limit, offset));
     }
 
     @Override
@@ -217,4 +218,18 @@ public List<Label> listLabels() {
         return executeRequestFullList((limit, offset) -> this.client.getLabelsApi()
             .listLabels(this.projectId, limit, offset));
     }
+
+    @Override
+    public Label addLabel(AddLabelRequest request) {
+        return executeRequest(() -> this.client.getLabelsApi()
+            .addLabel(this.projectId, request)
+            .getData());
+    }
+
+    @Override
+    public URL downloadFile(Long fileId) {
+        return url(executeRequest(() -> this.client.getSourceFilesApi()
+            .downloadFile(this.projectId, fileId)
+            .getData()));
+    }
 }

src/main/java/com/crowdin/cli/client/ProjectClient.java

@@ -1,6 +1,7 @@
 package com.crowdin.cli.client;
 
 import com.crowdin.client.core.model.PatchRequest;
+import com.crowdin.client.labels.model.AddLabelRequest;
 import com.crowdin.client.labels.model.Label;
 import com.crowdin.client.sourcefiles.model.AddBranchRequest;
 import com.crowdin.client.sourcefiles.model.AddDirectoryRequest;
@@ -59,4 +60,8 @@ public interface ProjectClient extends Client {
     URL exportProjectTranslation(ExportProjectTranslationRequest request);
 
     List<Label> listLabels();
+
+    Label addLabel(AddLabelRequest request);
+
+    URL downloadFile(Long fileId);
 }

src/main/java/com/crowdin/cli/commands/Actions.java

@@ -21,8 +21,7 @@ public interface Actions {
 
     NewAction<PropertiesWithFiles, ProjectClient> download(
         FilesInterface files, boolean noProgress, String languageId, boolean pseudo, String branchName,
-        boolean ignoreMatch, boolean isVerbose, Boolean skipTranslatedOnly,
-        Boolean skipUntranslatedFiles, Boolean exportApprovedOnly, boolean plainView
+        boolean ignoreMatch, boolean isVerbose, boolean plainView
     );
 
     NewAction<NoProperties, NoClient> generate(FilesInterface files, Path destinationPath, boolean skipGenerateDescription);
@@ -78,8 +77,8 @@ NewAction<BaseProperties, ClientTm> tmDownload(
         String targetLanguageId, boolean noProgress, File to, FilesInterface files);
 
     NewAction<PropertiesWithTargets, ProjectClient> downloadTargets(
-        List<String> targetNames, FilesInterface files, boolean noProgress, List<String> langIds, boolean isVerbose, Boolean skipTranslatedOnly,
-        Boolean skipUntranslatedFiles, Boolean exportApprovedOnly, boolean plainView, boolean debug);
+        List<String> targetNames, FilesInterface files, boolean noProgress,
+        List<String> langIds, boolean isVerbose, boolean plainView, boolean debug);
 
     NewAction<NoProperties, NoClient> checkNewVersion();
 

src/main/java/com/crowdin/cli/commands/actions/CliActions.java

@@ -24,11 +24,9 @@ public class CliActions implements Actions {
     @Override
     public NewAction<PropertiesWithFiles, ProjectClient> download(
         FilesInterface files, boolean noProgress, String languageId, boolean pseudo, String branchName,
-        boolean ignoreMatch, boolean isVerbose, Boolean skipTranslatedOnly,
-        Boolean skipUntranslatedFiles, Boolean exportApprovedOnly, boolean plainView
+        boolean ignoreMatch, boolean isVerbose, boolean plainView
     ) {
-        return new DownloadAction(files, noProgress, languageId, pseudo, branchName, ignoreMatch, isVerbose,
-            skipTranslatedOnly, skipUntranslatedFiles, exportApprovedOnly, plainView);
+        return new DownloadAction(files, noProgress, languageId, pseudo, branchName, ignoreMatch, isVerbose, plainView);
     }
 
     @Override
@@ -158,11 +156,10 @@ public NewAction<NoProperties, NoClient> checkNewVersion() {
 
     @Override
     public NewAction<PropertiesWithTargets, ProjectClient> downloadTargets(
-        List<String> targetNames, FilesInterface files, boolean noProgress, List<String> langIds, boolean isVerbose,
-        Boolean skipTranslatedOnly, Boolean skipUntranslatedFiles, Boolean exportApprovedOnly, boolean plainView, boolean debug
+        List<String> targetNames, FilesInterface files, boolean noProgress,
+        List<String> langIds, boolean isVerbose, boolean plainView, boolean debug
     ) {
-        return new DownloadTargetsAction(targetNames, files, noProgress, langIds, isVerbose, skipTranslatedOnly,
-            skipUntranslatedFiles, exportApprovedOnly, plainView, debug);
+        return new DownloadTargetsAction(targetNames, files, noProgress, langIds, isVerbose, plainView, debug);
     }