feat: reduce error severity for files being updated. (#623)

crowdin · Aug 28, 2023 · 0a922dd · 0a922dd
1 parent 08e2870
commit 0a922dd
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 0 deletions.
diff --git a/src/main/java/com/crowdin/cli/client/CrowdinProjectClient.java b/src/main/java/com/crowdin/cli/client/CrowdinProjectClient.java
@@ -189,6 +189,7 @@ public void updateSource(Long sourceId, UpdateFileRequest request) throws Respon
         Map<BiPredicate<String, String>, ResponseException> errorHandlers = new LinkedHashMap<BiPredicate<String, String>, ResponseException>() {{
             put((code, message) -> message.contains("File from storage with id #" + request.getStorageId() + " was not found"), new RepeatException());
             put((code, message) -> StringUtils.contains(message, "Invalid SRX specified"), new ResponseException("Invalid SRX file specified"));
+            put((code, message) -> code.equals("409"), new FileInUpdateException());
         }};
         executeRequestWithPossibleRetry(
             errorHandlers,

diff --git a/src/main/java/com/crowdin/cli/client/FileInUpdateException.java b/src/main/java/com/crowdin/cli/client/FileInUpdateException.java
@@ -0,0 +1,4 @@
+package com.crowdin.cli.client;
+
+public class FileInUpdateException extends ResponseException {
+}
diff --git a/src/main/java/com/crowdin/cli/commands/actions/UploadSourcesAction.java b/src/main/java/com/crowdin/cli/commands/actions/UploadSourcesAction.java
@@ -3,6 +3,7 @@
 import com.crowdin.cli.client.CrowdinProjectFull;
 import com.crowdin.cli.client.EmptyFileException;
 import com.crowdin.cli.client.ExistsResponseException;
+import com.crowdin.cli.client.FileInUpdateException;
 import com.crowdin.cli.client.ProjectClient;
 import com.crowdin.cli.commands.NewAction;
 import com.crowdin.cli.commands.Outputter;
@@ -223,6 +224,13 @@ public void act(Outputter out, PropertiesWithFiles pb, ProjectClient client) {
                                     } else {
                                         out.println(fileFullPath);
                                     }
+                                } catch (FileInUpdateException e) {
+                                    if (!plainView) {
+                                        out.println(
+                                            SKIPPED.withIcon(String.format(RESOURCE_BUNDLE.getString("message.file_being_updated"), fileFullPath)));
+                                    } else {
+                                        out.println(RESOURCE_BUNDLE.getString("message.file_being_updated"));
+                                    }
                                 } catch (Exception e) {
                                     errorsPresented.set(true);
                                     throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.uploading_file"), fileFullPath), e);

diff --git a/src/main/resources/messages/messages.properties b/src/main/resources/messages/messages.properties
@@ -526,6 +526,7 @@ message.new_version_text.2=Changelog: @|cyan https://github.com/crowdin/crowdin-
 message.new_version_text.3=Please update for the best experience!
 message.uploading_file=File @|bold '%s'|@
 message.uploading_file_skipped=File @|bold '%s'|@ was skipped since it is empty
+message.file_being_updated=File @|bold '%s'|@ is currently being updated
 message.downloaded_file=File @|bold '%s'|@
 message.translation_file=Translation file @|bold '%s'|@
 message.build_language_archive=Building ZIP archive with the latest translations for @|bold '%s'|@