feat: new command: distribution (brunch support added)

crowdin · Aug 28, 2023 · 1aa2d63 · 1aa2d63
1 parent f77a6e2
commit 1aa2d63
Showing 1 changed file with 32 additions and 15 deletions.
diff --git a/src/main/java/com/crowdin/cli/commands/actions/DistributionAddAction.java b/src/main/java/com/crowdin/cli/commands/actions/DistributionAddAction.java
@@ -7,16 +7,21 @@
 import com.crowdin.cli.commands.Outputter;
 import com.crowdin.cli.commands.functionality.RequestBuilder;
 import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.utils.Utils;
 import com.crowdin.cli.utils.console.ConsoleSpinner;
 import com.crowdin.client.distributions.model.AddDistributionRequest;
 import com.crowdin.client.distributions.model.Distribution;
 import com.crowdin.client.distributions.model.ExportMode;
+import com.crowdin.client.sourcefiles.model.Branch;
 import com.crowdin.client.sourcefiles.model.FileInfo;
 import lombok.AllArgsConstructor;
 
+import java.nio.file.Paths;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
 import static com.crowdin.cli.utils.console.ExecutionStatus.OK;
@@ -37,32 +42,43 @@ class DistributionAddAction implements NewAction<ProjectProperties, ClientDistri
     @Override
     public void act(Outputter out, ProjectProperties pb, ClientDistribution client) {
         CrowdinProjectFull project = ConsoleSpinner.execute(
-            out,
-            "message.spinner.fetching_project_info", "error.collect_project_info",
-            this.noProgress,
-            this.plainView,
-            () -> this.projectClient.downloadFullProject(this.branch)
+                out,
+                "message.spinner.fetching_project_info", "error.collect_project_info",
+                this.noProgress,
+                this.plainView,
+                () -> this.projectClient.downloadFullProject(this.branch)
         );
 
         if (files != null) {
-            List<String> projectFiles = project.getFiles().stream().map(FileInfo::getPath).collect(Collectors.toList());
-            List<String> notExistingFiles = files.stream().filter(file -> !projectFiles.contains(file))
+            Map<String, Long> projectBranches = project.getBranches().values().stream()
+                                                       .collect(Collectors.toMap(Branch::getName, Branch::getId));
+            List<String> projectFiles = project.getFiles().stream()
+                                               .filter(file -> branch == null || file.getBranchId()
+                                                                                     .equals(projectBranches.get(
+                                                                                             branch)))
+                                               .map(FileInfo::getPath)
+                                               .collect(Collectors.toList());
+            List<String> notExistingFiles = files.stream()
+                                                 .map(file -> branch == null ? file : Utils.sepAtStart(Paths.get(branch, file).toString()))
+                                                 .filter(file -> !projectFiles.contains(file))
                                                  .collect(Collectors.toList());
             if (!notExistingFiles.isEmpty()) {
                 throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file_not_found"),
                                                          String.join("\n", notExistingFiles)));
             }
         }
-
+        files = branch != null ? files.stream().map(file->Utils.sepAtStart(Paths.get(branch, file).toString()))
+                                    .collect(Collectors.toList()): files;
         List<Long> fileIds = files == null ? null : project
-            .getFiles()
-            .stream()
-            .filter(file -> files.contains(file.getPath()))
-            .map(FileInfo::getId)
-            .collect(Collectors.toList());
+                .getFiles()
+                .stream()
+                .filter(file -> files.contains(file.getPath()))
+                .map(FileInfo::getId)
+                .collect(Collectors.toList());
 
         Distribution distribution;
-        AddDistributionRequest addDistributionRequest = RequestBuilder.addDistribution(name, exportMode, fileIds, bundleIds);
+        AddDistributionRequest addDistributionRequest = RequestBuilder.addDistribution(name, exportMode, fileIds,
+                                                                                       bundleIds);
         Optional.ofNullable(name).ifPresent(addDistributionRequest::setName);
         Optional.ofNullable(exportMode).ifPresent(addDistributionRequest::setExportMode);
         Optional.ofNullable(fileIds).ifPresent(addDistributionRequest::setFileIds);
@@ -72,7 +88,8 @@ public void act(Outputter out, ProjectProperties pb, ClientDistribution client)
             distribution = client.addDistribution(addDistributionRequest);
         } catch (Exception e) {
             throw new RuntimeException(
-                    String.format(RESOURCE_BUNDLE.getString("error.distribution_is_not_added"), addDistributionRequest), e);
+                    String.format(RESOURCE_BUNDLE.getString("error.distribution_is_not_added"), addDistributionRequest),
+                    e);
         }
         if (!plainView) {
             out.println(