From 37e07eb5cd1cb6598d65b315a275f4bf19d8dd9e Mon Sep 17 00:00:00 2001
From: Kateryna Oblakevych <malutina.catya14@gmail.com>
Date: Tue, 12 Dec 2023 11:21:17 +0200
Subject: [PATCH 01/11] feat: file command

---
 .../cli/client/CrowdinClientLabel.java        |   2 +-
 .../crowdin/cli/client/CrowdinClientTask.java |   2 +-
 .../crowdin/cli/client/CrowdinClientTm.java   |   2 +-
 .../cli/client/CrowdinProjectClient.java      |  22 ++-
 .../cli/client/CrowdinProjectInfo.java        |  11 +-
 .../com/crowdin/cli/client/ProjectClient.java |  12 +-
 .../com/crowdin/cli/commands/Actions.java     |   6 +
 .../cli/commands/actions/CliActions.java      |  15 ++
 .../commands/actions/FileDeleteAction.java    |  36 ++++
 .../commands/actions/FileDownloadAction.java  | 117 +++++++++++++
 .../commands/actions/FileUploadAction.java    | 161 ++++++++++++++++++
 .../cli/commands/actions/TaskAddAction.java   |  43 +++--
 .../commands/actions/UploadSourcesAction.java |  31 +---
 .../functionality/RequestBuilder.java         |  12 +-
 .../cli/commands/picocli/CommandNames.java    |   5 +
 .../picocli/FileDeleteSubcommand.java         |  23 +++
 .../picocli/FileDownloadSubcommand.java       |  33 ++++
 .../cli/commands/picocli/FileSubcommand.java  |  20 +++
 .../picocli/FileUploadSubcommand.java         |  54 ++++++
 .../cli/commands/picocli/RootCommand.java     |   1 +
 .../resources/messages/messages.properties    |  10 ++
 .../cli/client/CrowdinClientTaskTest.java     |   2 +-
 .../commands/actions/TaskAddActionTest.java   |  11 +-
 versions.properties                           |   2 +-
 24 files changed, 545 insertions(+), 88 deletions(-)
 create mode 100644 src/main/java/com/crowdin/cli/commands/actions/FileDeleteAction.java
 create mode 100644 src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java
 create mode 100644 src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java
 create mode 100644 src/main/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommand.java
 create mode 100644 src/main/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommand.java
 create mode 100644 src/main/java/com/crowdin/cli/commands/picocli/FileSubcommand.java
 create mode 100644 src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java

diff --git a/src/main/java/com/crowdin/cli/client/CrowdinClientLabel.java b/src/main/java/com/crowdin/cli/client/CrowdinClientLabel.java
index 230324c4e..26404f734 100644
--- a/src/main/java/com/crowdin/cli/client/CrowdinClientLabel.java
+++ b/src/main/java/com/crowdin/cli/client/CrowdinClientLabel.java
@@ -18,7 +18,7 @@ public class CrowdinClientLabel extends CrowdinClientCore implements ClientLabel
     @Override
     public List<Label> listLabels() {
         return executeRequestFullList((limit, offset) -> this.client.getLabelsApi()
-            .listLabels(parseLong(this.projectId), limit, offset));
+            .listLabels(parseLong(this.projectId), limit, offset, null));
     }
 
     @Override
diff --git a/src/main/java/com/crowdin/cli/client/CrowdinClientTask.java b/src/main/java/com/crowdin/cli/client/CrowdinClientTask.java
index 0c819394a..f12f5f60a 100644
--- a/src/main/java/com/crowdin/cli/client/CrowdinClientTask.java
+++ b/src/main/java/com/crowdin/cli/client/CrowdinClientTask.java
@@ -19,7 +19,7 @@ public CrowdinClientTask(com.crowdin.client.Client client, String projectId) {
     @Override
     public List<Task> listTask(Status status) {
         return executeRequestFullList((limit, offset) -> this.client.getTasksApi()
-            .listTasks(Long.valueOf(projectId), limit, offset, status));
+            .listTasks(Long.valueOf(projectId), limit, offset, status, null));
     }
 
     @Override
diff --git a/src/main/java/com/crowdin/cli/client/CrowdinClientTm.java b/src/main/java/com/crowdin/cli/client/CrowdinClientTm.java
index dc1ced51f..ca81b2f4c 100644
--- a/src/main/java/com/crowdin/cli/client/CrowdinClientTm.java
+++ b/src/main/java/com/crowdin/cli/client/CrowdinClientTm.java
@@ -24,7 +24,7 @@ public CrowdinClientTm(com.crowdin.client.Client client) {
     @Override
     public List<TranslationMemory> listTms() {
         return executeRequestFullList((limit, offset) -> this.client.getTranslationMemoryApi()
-            .listTms(null, limit, offset));
+            .listTms(null, limit, offset, null));
     }
 
     @Override
diff --git a/src/main/java/com/crowdin/cli/client/CrowdinProjectClient.java b/src/main/java/com/crowdin/cli/client/CrowdinProjectClient.java
index 79df781bb..2ff7ab5e7 100644
--- a/src/main/java/com/crowdin/cli/client/CrowdinProjectClient.java
+++ b/src/main/java/com/crowdin/cli/client/CrowdinProjectClient.java
@@ -4,16 +4,11 @@
 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;
-import com.crowdin.client.sourcefiles.model.AddDirectoryRequest;
-import com.crowdin.client.sourcefiles.model.AddFileRequest;
-import com.crowdin.client.sourcefiles.model.Branch;
-import com.crowdin.client.sourcefiles.model.BuildReviewedSourceFilesRequest;
-import com.crowdin.client.sourcefiles.model.Directory;
-import com.crowdin.client.sourcefiles.model.ReviewedStringsBuild;
-import com.crowdin.client.sourcefiles.model.UpdateFileRequest;
+import com.crowdin.client.sourcefiles.model.*;
 import com.crowdin.client.sourcestrings.model.AddSourceStringRequest;
+import com.crowdin.client.sourcestrings.model.AddSourceStringStringsBasedRequest;
 import com.crowdin.client.sourcestrings.model.SourceString;
+import com.crowdin.client.sourcestrings.model.UploadStringsRequest;
 import com.crowdin.client.storage.model.Storage;
 import com.crowdin.client.stringcomments.model.AddStringCommentRequest;
 import com.crowdin.client.stringcomments.model.StringComment;
@@ -92,6 +87,7 @@ private void populateProjectWithLangs(CrowdinProject project) {
     private void populateProjectWithInfo(CrowdinProjectInfo project) {
         com.crowdin.client.projectsgroups.model.Project projectModel = this.getProject();
         project.setProjectId(projectModel.getId());
+        project.setType(projectModel.getType());
         project.setSourceLanguageId(projectModel.getSourceLanguageId());
         project.setProjectLanguages(projectModel.getTargetLanguages());
         if (projectModel instanceof ProjectSettings) {
@@ -223,6 +219,14 @@ public void addSource(AddFileRequest request) throws ResponseException {
                 .addFile(this.projectId, request));
     }
 
+    @Override
+    public void addSourceStringsBased(UploadStringsRequest request) {
+        //todo: errors handler
+        executeRequest(
+            () -> this.client.getSourceStringsApi().uploadStrings(this.projectId, request)
+        );
+    }
+
     @Override
     public void editSource(Long fileId, List<PatchRequest> request) {
         executeRequest(() -> this.client.getSourceFilesApi()
@@ -347,7 +351,7 @@ public URL exportProjectTranslation(ExportProjectTranslationRequest request) {
     @Override
     public List<Label> listLabels() {
         return executeRequestFullList((limit, offset) -> this.client.getLabelsApi()
-            .listLabels(this.projectId, limit, offset));
+            .listLabels(this.projectId, limit, offset, null));
     }
 
     @Override
diff --git a/src/main/java/com/crowdin/cli/client/CrowdinProjectInfo.java b/src/main/java/com/crowdin/cli/client/CrowdinProjectInfo.java
index d0b852704..2ee0b91bd 100644
--- a/src/main/java/com/crowdin/cli/client/CrowdinProjectInfo.java
+++ b/src/main/java/com/crowdin/cli/client/CrowdinProjectInfo.java
@@ -1,6 +1,7 @@
 package com.crowdin.cli.client;
 
 import com.crowdin.client.languages.model.Language;
+import com.crowdin.client.projectsgroups.model.Type;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -11,6 +12,7 @@ public class CrowdinProjectInfo {
     private Long projectId;
     private String sourceLanguageId;
     private Access accessLevel;
+    private Type type;
     private Language inContextLanguage;
     private LanguageMapping languageMapping;
     private List<Language> projectLanguages;
@@ -44,6 +46,14 @@ public boolean isManagerAccess() {
         return accessLevel == Access.MANAGER;
     }
 
+    public void setType(Type type) {
+        this.type = type;
+    }
+
+    public Type getType() {
+        return type;
+    }
+
     void setInContextLanguage(Language inContextLanguage) {
         this.inContextLanguage = inContextLanguage;
     }
@@ -90,5 +100,4 @@ public List<Language> getProjectLanguages(boolean withInContextLang) {
     public enum Access {
         TRANSLATOR, MANAGER
     }
-
 }
diff --git a/src/main/java/com/crowdin/cli/client/ProjectClient.java b/src/main/java/com/crowdin/cli/client/ProjectClient.java
index 8e7f11e2d..bb86ffc9b 100644
--- a/src/main/java/com/crowdin/cli/client/ProjectClient.java
+++ b/src/main/java/com/crowdin/cli/client/ProjectClient.java
@@ -3,16 +3,10 @@
 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;
-import com.crowdin.client.sourcefiles.model.AddFileRequest;
-import com.crowdin.client.sourcefiles.model.Branch;
-import com.crowdin.client.sourcefiles.model.BuildReviewedSourceFilesRequest;
-import com.crowdin.client.sourcefiles.model.Directory;
-import com.crowdin.client.sourcefiles.model.ReviewedStringsBuild;
-import com.crowdin.client.sourcefiles.model.UpdateFileRequest;
+import com.crowdin.client.sourcefiles.model.*;
 import com.crowdin.client.sourcestrings.model.AddSourceStringRequest;
 import com.crowdin.client.sourcestrings.model.SourceString;
+import com.crowdin.client.sourcestrings.model.UploadStringsRequest;
 import com.crowdin.client.stringcomments.model.AddStringCommentRequest;
 import com.crowdin.client.stringcomments.model.StringComment;
 import com.crowdin.client.translations.model.ApplyPreTranslationRequest;
@@ -55,6 +49,8 @@ default CrowdinProjectFull downloadFullProject() {
 
     void addSource(AddFileRequest request) throws ResponseException;
 
+    void addSourceStringsBased(UploadStringsRequest request);
+
     void editSource(Long fileId, List<PatchRequest> request);
 
     void deleteSource(Long fileId);
diff --git a/src/main/java/com/crowdin/cli/commands/Actions.java b/src/main/java/com/crowdin/cli/commands/Actions.java
index 09640cbd4..7f8d930b6 100644
--- a/src/main/java/com/crowdin/cli/commands/Actions.java
+++ b/src/main/java/com/crowdin/cli/commands/Actions.java
@@ -132,4 +132,10 @@ NewAction<PropertiesWithFiles, ProjectClient> preTranslate(
     NewAction<ProjectProperties, ClientLabel> labelAdd(String title, boolean plainView);
 
     NewAction<ProjectProperties, ClientLabel> labelDelete(String title);
+
+    NewAction<ProjectProperties, ProjectClient> fileUpload(File file, String branch, boolean autoUpdate, boolean preserveHierarchy, List<String> labels, String destination, List<String> excludedLanguages,  boolean plainView, boolean cleanupMode, boolean updateString);
+
+    NewAction<ProjectProperties, ProjectClient> fileDownload(String file, List<String> languageIds, String destParam);
+
+    NewAction<ProjectProperties, ProjectClient> fileDelete(String file);
 }
diff --git a/src/main/java/com/crowdin/cli/commands/actions/CliActions.java b/src/main/java/com/crowdin/cli/commands/actions/CliActions.java
index 20f1ee80b..29e2c5a41 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/CliActions.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/CliActions.java
@@ -276,4 +276,19 @@ public NewAction<ProjectProperties, ClientLabel> labelAdd(String title, boolean
     public NewAction<ProjectProperties, ClientLabel> labelDelete(String title) {
         return new LabelDeleteAction(title);
     }
+
+    @Override
+    public NewAction<ProjectProperties, ProjectClient> fileUpload(File file, String branch, boolean autoUpdate, boolean preserveHierarchy, List<String> labels, String destination, List<String> excludedLanguages, boolean plainView, boolean cleanupMode, boolean updateStrings) {
+        return new FileUploadAction(file, branch, autoUpdate, preserveHierarchy, labels, destination, cleanupMode, updateStrings, excludedLanguages, plainView);
+    }
+
+    @Override
+    public NewAction<ProjectProperties, ProjectClient> fileDownload(String file, List<String> languageIds, String destParam) {
+        return new FileDownloadAction(file, languageIds, destParam);
+    }
+
+    @Override
+    public NewAction<ProjectProperties, ProjectClient> fileDelete(String file) {
+        return new FileDeleteAction(file);
+    }
 }
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileDeleteAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileDeleteAction.java
new file mode 100644
index 000000000..8fc035cad
--- /dev/null
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileDeleteAction.java
@@ -0,0 +1,36 @@
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.cli.utils.console.ConsoleSpinner;
+import com.crowdin.client.sourcefiles.model.FileInfo;
+import lombok.AllArgsConstructor;
+
+import java.util.List;
+import java.util.Objects;
+
+import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
+
+@AllArgsConstructor
+class FileDeleteAction implements NewAction<ProjectProperties, ProjectClient> {
+
+    private final String file;
+
+    @Override
+    public void act(Outputter out, ProjectProperties properties, ProjectClient client) {
+        CrowdinProjectFull project = ConsoleSpinner
+            .execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
+                true, true, client::downloadFullProject);
+        String filePath = Utils.unixPath(file);
+        List<FileInfo> projectFiles = project.getFileInfos();
+        FileInfo foundFile = projectFiles.stream()
+            .filter(f -> Objects.equals(filePath, f.getPath()))
+            .findFirst()
+            .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file_not_found"), filePath)));
+        client.deleteSource(foundFile.getId());
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java
new file mode 100644
index 000000000..8cfb26f0b
--- /dev/null
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java
@@ -0,0 +1,117 @@
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.MaxNumberOfRetriesException;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.client.ResponseException;
+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.FsFiles;
+import com.crowdin.cli.commands.functionality.RequestBuilder;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.utils.PlaceholderUtil;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.cli.utils.console.ConsoleSpinner;
+import com.crowdin.client.languages.model.Language;
+import com.crowdin.client.sourcefiles.model.FileInfo;
+import com.crowdin.client.translations.model.BuildProjectTranslationRequest;
+import com.crowdin.client.translations.model.CrowdinTranslationCreateProjectBuildForm;
+import com.crowdin.client.translations.model.ProjectBuild;
+import lombok.AllArgsConstructor;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
+import static com.crowdin.cli.utils.console.ExecutionStatus.OK;
+import static com.crowdin.cli.utils.console.ExecutionStatus.WARNING;
+
+@AllArgsConstructor
+class FileDownloadAction implements NewAction<ProjectProperties, ProjectClient> {
+
+    private final String file;
+    private final List<String> languageIds;
+    private final String dest;
+
+    @Override
+    public void act(Outputter out, ProjectProperties properties, ProjectClient client) {
+        CrowdinProjectFull project = ConsoleSpinner
+            .execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
+                true, true, client::downloadFullProject);
+
+        if (Objects.nonNull(languageIds)) {
+            List<Language> languages = filterLanguages(project);
+            PlaceholderUtil placeholderUtil = new PlaceholderUtil(
+                project.getSupportedLanguages(),
+                project.getProjectLanguages(true),
+                properties.getBasePath()
+            );
+//            BuildProjectTranslationRequest request = new CrowdinTranslationCreateProjectBuildForm();
+            CrowdinTranslationCreateProjectBuildForm request = new CrowdinTranslationCreateProjectBuildForm();
+            request.setTargetLanguageIds(languages.stream().map(Language::getId).collect(Collectors.toList()));
+            ProjectBuild build;
+            try {
+                build = client.startBuildingTranslation(request);
+            } catch (MaxNumberOfRetriesException e) {
+                ConsoleSpinner.stop(WARNING, RESOURCE_BUNDLE.getString("message.warning.another_build_in_progress"));
+            } catch (ResponseException e) {
+                //todo
+            }
+
+            ConsoleSpinner.execute(out, "message.spinner.downloading_translation", "error.downloading_file", this.noProgress, this.plainView, () -> {
+                URL url = client.downloadBuild(build.getId());
+                try (InputStream data = url.openStream()) {
+                    files.writeToFile(archivePath, data);
+                } catch (IOException e) {
+                    throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.write_file"), archivePath), e);
+                }
+            });
+
+
+//            request
+            RequestBuilder.crowdinTranslationCreateProjectPseudoBuildForm(true, null, null, null, null);
+            FilesInterface filesInterface = new FsFiles();
+//            ProjectBuild projectBuild = buildTranslation(client, request);
+        }
+
+
+        String filePath = Utils.unixPath(file);
+        FileInfo foundFile = project.getFileInfos().stream()
+            .filter(f -> Objects.equals(filePath, f.getPath()))
+            .findFirst()
+            .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file_not_found"), filePath)));
+        URL url = client.downloadFile(foundFile.getId());
+        String destPath = Objects.nonNull(dest) ? Utils.normalizePath(dest) + foundFile.getName() : filePath;
+        FilesInterface files = new FsFiles();
+        try (InputStream data = url.openStream()) {
+            files.writeToFile(destPath, data);
+        } catch (IOException e) {
+            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.write_file"), filePath), e);
+        }
+        out.println(OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.downloaded_file"), filePath)));
+    }
+
+    private List<Language> filterLanguages(CrowdinProjectFull project) {
+        return languageIds.stream()
+            .map(lang -> project.findLanguageById(lang, true)
+                .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.language_not_exist"), lang))))
+            .collect(Collectors.toList());
+    }
+
+    private void downloadTranslations(FilesInterface filesInterface, ProjectClient client, Long buildId, String archivePath, Outputter out) {
+        ConsoleSpinner.execute(out, "message.spinner.downloading_translation", "error.downloading_file", true, true, () -> {
+            URL url = client.downloadBuild(buildId);
+            try (InputStream data = url.openStream()) {
+                filesInterface.writeToFile(archivePath, data);
+            } catch (IOException e) {
+                throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.write_file"), archivePath), e);
+            }
+            return url;
+        });
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java
new file mode 100644
index 000000000..89ce8d15b
--- /dev/null
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java
@@ -0,0 +1,161 @@
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.client.ResponseException;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.commands.functionality.*;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.utils.PlaceholderUtil;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.cli.utils.console.ConsoleSpinner;
+import com.crowdin.client.labels.model.AddLabelRequest;
+import com.crowdin.client.labels.model.Label;
+import com.crowdin.client.projectsgroups.model.Type;
+import com.crowdin.client.sourcefiles.model.AddFileRequest;
+import com.crowdin.client.sourcefiles.model.Branch;
+import com.crowdin.client.sourcefiles.model.FileInfo;
+import com.crowdin.client.sourcestrings.model.UploadStringsRequest;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
+import static java.util.Objects.nonNull;
+
+@AllArgsConstructor
+class FileUploadAction implements NewAction<ProjectProperties, ProjectClient> {
+
+    private final File file;
+    private final String branchName;
+    private final boolean autoUpdate;
+    private final boolean preserveHierarchy;
+    private final List<String> labels;
+    private final String dest;
+    private final boolean cleanupMode;
+    private final boolean updateStrings;
+    private final List<String> excludedLanguages;
+    private final boolean plainView;
+
+    @Override
+    public void act(Outputter out, ProjectProperties properties, ProjectClient client) {
+        CrowdinProjectFull project = ConsoleSpinner.execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
+            this.plainView, this.plainView, () -> client.downloadFullProject(branchName));
+        PlaceholderUtil placeholderUtil = new PlaceholderUtil(project.getSupportedLanguages(), project.getProjectLanguages(false), properties.getBasePath());
+
+        Optional<Branch> branch = Optional.empty();
+        if (StringUtils.isNotEmpty(branchName)) {
+            branch = Optional.ofNullable(BranchUtils.getOrCreateBranch(out, branchName, client, project, plainView));
+        }
+
+        Long storageId;
+        try {
+            storageId = client.uploadStorage(file.getName(), new FileInputStream(file));
+        } catch (ResponseException e) {
+            throw new RuntimeException(e);
+        } catch (FileNotFoundException e) {
+            throw new RuntimeException(e);
+        }
+
+        Optional<List<Long>> attachLabelIds = Optional.empty();
+        if (nonNull(labels) && !labels.isEmpty()) {
+            attachLabelIds = Optional.of(labels.stream().map(l -> getOrCreateLabel(l, client)).collect(Collectors.toList()));
+        }
+
+        Optional<List<String>> excludedLanguageNames = Optional.empty();
+//        if (nonNull(excludedLanguages) && !excludedLanguages.isEmpty()) {
+//            //attachLabelIds = Optional.of(labels.stream().map(l -> getOrCreateLabel()).collect(Collectors.toList()));
+//            excludedLanguageNames = filterExcludedLanguages(excludedLanguages);
+//        }
+
+//        Map<String, Long> directoryPaths = ProjectFilesUtils.buildDirectoryPaths(project.getDirectories(), project.getBranches())
+//            .entrySet().stream().collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey));
+//        Map<String, FileInfo> paths = ProjectFilesUtils.buildFilePaths(project.getDirectories(), project.getBranches(), project.getFileInfos());
+        String commonPath = SourcesUtils.getCommonPath(Collections.singletonList(this.file.getAbsolutePath()), properties.getBasePath());
+        final String filePath = (nonNull(dest))
+            ? PropertiesBeanUtils.prepareDest(dest, StringUtils.removeStart(file.getAbsolutePath(), properties.getBasePath()), placeholderUtil)
+            : StringUtils.removeStart(file.getAbsolutePath(), properties.getBasePath() + commonPath);
+        final String fileFullPath = (branchName != null ? branchName + Utils.PATH_SEPARATOR : "") + filePath;
+
+        Map<String, FileInfo> paths = ProjectFilesUtils.buildFilePaths(project.getDirectories(), project.getBranches(), project.getFileInfos());
+        FileInfo projectFile = paths.get(fileFullPath);
+
+
+
+
+        if (Type.FILES_BASED.equals(project.getType())) {
+            AddFileRequest request = new AddFileRequest();
+            request.setName(file.getName());
+            request.setStorageId(storageId);
+
+            if (preserveHierarchy) {
+                Optional<Long> directoryId = getOrCreateDirectoryId(out, client, project, properties, branch.orElse(null));
+                directoryId.ifPresent(request::setDirectoryId);
+            }
+            attachLabelIds.ifPresent(request::setAttachLabelIds);
+            branch.ifPresent(b -> request.setBranchId(b.getId()));
+            excludedLanguageNames.ifPresent(request::setExcludedTargetLanguages);
+            try {
+                client.addSource(request);
+            } catch (ResponseException e) {
+
+            }
+
+        }
+        if (Type.STRINGS_BASED.equals(project.getType())) {
+            UploadStringsRequest request = new UploadStringsRequest();
+            request.setBranchId(branch.orElseThrow(() -> new RuntimeException("fjf")).getId());
+            request.setCleanupMode(cleanupMode);
+            attachLabelIds.ifPresent(request::setLabelIds);
+            request.setUpdateStrings(updateStrings);
+            request.setStorageId(storageId);
+            client.addSourceStringsBased(request);
+        }
+
+    }
+
+    private Long getOrCreateLabel(String labelName, ProjectClient client) {
+        Map<String, Long> labelList = client.listLabels().stream()
+            .collect(Collectors.toMap(Label::getTitle, Label::getId));
+        if (labelList.containsKey(labelName)) return labelList.get(labelName);
+        else {
+            Label createdLabel = new Label();
+            try {
+                AddLabelRequest request = new AddLabelRequest();
+                request.setTitle(labelName);
+                createdLabel = client.addLabel(request);
+            } catch (Exception e) {
+                System.out.println(e);
+            }
+            return createdLabel.getId();
+        }
+    }
+
+    private Optional<Long> getOrCreateDirectoryId(Outputter out, ProjectClient client, CrowdinProjectFull project, ProjectProperties properties, Branch branch) {
+        Optional<Long> directoryId;
+        Map<String, Long> directoryPaths = ProjectFilesUtils.buildDirectoryPaths(project.getDirectories(), project.getBranches())
+            .entrySet().stream().collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey));
+        String commonPath = SourcesUtils.getCommonPath(Collections.singletonList(this.file.getAbsolutePath()), properties.getBasePath());
+        PlaceholderUtil placeholderUtil = new PlaceholderUtil(project.getSupportedLanguages(), project.getProjectLanguages(false), properties.getBasePath());
+        String filePath = (nonNull(dest))
+            ? PropertiesBeanUtils.prepareDest(dest, StringUtils.removeStart(this.file.getAbsolutePath(), properties.getBasePath()), placeholderUtil)
+            : StringUtils.removeStart(this.file.getAbsolutePath(), properties.getBasePath() + commonPath);
+
+        try {
+            directoryId = Optional.ofNullable(ProjectUtils.createPath(out, client, directoryPaths, filePath, branch, this.plainView));
+        } catch (Exception e) {
+//                    errorsPresented.set(true);
+            throw new RuntimeException(RESOURCE_BUNDLE.getString("error.creating_directories"), e);
+        }
+        return directoryId;
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/actions/TaskAddAction.java b/src/main/java/com/crowdin/cli/commands/actions/TaskAddAction.java
index 84f0936a9..bdde8afae 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/TaskAddAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/TaskAddAction.java
@@ -13,10 +13,7 @@
 import com.crowdin.cli.utils.Utils;
 import com.crowdin.cli.utils.console.ConsoleSpinner;
 import com.crowdin.client.sourcefiles.model.FileInfo;
-import com.crowdin.client.tasks.model.AddTaskRequest;
-import com.crowdin.client.tasks.model.CrowdinTaskCreateFormRequest;
-import com.crowdin.client.tasks.model.EnterpriseTaskCreateFormRequest;
-import com.crowdin.client.tasks.model.Task;
+import com.crowdin.client.tasks.model.*;
 
 import lombok.AllArgsConstructor;
 
@@ -96,26 +93,26 @@ public void act(Outputter out, ProjectProperties pb, ClientTask client) {
         }
 
         if (isOrganization) {
-            addTaskRequest = new EnterpriseTaskCreateFormRequest();
-            Optional.ofNullable(title).ifPresent(value -> ((EnterpriseTaskCreateFormRequest) addTaskRequest).setTitle(value));
-            Optional.ofNullable(language).ifPresent(value -> ((EnterpriseTaskCreateFormRequest) addTaskRequest).setLanguageId(value));
-            Optional.ofNullable(fileIds).ifPresent(value -> ((EnterpriseTaskCreateFormRequest) addTaskRequest).setFileIds(value));
-            Optional.ofNullable(description).ifPresent(value -> ((EnterpriseTaskCreateFormRequest) addTaskRequest).setDescription(value));
-            Optional.ofNullable(skipAssignedStrings).ifPresent(value -> ((EnterpriseTaskCreateFormRequest) addTaskRequest).setSkipAssignedStrings(value));
-            Optional.ofNullable(includePreTranslatedStringsOnly).ifPresent(value -> ((EnterpriseTaskCreateFormRequest) addTaskRequest).setIncludePreTranslatedStringsOnly(value));
-            Optional.ofNullable(labels).ifPresent(value -> ((EnterpriseTaskCreateFormRequest) addTaskRequest).setLabelIds(value));
-            Optional.ofNullable(workflowStep).ifPresent(value -> ((EnterpriseTaskCreateFormRequest) addTaskRequest).setWorkflowStepId(value));
+            addTaskRequest = new CreateTaskEnterpriseRequest();
+            Optional.ofNullable(title).ifPresent(value -> ((CreateTaskEnterpriseRequest) addTaskRequest).setTitle(value));
+            Optional.ofNullable(language).ifPresent(value -> ((CreateTaskEnterpriseRequest) addTaskRequest).setLanguageId(value));
+            Optional.ofNullable(fileIds).ifPresent(value -> ((CreateTaskEnterpriseRequest) addTaskRequest).setFileIds(value));
+            Optional.ofNullable(description).ifPresent(value -> ((CreateTaskEnterpriseRequest) addTaskRequest).setDescription(value));
+            Optional.ofNullable(skipAssignedStrings).ifPresent(value -> ((CreateTaskEnterpriseRequest) addTaskRequest).setSkipAssignedStrings(value));
+            Optional.ofNullable(includePreTranslatedStringsOnly).ifPresent(value -> ((CreateTaskEnterpriseRequest) addTaskRequest).setIncludePreTranslatedStringsOnly(value));
+            Optional.ofNullable(labels).ifPresent(value -> ((CreateTaskEnterpriseRequest) addTaskRequest).setLabelIds(value));
+            Optional.ofNullable(workflowStep).ifPresent(value -> ((CreateTaskEnterpriseRequest) addTaskRequest).setWorkflowStepId(value));
         } else {
-            addTaskRequest = new CrowdinTaskCreateFormRequest();
-            Optional.ofNullable(title).ifPresent(value -> ((CrowdinTaskCreateFormRequest) addTaskRequest).setTitle(value));
-            Optional.ofNullable(type).ifPresent(value -> ((CrowdinTaskCreateFormRequest) addTaskRequest).setType(value));
-            Optional.ofNullable(language).ifPresent(value -> ((CrowdinTaskCreateFormRequest) addTaskRequest).setLanguageId(value));
-            Optional.ofNullable(fileIds).ifPresent(value -> ((CrowdinTaskCreateFormRequest) addTaskRequest).setFileIds(value));
-            Optional.ofNullable(description).ifPresent(value -> ((CrowdinTaskCreateFormRequest) addTaskRequest).setDescription(value));
-            Optional.ofNullable(skipAssignedStrings).ifPresent(value -> ((CrowdinTaskCreateFormRequest) addTaskRequest).setSkipAssignedStrings(value));
-            Optional.ofNullable(skipUntranslatedStrings).ifPresent(value -> ((CrowdinTaskCreateFormRequest) addTaskRequest).setSkipUntranslatedStrings(value));
-            Optional.ofNullable(includePreTranslatedStringsOnly).ifPresent(value -> ((CrowdinTaskCreateFormRequest) addTaskRequest).setIncludePreTranslatedStringsOnly(value));
-            Optional.ofNullable(labels).ifPresent(value -> ((CrowdinTaskCreateFormRequest) addTaskRequest).setLabelIds(value));
+            addTaskRequest = new CreateTaskRequest();
+            Optional.ofNullable(title).ifPresent(value -> ((CreateTaskRequest) addTaskRequest).setTitle(value));
+            Optional.ofNullable(type).ifPresent(value -> ((CreateTaskRequest) addTaskRequest).setType(Type.from(String.valueOf(value))));
+            Optional.ofNullable(language).ifPresent(value -> ((CreateTaskRequest) addTaskRequest).setLanguageId(value));
+            Optional.ofNullable(fileIds).ifPresent(value -> ((CreateTaskRequest) addTaskRequest).setFileIds(value));
+            Optional.ofNullable(description).ifPresent(value -> ((CreateTaskRequest) addTaskRequest).setDescription(value));
+            Optional.ofNullable(skipAssignedStrings).ifPresent(value -> ((CreateTaskRequest) addTaskRequest).setSkipAssignedStrings(value));
+            Optional.ofNullable(skipUntranslatedStrings).ifPresent(value -> ((CreateTaskRequest) addTaskRequest).setSkipUntranslatedStrings(value));
+            Optional.ofNullable(includePreTranslatedStringsOnly).ifPresent(value -> ((CreateTaskRequest) addTaskRequest).setIncludePreTranslatedStringsOnly(value));
+            Optional.ofNullable(labels).ifPresent(value -> ((CreateTaskRequest) addTaskRequest).setLabelIds(value));
         }
 
         try {
diff --git a/src/main/java/com/crowdin/cli/commands/actions/UploadSourcesAction.java b/src/main/java/com/crowdin/cli/commands/actions/UploadSourcesAction.java
index e22987139..cd31356c6 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/UploadSourcesAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/UploadSourcesAction.java
@@ -8,12 +8,7 @@
 import com.crowdin.cli.commands.NewAction;
 import com.crowdin.cli.commands.Outputter;
 import com.crowdin.cli.commands.actions.subactions.DeleteObsoleteProjectFilesSubAction;
-import com.crowdin.cli.commands.functionality.ProjectFilesUtils;
-import com.crowdin.cli.commands.functionality.ProjectUtils;
-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.utils.PlaceholderUtil;
@@ -94,7 +89,7 @@ public void act(Outputter out, PropertiesWithFiles pb, ProjectClient client) {
 
         PlaceholderUtil placeholderUtil = new PlaceholderUtil(project.getSupportedLanguages(), project.getProjectLanguages(false), pb.getBasePath());
 
-        Branch branch = (branchName != null) ? this.getOrCreateBranch(out, branchName, client, project) : null;
+        Branch branch = (branchName != null) ? BranchUtils.getOrCreateBranch(out, branchName, client, project, plainView) : null;
         Long branchId = (branch != null) ? branch.getId() : null;
 
         Map<String, Long> directoryPaths = ProjectFilesUtils.buildDirectoryPaths(project.getDirectories(), project.getBranches())
@@ -390,28 +385,6 @@ private ExportOptions buildExportOptions(java.io.File sourceFile, FileBean fileB
         }
     }
 
-    private Branch getOrCreateBranch(Outputter out, String branchName, ProjectClient client, CrowdinProjectFull project) {
-        if (StringUtils.isEmpty(branchName)) {
-            return null;
-        }
-        Optional<Branch> branchOpt = project.findBranchByName(branchName);
-        if (branchOpt.isPresent()) {
-            if (!plainView) {
-                out.println(SKIPPED.withIcon(String.format(RESOURCE_BUNDLE.getString("message.branch_already_exists"), branchName)));
-            }
-            return branchOpt.get();
-        } else {
-            AddBranchRequest request = new AddBranchRequest();
-            request.setName(branchName);
-            Branch newBranch = client.addBranch(request);
-            if (!plainView) {
-                out.println(ExecutionStatus.OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.branch"), branchName)));
-            }
-            project.addBranchToLocalList(newBranch);
-            return newBranch;
-        }
-    }
-
     private void checkExcludedTargetLanguages(List<String> excludedTargetLanguages, List<Language> supportedLanguages, List<Language> projectLanguages) {
         if (excludedTargetLanguages != null && !excludedTargetLanguages.isEmpty()) {
             List<String> supportedLanguageIds = supportedLanguages.stream()
diff --git a/src/main/java/com/crowdin/cli/commands/functionality/RequestBuilder.java b/src/main/java/com/crowdin/cli/commands/functionality/RequestBuilder.java
index 2f3156d24..51715fe5d 100644
--- a/src/main/java/com/crowdin/cli/commands/functionality/RequestBuilder.java
+++ b/src/main/java/com/crowdin/cli/commands/functionality/RequestBuilder.java
@@ -14,8 +14,8 @@
 import com.crowdin.client.sourcestrings.model.AddSourceStringRequest;
 import com.crowdin.client.stringcomments.model.AddStringCommentRequest;
 import com.crowdin.client.stringcomments.model.Type;
-import com.crowdin.client.tasks.model.CrowdinTaskCreateFormRequest;
-import com.crowdin.client.tasks.model.EnterpriseTaskCreateFormRequest;
+import com.crowdin.client.tasks.model.CreateTaskRequest;
+import com.crowdin.client.tasks.model.CreateTaskEnterpriseRequest;
 import com.crowdin.client.translationmemory.model.AddTranslationMemoryRequest;
 import com.crowdin.client.translationmemory.model.TranslationMemoryExportRequest;
 import com.crowdin.client.translationmemory.model.TranslationMemoryFormat;
@@ -68,8 +68,8 @@ public static AddDistributionRequest addDistribution(String name, ExportMode exp
         return request;
     }
 
-    public static CrowdinTaskCreateFormRequest addCrowdinTask(String title, Integer type, String languageId, List<Long> fileId, String description, boolean skipAssignedStrings, boolean skipUntranslatedStrings, boolean includePreTranslatedStringsOnly, List<Long> labelIds) {
-        CrowdinTaskCreateFormRequest request = new CrowdinTaskCreateFormRequest();
+    public static CreateTaskRequest addCrowdinTask(String title, com.crowdin.client.tasks.model.Type type, String languageId, List<Long> fileId, String description, boolean skipAssignedStrings, boolean skipUntranslatedStrings, boolean includePreTranslatedStringsOnly, List<Long> labelIds) {
+        CreateTaskRequest request = new CreateTaskRequest();
         request.setTitle(title);
         request.setType(type);
         request.setLanguageId(languageId);
@@ -82,8 +82,8 @@ public static CrowdinTaskCreateFormRequest addCrowdinTask(String title, Integer
         return request;
     }
 
-    public static EnterpriseTaskCreateFormRequest addEnterpriseTask(String title, String languageId, List<Long> fileId, String description, boolean skipAssignedStrings, boolean includePreTranslatedStringsOnly, List<Long> labelIds, Long workflowStepId) {
-        EnterpriseTaskCreateFormRequest request = new EnterpriseTaskCreateFormRequest();
+    public static CreateTaskEnterpriseRequest addEnterpriseTask(String title, String languageId, List<Long> fileId, String description, boolean skipAssignedStrings, boolean includePreTranslatedStringsOnly, List<Long> labelIds, Long workflowStepId) {
+        CreateTaskEnterpriseRequest request = new CreateTaskEnterpriseRequest();
         request.setTitle(title);
         request.setLanguageId(languageId);
         request.setFileIds(fileId);
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/CommandNames.java b/src/main/java/com/crowdin/cli/commands/picocli/CommandNames.java
index bdc6bb210..4db2dc227 100644
--- a/src/main/java/com/crowdin/cli/commands/picocli/CommandNames.java
+++ b/src/main/java/com/crowdin/cli/commands/picocli/CommandNames.java
@@ -79,4 +79,9 @@ public final class CommandNames {
     public static final String LABEL_LIST = "list";
     public static final String LABEL_ADD = "add";
     public static final String LABEL_DELETE = "delete";
+
+    public static final String FILE = "file";
+    public static final String FILE_UPLOAD = "upload";
+    public static final String FILE_DOWNLOAD = "download";
+    public static final String FILE_DELETE = "delete";
 }
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommand.java
new file mode 100644
index 000000000..c91535059
--- /dev/null
+++ b/src/main/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommand.java
@@ -0,0 +1,23 @@
+package com.crowdin.cli.commands.picocli;
+
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.Actions;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.properties.ProjectProperties;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Parameters;
+
+@Command(
+    name = CommandNames.FILE_DELETE,
+    sortOptions = false
+)
+class FileDeleteSubcommand extends ActCommandProject {
+
+    @Parameters(descriptionKey = "crowdin.file.file")
+    protected String file;
+
+    @Override
+    protected NewAction<ProjectProperties, ProjectClient> getAction(Actions actions) {
+        return actions.fileDelete(file);
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommand.java
new file mode 100644
index 000000000..cc65ecc49
--- /dev/null
+++ b/src/main/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommand.java
@@ -0,0 +1,33 @@
+package com.crowdin.cli.commands.picocli;
+
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.Actions;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.properties.ProjectProperties;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
+import picocli.CommandLine.Parameters;
+
+import java.io.File;
+import java.util.List;
+
+@Command(
+    name = CommandNames.FILE_DOWNLOAD,
+    sortOptions = false
+)
+class FileDownloadSubcommand extends ActCommandProject {
+
+    @Parameters(descriptionKey = "crowdin.file.upload.file")
+    protected File file;
+
+    @Option(names = {"-l", "--language"}, paramLabel = "...", order = -2)
+    protected List<String> languageIds;
+
+    @Option(names = {"--dest"}, paramLabel = "...", descriptionKey = "crowdin.file.dest")
+    private String destination;
+
+    @Override
+    protected NewAction<ProjectProperties, ProjectClient> getAction(Actions actions) {
+        return actions.fileDownload(file, languageIds, destination);
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/FileSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/FileSubcommand.java
new file mode 100644
index 000000000..fc36e5a3a
--- /dev/null
+++ b/src/main/java/com/crowdin/cli/commands/picocli/FileSubcommand.java
@@ -0,0 +1,20 @@
+package com.crowdin.cli.commands.picocli;
+
+import picocli.CommandLine;
+import picocli.CommandLine.Command;
+
+@Command(
+    name = CommandNames.FILE,
+    subcommands = {
+        ScreenshotListSubcommand.class,
+        ScreenshotUploadSubcommand.class,
+        ScreenshotDeleteSubcommand.class
+    }
+)
+class FileSubcommand extends HelpCommand {
+
+    @Override
+    protected CommandLine getCommand(CommandLine rootCommand) {
+        return rootCommand.getSubcommands().get(CommandNames.FILE);
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java
new file mode 100644
index 000000000..23b3e76e7
--- /dev/null
+++ b/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java
@@ -0,0 +1,54 @@
+package com.crowdin.cli.commands.picocli;
+
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.Actions;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.properties.ProjectProperties;
+import picocli.CommandLine;
+import picocli.CommandLine.Option;
+import picocli.CommandLine.Parameters;
+
+import java.io.File;
+import java.util.List;
+
+@CommandLine.Command(
+    name = CommandNames.FILE_UPLOAD,
+    sortOptions = false
+)
+class FileUploadSubcommand extends ActCommandProject {
+
+    @Parameters(descriptionKey = "crowdin.file.upload.file")
+    protected File file;
+
+    @Option(names = {"-b", "--branch"}, paramLabel = "...", order = -2)
+    protected String branch;
+
+    @Option(names = {"--no-auto-update"}, negatable = true, order = -2)
+    protected boolean autoUpdate = true;
+
+    @Option(names = {"--preserve-hierarchy"}, negatable = true, paramLabel = "...", descriptionKey = "params.preserve-hierarchy")
+    private boolean preserveHierarchy;
+
+    @Option(names = {"--label"}, descriptionKey = "params.label", paramLabel = "...", order = -2)
+    protected List<String> labels;
+
+    @Option(names = {"--dest"}, paramLabel = "...", descriptionKey = "crowdin.file.dest")
+    private String destination;
+
+    @Option(names = {"--excluded-language"}, descriptionKey = "params.excluded-languages", paramLabel = "...", order = -2)
+    protected List<String> excludedLanguages;
+
+    @Option(names = {"--no-cleanup-mode"}, negatable = true, order = -2)
+    protected boolean cleanupMode;
+
+    @Option(names = {"--no-update-strings"}, negatable = true, order = -2)
+    protected boolean updateStrings;
+
+    @Option(names = {"--plain"}, descriptionKey = "crowdin.list.usage.plain")
+    protected boolean plainView;
+
+    @Override
+    protected NewAction<ProjectProperties, ProjectClient> getAction(Actions actions) {
+        return actions.fileUpload(file, branch, autoUpdate, preserveHierarchy, labels, destination, excludedLanguages, plainView, cleanupMode, updateStrings);
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/RootCommand.java b/src/main/java/com/crowdin/cli/commands/picocli/RootCommand.java
index 48a6f6118..ac43ef92e 100644
--- a/src/main/java/com/crowdin/cli/commands/picocli/RootCommand.java
+++ b/src/main/java/com/crowdin/cli/commands/picocli/RootCommand.java
@@ -23,6 +23,7 @@
         DistributionSubcommand.class,
         ScreenshotSubcommand.class,
         LabelSubcommand.class,
+        FileSubcommand.class,
     })
 class RootCommand extends HelpCommand {
     @Override
diff --git a/src/main/resources/messages/messages.properties b/src/main/resources/messages/messages.properties
index 1594f9cc4..9dc5cd68c 100755
--- a/src/main/resources/messages/messages.properties
+++ b/src/main/resources/messages/messages.properties
@@ -121,6 +121,16 @@ crowdin.upload.translations.auto-approve-imported=Approve added translations aut
 crowdin.upload.translations.import-eq-suggestions=Add translations even if they're the same as the source strings in your Crowdin project
 crowdin.upload.translations.translate-hidden=Upload translations to hidden source strings
 
+# CROWDIN FILE COMMAND
+crowdin.file.file=File path to add
+crowdin.file.dest=File destination in the Crowdin project
+
+# CROWDIN FILE UPLOAD COMMAND
+
+# CROWDIN FILE DOWNLOAD COMMAND
+
+# CROWDIN FILE DELETE COMMAND
+
 # CROWDIN STATUS COMMAND
 crowdin.status.usage.description=Show translation and proofreading progress for a project
 crowdin.status.usage.customSynopsis=@|fg(green) crowdin status|@ [SUBCOMMAND] [CONFIG OPTIONS] [OPTIONS]
diff --git a/src/test/java/com/crowdin/cli/client/CrowdinClientTaskTest.java b/src/test/java/com/crowdin/cli/client/CrowdinClientTaskTest.java
index 591485af0..fb9ac0e8f 100644
--- a/src/test/java/com/crowdin/cli/client/CrowdinClientTaskTest.java
+++ b/src/test/java/com/crowdin/cli/client/CrowdinClientTaskTest.java
@@ -61,7 +61,7 @@ public void testAddTask() {
         when(httpClientMock.post(eq(addTmUrl), any(), any(), eq(TaskResponseObject.class)))
                 .thenReturn(response);
 
-        client.addTask(new AddTaskRequest());
+        client.addTask(new CreateTaskRequest());
 
         verify(httpClientMock).post(eq(addTmUrl), any(), any(), eq(TaskResponseObject.class));
         verifyNoMoreInteractions(httpClientMock);
diff --git a/src/test/java/com/crowdin/cli/commands/actions/TaskAddActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/TaskAddActionTest.java
index 1aea89bd4..127588b10 100644
--- a/src/test/java/com/crowdin/cli/commands/actions/TaskAddActionTest.java
+++ b/src/test/java/com/crowdin/cli/commands/actions/TaskAddActionTest.java
@@ -14,10 +14,7 @@
 import com.crowdin.cli.utils.Utils;
 import com.crowdin.client.labels.model.Label;
 import com.crowdin.client.sourcestrings.model.AddSourceStringRequest;
-import com.crowdin.client.tasks.model.AddTaskRequest;
-import com.crowdin.client.tasks.model.CrowdinTaskCreateFormRequest;
-import com.crowdin.client.tasks.model.EnterpriseTaskCreateFormRequest;
-import com.crowdin.client.tasks.model.Task;
+import com.crowdin.client.tasks.model.*;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
@@ -57,7 +54,7 @@ public void testTaskAdd(String title, Integer type, String languageId, Map<Strin
         when(projectClient.downloadFullProject(any()))
                 .thenReturn(projectBuilder.build());
 
-        CrowdinTaskCreateFormRequest request = RequestBuilder.addCrowdinTask(title, type, languageId, new ArrayList<>(filesMap.values()),
+        CreateTaskRequest request = RequestBuilder.addCrowdinTask(title, Type.from(String.valueOf(type)), languageId, new ArrayList<>(filesMap.values()),
                 description, skipAssignedStrings, skipUntranslatedStrings, includePreTranslatedStringsOnly, labelIds);
 
         ClientTask client = mock(ClientTask.class);
@@ -109,7 +106,7 @@ public void testEnterpriseTaskAdd(String title, String languageId, Map<String, L
         when(projectClient.downloadFullProject(any()))
                 .thenReturn(projectBuilder.build());
 
-        EnterpriseTaskCreateFormRequest request = RequestBuilder.addEnterpriseTask(title, languageId, new ArrayList<>(filesMap.values()),
+        CreateTaskEnterpriseRequest request = RequestBuilder.addEnterpriseTask(title, languageId, new ArrayList<>(filesMap.values()),
                 description, skipAssignedStrings, false, labelIds, workflowStepId);
 
         ClientTask client = mock(ClientTask.class);
@@ -150,7 +147,7 @@ public void testAddTaskThrows() {
         when(projectClient.downloadFullProject(any()))
                 .thenReturn(projectBuilder.build());
 
-        CrowdinTaskCreateFormRequest request = RequestBuilder.addCrowdinTask(null, null, null,
+        CreateTaskRequest request = RequestBuilder.addCrowdinTask(null, null, null,
                 Arrays.asList(1L), null, false, false, false, null);
 
         when(client.addTask(request))
diff --git a/versions.properties b/versions.properties
index c11315083..0968aaae8 100644
--- a/versions.properties
+++ b/versions.properties
@@ -45,7 +45,7 @@ version.commons-cli..commons-cli=1.5.0
 
 version.com.h3xstream.findsecbugs..findsecbugs-plugin=1.12.0
 
-version.com.github.crowdin..crowdin-api-client-java=1.11.5
+version.com.github.crowdin..crowdin-api-client-java=1.13.0
 
 plugin.org.asciidoctor.jvm.convert=3.3.2
 

From a250a1951f194c3c836b23a36e3634841a43a4f9 Mon Sep 17 00:00:00 2001
From: Kateryna Oblakevych <malutina.catya14@gmail.com>
Date: Fri, 5 Jan 2024 04:15:14 +0200
Subject: [PATCH 02/11] commit

---
 .../cli/client/CrowdinProjectClient.java      |   7 +-
 .../com/crowdin/cli/commands/Actions.java     |   2 +-
 .../cli/commands/actions/CliActions.java      |   4 +-
 .../commands/actions/FileDownloadAction.java  |  16 +-
 .../commands/actions/FileUploadAction.java    | 167 ++++++++++++------
 .../picocli/FileDownloadSubcommand.java       |   2 +-
 .../cli/commands/picocli/FileSubcommand.java  |   6 +-
 .../picocli/FileUploadSubcommand.java         |   5 +-
 8 files changed, 131 insertions(+), 78 deletions(-)

diff --git a/src/main/java/com/crowdin/cli/client/CrowdinProjectClient.java b/src/main/java/com/crowdin/cli/client/CrowdinProjectClient.java
index 2ff7ab5e7..2f845317b 100644
--- a/src/main/java/com/crowdin/cli/client/CrowdinProjectClient.java
+++ b/src/main/java/com/crowdin/cli/client/CrowdinProjectClient.java
@@ -4,6 +4,7 @@
 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.projectsgroups.model.Type;
 import com.crowdin.client.sourcefiles.model.*;
 import com.crowdin.client.sourcestrings.model.AddSourceStringRequest;
 import com.crowdin.client.sourcestrings.model.AddSourceStringStringsBasedRequest;
@@ -23,10 +24,7 @@
 
 import java.io.InputStream;
 import java.net.URL;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.function.BiPredicate;
 
 import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
@@ -73,6 +71,7 @@ private void populateProjectWithStructure(CrowdinProjectFull project, String bra
                 )
                 .ifPresent(project::setBranch);
         Long branchId = Optional.ofNullable(project.getBranch()).map(Branch::getId).orElse(null);
+        if (Objects.equals(project.getType(), Type.STRINGS_BASED)) return;
         project.setFiles(executeRequestFullList((limit, offset) -> this.client.getSourceFilesApi()
             .listFiles(this.projectId, branchId, null, null, true, limit, offset)));
         project.setDirectories(executeRequestFullList((limit, offset) -> this.client.getSourceFilesApi()
diff --git a/src/main/java/com/crowdin/cli/commands/Actions.java b/src/main/java/com/crowdin/cli/commands/Actions.java
index 7f8d930b6..44667af72 100644
--- a/src/main/java/com/crowdin/cli/commands/Actions.java
+++ b/src/main/java/com/crowdin/cli/commands/Actions.java
@@ -133,7 +133,7 @@ NewAction<PropertiesWithFiles, ProjectClient> preTranslate(
 
     NewAction<ProjectProperties, ClientLabel> labelDelete(String title);
 
-    NewAction<ProjectProperties, ProjectClient> fileUpload(File file, String branch, boolean autoUpdate, boolean preserveHierarchy, List<String> labels, String destination, List<String> excludedLanguages,  boolean plainView, boolean cleanupMode, boolean updateString);
+    NewAction<ProjectProperties, ProjectClient> fileUpload(File file, String branch, boolean autoUpdate, List<String> labels, String destination, List<String> excludedLanguages,  boolean plainView, boolean cleanupMode, boolean updateString);
 
     NewAction<ProjectProperties, ProjectClient> fileDownload(String file, List<String> languageIds, String destParam);
 
diff --git a/src/main/java/com/crowdin/cli/commands/actions/CliActions.java b/src/main/java/com/crowdin/cli/commands/actions/CliActions.java
index 29e2c5a41..d9e24c788 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/CliActions.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/CliActions.java
@@ -278,8 +278,8 @@ public NewAction<ProjectProperties, ClientLabel> labelDelete(String title) {
     }
 
     @Override
-    public NewAction<ProjectProperties, ProjectClient> fileUpload(File file, String branch, boolean autoUpdate, boolean preserveHierarchy, List<String> labels, String destination, List<String> excludedLanguages, boolean plainView, boolean cleanupMode, boolean updateStrings) {
-        return new FileUploadAction(file, branch, autoUpdate, preserveHierarchy, labels, destination, cleanupMode, updateStrings, excludedLanguages, plainView);
+    public NewAction<ProjectProperties, ProjectClient> fileUpload(File file, String branch, boolean autoUpdate, List<String> labels, String destination, List<String> excludedLanguages, boolean plainView, boolean cleanupMode, boolean updateStrings) {
+        return new FileUploadAction(file, branch, autoUpdate, labels, destination, cleanupMode, updateStrings, excludedLanguages, plainView);
     }
 
     @Override
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java
index 8cfb26f0b..7a3a2b867 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java
@@ -63,14 +63,14 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
                 //todo
             }
 
-            ConsoleSpinner.execute(out, "message.spinner.downloading_translation", "error.downloading_file", this.noProgress, this.plainView, () -> {
-                URL url = client.downloadBuild(build.getId());
-                try (InputStream data = url.openStream()) {
-                    files.writeToFile(archivePath, data);
-                } catch (IOException e) {
-                    throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.write_file"), archivePath), e);
-                }
-            });
+//            ConsoleSpinner.execute(out, "message.spinner.downloading_translation", "error.downloading_file", this.noProgress, this.plainView, () -> {
+//                URL url = client.downloadBuild(build.getId());
+//                try (InputStream data = url.openStream()) {
+//                    files.writeToFile(archivePath, data);
+//                } catch (IOException e) {
+//                    throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.write_file"), archivePath), e);
+//                }
+//            });
 
 
 //            request
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java
index 89ce8d15b..895f9cd2e 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java
@@ -1,8 +1,6 @@
 package com.crowdin.cli.commands.actions;
 
-import com.crowdin.cli.client.CrowdinProjectFull;
-import com.crowdin.cli.client.ProjectClient;
-import com.crowdin.cli.client.ResponseException;
+import com.crowdin.cli.client.*;
 import com.crowdin.cli.commands.NewAction;
 import com.crowdin.cli.commands.Outputter;
 import com.crowdin.cli.commands.functionality.*;
@@ -10,26 +8,26 @@
 import com.crowdin.cli.utils.PlaceholderUtil;
 import com.crowdin.cli.utils.Utils;
 import com.crowdin.cli.utils.console.ConsoleSpinner;
+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.languages.model.Language;
 import com.crowdin.client.projectsgroups.model.Type;
-import com.crowdin.client.sourcefiles.model.AddFileRequest;
-import com.crowdin.client.sourcefiles.model.Branch;
-import com.crowdin.client.sourcefiles.model.FileInfo;
+import com.crowdin.client.sourcefiles.model.*;
+import com.crowdin.client.sourcestrings.model.ImportOptions;
 import com.crowdin.client.sourcestrings.model.UploadStringsRequest;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
+import static com.crowdin.cli.utils.console.ExecutionStatus.OK;
+import static com.crowdin.cli.utils.console.ExecutionStatus.SKIPPED;
 import static java.util.Objects.nonNull;
 
 @AllArgsConstructor
@@ -38,7 +36,6 @@ class FileUploadAction implements NewAction<ProjectProperties, ProjectClient> {
     private final File file;
     private final String branchName;
     private final boolean autoUpdate;
-    private final boolean preserveHierarchy;
     private final List<String> labels;
     private final String dest;
     private final boolean cleanupMode;
@@ -52,75 +49,124 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
             this.plainView, this.plainView, () -> client.downloadFullProject(branchName));
         PlaceholderUtil placeholderUtil = new PlaceholderUtil(project.getSupportedLanguages(), project.getProjectLanguages(false), properties.getBasePath());
 
-        Optional<Branch> branch = Optional.empty();
-        if (StringUtils.isNotEmpty(branchName)) {
-            branch = Optional.ofNullable(BranchUtils.getOrCreateBranch(out, branchName, client, project, plainView));
-        }
-
-        Long storageId;
-        try {
-            storageId = client.uploadStorage(file.getName(), new FileInputStream(file));
-        } catch (ResponseException e) {
-            throw new RuntimeException(e);
-        } catch (FileNotFoundException e) {
-            throw new RuntimeException(e);
-        }
-
         Optional<List<Long>> attachLabelIds = Optional.empty();
         if (nonNull(labels) && !labels.isEmpty()) {
             attachLabelIds = Optional.of(labels.stream().map(l -> getOrCreateLabel(l, client)).collect(Collectors.toList()));
         }
 
-        Optional<List<String>> excludedLanguageNames = Optional.empty();
-//        if (nonNull(excludedLanguages) && !excludedLanguages.isEmpty()) {
-//            //attachLabelIds = Optional.of(labels.stream().map(l -> getOrCreateLabel()).collect(Collectors.toList()));
-//            excludedLanguageNames = filterExcludedLanguages(excludedLanguages);
-//        }
-
-//        Map<String, Long> directoryPaths = ProjectFilesUtils.buildDirectoryPaths(project.getDirectories(), project.getBranches())
-//            .entrySet().stream().collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey));
-//        Map<String, FileInfo> paths = ProjectFilesUtils.buildFilePaths(project.getDirectories(), project.getBranches(), project.getFileInfos());
-        String commonPath = SourcesUtils.getCommonPath(Collections.singletonList(this.file.getAbsolutePath()), properties.getBasePath());
-        final String filePath = (nonNull(dest))
-            ? PropertiesBeanUtils.prepareDest(dest, StringUtils.removeStart(file.getAbsolutePath(), properties.getBasePath()), placeholderUtil)
-            : StringUtils.removeStart(file.getAbsolutePath(), properties.getBasePath() + commonPath);
-        final String fileFullPath = (branchName != null ? branchName + Utils.PATH_SEPARATOR : "") + filePath;
-
-        Map<String, FileInfo> paths = ProjectFilesUtils.buildFilePaths(project.getDirectories(), project.getBranches(), project.getFileInfos());
-        FileInfo projectFile = paths.get(fileFullPath);
+        String fileFullPath = file.getPath();
+        if (Objects.equals(Type.FILES_BASED, project.getType())) {
+            String commonPath = SourcesUtils.getCommonPath(Collections.singletonList(this.file.getAbsolutePath()), properties.getBasePath());
+            final String filePath = (nonNull(dest))
+                ? PropertiesBeanUtils.prepareDest(dest, StringUtils.removeStart(file.getAbsolutePath(), properties.getBasePath()), placeholderUtil)
+                : StringUtils.removeStart(file.getAbsolutePath(), properties.getBasePath() + commonPath);
+            fileFullPath = (branchName != null ? branchName + Utils.PATH_SEPARATOR : "") + filePath;
+            Map<String, FileInfo> paths = ProjectFilesUtils.buildFilePaths(project.getDirectories(), project.getBranches(), project.getFileInfos());
+            FileInfo projectFile = paths.get(fileFullPath);
+
+            if (nonNull(projectFile) && autoUpdate) {
+                final UpdateFileRequest request = new UpdateFileRequest();
+                final Long sourceId = projectFile.getId();
+                attachLabelIds.ifPresent(request::setAttachLabelIds);
+
+                Optional<Long> storageIdOptional = getStorageId(out, client);
+                if (!storageIdOptional.isPresent()) return;
+                Long storageId = storageIdOptional.get();
+                request.setStorageId(storageId);
+
+                try {
+                    client.updateSource(sourceId, request);
+                    if (nonNull(excludedLanguages) && !excludedLanguages.isEmpty()) {
+                        List<String> projectFileExcludedTargetLanguages = ((com.crowdin.client.sourcefiles.model.File) projectFile).getExcludedTargetLanguages();
+                        if (!Objects.equals(excludedLanguages, projectFileExcludedTargetLanguages)) {
+                            List<PatchRequest> editRequest = RequestBuilder.updateExcludedTargetLanguages(excludedLanguages);
+                            client.editSource(sourceId, editRequest);
+                        }
+                    }
+                    if (!plainView) {
+                        out.println(
+                            OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.uploading_file"), fileFullPath)));
+                    } 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) {
+                    throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.uploading_file"), fileFullPath), e);
+                }
+            }
+            return;
+        }
 
+        Optional<Branch> branch = Optional.empty();
+        if (StringUtils.isNotEmpty(branchName)) {
+            branch = Optional.ofNullable(BranchUtils.getOrCreateBranch(out, branchName, client, project, plainView));
+        }
 
+        Optional<Long> storageIdOptional = getStorageId(out, client);
+        if (!storageIdOptional.isPresent()) return;
+        Long storageId = storageIdOptional.get();
 
+        Optional<List<String>> excludedLanguageNames = Optional.empty();
+        if (nonNull(excludedLanguages) && !excludedLanguages.isEmpty()) {
+            excludedLanguageNames = Optional.of(filterExcludedLanguages(excludedLanguages, project));
+        }
 
-        if (Type.FILES_BASED.equals(project.getType())) {
+        if (Objects.equals(Type.FILES_BASED, project.getType())) {
             AddFileRequest request = new AddFileRequest();
             request.setName(file.getName());
             request.setStorageId(storageId);
 
-            if (preserveHierarchy) {
-                Optional<Long> directoryId = getOrCreateDirectoryId(out, client, project, properties, branch.orElse(null));
-                directoryId.ifPresent(request::setDirectoryId);
-            }
+            Optional<Long> directoryId = getOrCreateDirectoryId(out, client, project, properties, branch.orElse(null));
+            directoryId.ifPresent(request::setDirectoryId);
+
             attachLabelIds.ifPresent(request::setAttachLabelIds);
             branch.ifPresent(b -> request.setBranchId(b.getId()));
             excludedLanguageNames.ifPresent(request::setExcludedTargetLanguages);
             try {
                 client.addSource(request);
-            } catch (ResponseException e) {
-
+            } catch (ExistsResponseException e) {
+                throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file_already_exists"), fileFullPath));
+            } catch (Exception e) {
+                throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.uploading_file"), fileFullPath), e);
             }
 
         }
-        if (Type.STRINGS_BASED.equals(project.getType())) {
+        if (Objects.equals(Type.STRINGS_BASED, project.getType())) {
             UploadStringsRequest request = new UploadStringsRequest();
-            request.setBranchId(branch.orElseThrow(() -> new RuntimeException("fjf")).getId());
+            //todo create error message
+            request.setBranchId(branch.orElseThrow(() -> new RuntimeException(RESOURCE_BUNDLE.getString("error.branch_required"))).getId());
             request.setCleanupMode(cleanupMode);
             attachLabelIds.ifPresent(request::setLabelIds);
             request.setUpdateStrings(updateStrings);
             request.setStorageId(storageId);
+//            ImportOptions importOptions = new ImportOptions();
+//            request.setImportOptions(importOptions);
             client.addSourceStringsBased(request);
         }
 
+        if (!plainView) {
+            out.println(OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.uploading_file"), fileFullPath)));
+        } else {
+            out.println(fileFullPath);
+        }
+    }
+
+    private List<String> filterExcludedLanguages(List<String> excludedLanguages, CrowdinProjectFull project) {
+        List<String> projectLanguageNames = project.getProjectLanguages(false)
+            .stream()
+            .map(Language::getName)
+            .collect(Collectors.toList());
+
+        return excludedLanguages
+            .stream()
+            .filter(projectLanguageNames::contains)
+            .collect(Collectors.toList());
     }
 
     private Long getOrCreateLabel(String labelName, ProjectClient client) {
@@ -149,13 +195,24 @@ private Optional<Long> getOrCreateDirectoryId(Outputter out, ProjectClient clien
         String filePath = (nonNull(dest))
             ? PropertiesBeanUtils.prepareDest(dest, StringUtils.removeStart(this.file.getAbsolutePath(), properties.getBasePath()), placeholderUtil)
             : StringUtils.removeStart(this.file.getAbsolutePath(), properties.getBasePath() + commonPath);
-
         try {
             directoryId = Optional.ofNullable(ProjectUtils.createPath(out, client, directoryPaths, filePath, branch, this.plainView));
         } catch (Exception e) {
-//                    errorsPresented.set(true);
             throw new RuntimeException(RESOURCE_BUNDLE.getString("error.creating_directories"), e);
         }
         return directoryId;
     }
+
+    private Optional<Long> getStorageId(Outputter out, ProjectClient client) {
+        try (InputStream fileStream = Files.newInputStream(file.toPath())) {
+            return Optional.of(client.uploadStorage(file.getName(), fileStream));
+        } catch (EmptyFileException e){
+            out.println(SKIPPED.withIcon(String.format(RESOURCE_BUNDLE.getString("message.uploading_file_skipped"), file.getAbsolutePath())));
+            return Optional.empty();
+        } catch (Exception e) {
+            throw new RuntimeException(
+                String.format(RESOURCE_BUNDLE.getString("error.upload_to_storage"), file.getAbsolutePath()), e);
+        }
+    }
+
 }
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommand.java
index cc65ecc49..f34fb8979 100644
--- a/src/main/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommand.java
+++ b/src/main/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommand.java
@@ -18,7 +18,7 @@
 class FileDownloadSubcommand extends ActCommandProject {
 
     @Parameters(descriptionKey = "crowdin.file.upload.file")
-    protected File file;
+    protected String file;
 
     @Option(names = {"-l", "--language"}, paramLabel = "...", order = -2)
     protected List<String> languageIds;
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/FileSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/FileSubcommand.java
index fc36e5a3a..6a08dde55 100644
--- a/src/main/java/com/crowdin/cli/commands/picocli/FileSubcommand.java
+++ b/src/main/java/com/crowdin/cli/commands/picocli/FileSubcommand.java
@@ -6,9 +6,9 @@
 @Command(
     name = CommandNames.FILE,
     subcommands = {
-        ScreenshotListSubcommand.class,
-        ScreenshotUploadSubcommand.class,
-        ScreenshotDeleteSubcommand.class
+        FileUploadSubcommand.class,
+        FileDownloadSubcommand.class,
+        FileDeleteSubcommand.class
     }
 )
 class FileSubcommand extends HelpCommand {
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java
index 23b3e76e7..7be7cc1f8 100644
--- a/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java
+++ b/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java
@@ -26,9 +26,6 @@ class FileUploadSubcommand extends ActCommandProject {
     @Option(names = {"--no-auto-update"}, negatable = true, order = -2)
     protected boolean autoUpdate = true;
 
-    @Option(names = {"--preserve-hierarchy"}, negatable = true, paramLabel = "...", descriptionKey = "params.preserve-hierarchy")
-    private boolean preserveHierarchy;
-
     @Option(names = {"--label"}, descriptionKey = "params.label", paramLabel = "...", order = -2)
     protected List<String> labels;
 
@@ -49,6 +46,6 @@ class FileUploadSubcommand extends ActCommandProject {
 
     @Override
     protected NewAction<ProjectProperties, ProjectClient> getAction(Actions actions) {
-        return actions.fileUpload(file, branch, autoUpdate, preserveHierarchy, labels, destination, excludedLanguages, plainView, cleanupMode, updateStrings);
+        return actions.fileUpload(file, branch, autoUpdate, labels, destination, excludedLanguages, plainView, cleanupMode, updateStrings);
     }
 }

From c92419c5ddf35bc10f53c10f629cd88bc846af15 Mon Sep 17 00:00:00 2001
From: Kateryna Oblakevych <malutina.catya14@gmail.com>
Date: Tue, 16 Jan 2024 20:07:30 +0200
Subject: [PATCH 03/11] fix commands and add tests

---
 .../cli/client/CrowdinProjectClient.java      |  36 +++--
 .../com/crowdin/cli/client/ProjectClient.java |  18 ++-
 .../com/crowdin/cli/commands/Actions.java     |   6 +-
 .../cli/commands/actions/CliActions.java      |  14 +-
 .../commands/actions/FileDeleteAction.java    |  10 +-
 .../commands/actions/FileDownloadAction.java  |  86 ++---------
 .../FileDownloadTranslationAction.java        |  81 ++++++++++
 .../commands/actions/FileUploadAction.java    |  74 +++++----
 .../actions/FileUploadTranslationAction.java  |  95 ++++++++++++
 .../commands/functionality/BranchUtils.java   |  39 +++++
 .../picocli/FileDeleteSubcommand.java         |   2 +-
 .../picocli/FileDownloadSubcommand.java       |  13 +-
 .../picocli/FileUploadSubcommand.java         |  11 +-
 .../resources/messages/messages.properties    |  21 ++-
 .../cli/commands/actions/CliActionsTest.java  |  25 +++
 .../actions/FileDeleteActionTest.java         |  55 +++++++
 .../actions/FileDownloadActionTest.java       |  61 ++++++++
 .../FileDownloadTranslationActionTest.java    |  66 ++++++++
 .../actions/FileUploadActionTest.java         | 145 ++++++++++++++++++
 .../FileUploadTranslationActionTest.java      | 105 +++++++++++++
 .../picocli/DownloadSubcommandTest.java       |   6 -
 .../picocli/FileDeleteSubcommandTest.java     |  21 +++
 .../picocli/FileDownloadSubcommandTest.java   |  28 ++++
 .../picocli/FileUploadSubcommandTest.java     |  29 ++++
 .../commands/picocli/PicocliTestUtils.java    |  10 ++
 25 files changed, 922 insertions(+), 135 deletions(-)
 create mode 100644 src/main/java/com/crowdin/cli/commands/actions/FileDownloadTranslationAction.java
 create mode 100644 src/main/java/com/crowdin/cli/commands/actions/FileUploadTranslationAction.java
 create mode 100644 src/main/java/com/crowdin/cli/commands/functionality/BranchUtils.java
 create mode 100644 src/test/java/com/crowdin/cli/commands/actions/FileDeleteActionTest.java
 create mode 100644 src/test/java/com/crowdin/cli/commands/actions/FileDownloadActionTest.java
 create mode 100644 src/test/java/com/crowdin/cli/commands/actions/FileDownloadTranslationActionTest.java
 create mode 100644 src/test/java/com/crowdin/cli/commands/actions/FileUploadActionTest.java
 create mode 100644 src/test/java/com/crowdin/cli/commands/actions/FileUploadTranslationActionTest.java
 create mode 100644 src/test/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommandTest.java
 create mode 100644 src/test/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommandTest.java
 create mode 100644 src/test/java/com/crowdin/cli/commands/picocli/FileUploadSubcommandTest.java

diff --git a/src/main/java/com/crowdin/cli/client/CrowdinProjectClient.java b/src/main/java/com/crowdin/cli/client/CrowdinProjectClient.java
index 2f845317b..bb8f2293c 100644
--- a/src/main/java/com/crowdin/cli/client/CrowdinProjectClient.java
+++ b/src/main/java/com/crowdin/cli/client/CrowdinProjectClient.java
@@ -7,18 +7,13 @@
 import com.crowdin.client.projectsgroups.model.Type;
 import com.crowdin.client.sourcefiles.model.*;
 import com.crowdin.client.sourcestrings.model.AddSourceStringRequest;
-import com.crowdin.client.sourcestrings.model.AddSourceStringStringsBasedRequest;
 import com.crowdin.client.sourcestrings.model.SourceString;
+import com.crowdin.client.sourcestrings.model.UploadStringsProgress;
 import com.crowdin.client.sourcestrings.model.UploadStringsRequest;
 import com.crowdin.client.storage.model.Storage;
 import com.crowdin.client.stringcomments.model.AddStringCommentRequest;
 import com.crowdin.client.stringcomments.model.StringComment;
-import com.crowdin.client.translations.model.ApplyPreTranslationRequest;
-import com.crowdin.client.translations.model.BuildProjectTranslationRequest;
-import com.crowdin.client.translations.model.ExportProjectTranslationRequest;
-import com.crowdin.client.translations.model.PreTranslationStatus;
-import com.crowdin.client.translations.model.ProjectBuild;
-import com.crowdin.client.translations.model.UploadTranslationsRequest;
+import com.crowdin.client.translations.model.*;
 import com.crowdin.client.translationstatus.model.LanguageProgress;
 import org.apache.commons.lang3.StringUtils;
 
@@ -219,10 +214,16 @@ public void addSource(AddFileRequest request) throws ResponseException {
     }
 
     @Override
-    public void addSourceStringsBased(UploadStringsRequest request) {
-        //todo: errors handler
-        executeRequest(
-            () -> this.client.getSourceStringsApi().uploadStrings(this.projectId, request)
+    public UploadStringsProgress addSourceStringsBased(UploadStringsRequest request) {
+        return executeRequest(
+            () -> this.client.getSourceStringsApi().uploadStrings(this.projectId, request).getData()
+        );
+    }
+
+    @Override
+    public UploadStringsProgress getUploadStringsStatus(String uploadId) {
+        return executeRequest(
+            () -> this.client.getSourceStringsApi().uploadStringsStatus(this.projectId, uploadId).getData()
         );
     }
 
@@ -255,6 +256,12 @@ public void uploadTranslations(String languageId, UploadTranslationsRequest requ
                 .uploadTranslations(this.projectId, languageId, request));
     }
 
+    @Override
+    public void uploadTranslationStringsBased(String languageId, UploadTranslationsStringsRequest request) {
+        executeRequest(() -> this.client.getTranslationsApi()
+            .uploadTranslationStringsBased(this.projectId, languageId, request));
+    }
+
     @Override
     public ProjectBuild startBuildingTranslation(BuildProjectTranslationRequest request) throws ResponseException {
         Map<BiPredicate<String, String>, ResponseException> errorHandler = new LinkedHashMap<BiPredicate<String, String>, ResponseException>() {{
@@ -276,6 +283,13 @@ public ProjectBuild checkBuildingTranslation(Long buildId) {
             .getData());
     }
 
+    @Override
+    public URL buildProjectFileTranslation(Long fileId, BuildProjectFileTranslationRequest request) {
+        return url(executeRequest(() -> this.client.getTranslationsApi()
+            .buildProjectFileTranslation(projectId, fileId, null, request)
+            .getData()));
+    }
+
     @Override
     public URL downloadBuild(Long buildId) {
         return url(executeRequest(() -> this.client.getTranslationsApi()
diff --git a/src/main/java/com/crowdin/cli/client/ProjectClient.java b/src/main/java/com/crowdin/cli/client/ProjectClient.java
index bb86ffc9b..1b8d852d5 100644
--- a/src/main/java/com/crowdin/cli/client/ProjectClient.java
+++ b/src/main/java/com/crowdin/cli/client/ProjectClient.java
@@ -1,20 +1,18 @@
 package com.crowdin.cli.client;
 
+import com.crowdin.client.core.model.DownloadLink;
 import com.crowdin.client.core.model.PatchRequest;
+import com.crowdin.client.distributions.model.DistributionRelease;
 import com.crowdin.client.labels.model.AddLabelRequest;
 import com.crowdin.client.labels.model.Label;
 import com.crowdin.client.sourcefiles.model.*;
 import com.crowdin.client.sourcestrings.model.AddSourceStringRequest;
 import com.crowdin.client.sourcestrings.model.SourceString;
+import com.crowdin.client.sourcestrings.model.UploadStringsProgress;
 import com.crowdin.client.sourcestrings.model.UploadStringsRequest;
 import com.crowdin.client.stringcomments.model.AddStringCommentRequest;
 import com.crowdin.client.stringcomments.model.StringComment;
-import com.crowdin.client.translations.model.ApplyPreTranslationRequest;
-import com.crowdin.client.translations.model.BuildProjectTranslationRequest;
-import com.crowdin.client.translations.model.ExportProjectTranslationRequest;
-import com.crowdin.client.translations.model.PreTranslationStatus;
-import com.crowdin.client.translations.model.ProjectBuild;
-import com.crowdin.client.translations.model.UploadTranslationsRequest;
+import com.crowdin.client.translations.model.*;
 import com.crowdin.client.translationstatus.model.LanguageProgress;
 
 import java.io.InputStream;
@@ -49,7 +47,9 @@ default CrowdinProjectFull downloadFullProject() {
 
     void addSource(AddFileRequest request) throws ResponseException;
 
-    void addSourceStringsBased(UploadStringsRequest request);
+    UploadStringsProgress addSourceStringsBased(UploadStringsRequest request);
+
+    UploadStringsProgress getUploadStringsStatus(String uploadId);
 
     void editSource(Long fileId, List<PatchRequest> request);
 
@@ -57,10 +57,14 @@ default CrowdinProjectFull downloadFullProject() {
 
     void uploadTranslations(String languageId, UploadTranslationsRequest request) throws ResponseException;
 
+    void uploadTranslationStringsBased(String languageId, UploadTranslationsStringsRequest request);
+
     ProjectBuild startBuildingTranslation(BuildProjectTranslationRequest request) throws ResponseException;
 
     ProjectBuild checkBuildingTranslation(Long buildId);
 
+    URL buildProjectFileTranslation(Long fileId, BuildProjectFileTranslationRequest request);
+
     URL downloadBuild(Long buildId);
 
     ReviewedStringsBuild startBuildingReviewedSources(BuildReviewedSourceFilesRequest request);
diff --git a/src/main/java/com/crowdin/cli/commands/Actions.java b/src/main/java/com/crowdin/cli/commands/Actions.java
index 44667af72..90dbd02de 100644
--- a/src/main/java/com/crowdin/cli/commands/Actions.java
+++ b/src/main/java/com/crowdin/cli/commands/Actions.java
@@ -135,7 +135,11 @@ NewAction<PropertiesWithFiles, ProjectClient> preTranslate(
 
     NewAction<ProjectProperties, ProjectClient> fileUpload(File file, String branch, boolean autoUpdate, List<String> labels, String destination, List<String> excludedLanguages,  boolean plainView, boolean cleanupMode, boolean updateString);
 
-    NewAction<ProjectProperties, ProjectClient> fileDownload(String file, List<String> languageIds, String destParam);
+    NewAction<ProjectProperties, ProjectClient> fileUploadTranslation(File file, String branch, String dest, String languageId, boolean plainView);
+
+    NewAction<ProjectProperties, ProjectClient> fileDownload(String file, String destParam);
+
+    NewAction<ProjectProperties, ProjectClient> fileDownloadTranslation(String file, String languageId, String destParam);
 
     NewAction<ProjectProperties, ProjectClient> fileDelete(String file);
 }
diff --git a/src/main/java/com/crowdin/cli/commands/actions/CliActions.java b/src/main/java/com/crowdin/cli/commands/actions/CliActions.java
index d9e24c788..dd9837eaf 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/CliActions.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/CliActions.java
@@ -283,8 +283,18 @@ public NewAction<ProjectProperties, ProjectClient> fileUpload(File file, String
     }
 
     @Override
-    public NewAction<ProjectProperties, ProjectClient> fileDownload(String file, List<String> languageIds, String destParam) {
-        return new FileDownloadAction(file, languageIds, destParam);
+    public NewAction<ProjectProperties, ProjectClient> fileUploadTranslation(File file, String branch, String dest, String languageId, boolean plainView) {
+        return new FileUploadTranslationAction(file, branch, dest, languageId, plainView);
+    }
+
+    @Override
+    public NewAction<ProjectProperties, ProjectClient> fileDownload(String file, String destParam) {
+        return new FileDownloadAction(file, destParam);
+    }
+
+    @Override
+    public NewAction<ProjectProperties, ProjectClient> fileDownloadTranslation(String file, String languageId, String destParam) {
+        return new FileDownloadTranslationAction(file, languageId, destParam);
     }
 
     @Override
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileDeleteAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileDeleteAction.java
index 8fc035cad..8ecd041cc 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/FileDeleteAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileDeleteAction.java
@@ -7,6 +7,8 @@
 import com.crowdin.cli.properties.ProjectProperties;
 import com.crowdin.cli.utils.Utils;
 import com.crowdin.cli.utils.console.ConsoleSpinner;
+import com.crowdin.cli.utils.console.ExecutionStatus;
+import com.crowdin.client.projectsgroups.model.Type;
 import com.crowdin.client.sourcefiles.model.FileInfo;
 import lombok.AllArgsConstructor;
 
@@ -14,6 +16,7 @@
 import java.util.Objects;
 
 import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
+import static com.crowdin.cli.utils.console.ExecutionStatus.SKIPPED;
 
 @AllArgsConstructor
 class FileDeleteAction implements NewAction<ProjectProperties, ProjectClient> {
@@ -25,12 +28,17 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
         CrowdinProjectFull project = ConsoleSpinner
             .execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
                 true, true, client::downloadFullProject);
-        String filePath = Utils.unixPath(file);
+        if (Objects.equals(project.getType(), Type.STRINGS_BASED)) {
+            out.println(SKIPPED.withIcon(RESOURCE_BUNDLE.getString("message.no_file_string_project")));
+            return;
+        }
+        String filePath = Utils.unixPath(Utils.sepAtStart(file));
         List<FileInfo> projectFiles = project.getFileInfos();
         FileInfo foundFile = projectFiles.stream()
             .filter(f -> Objects.equals(filePath, f.getPath()))
             .findFirst()
             .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file_not_found"), filePath)));
         client.deleteSource(foundFile.getId());
+        out.println(ExecutionStatus.OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.file_deleted"), filePath)));
     }
 }
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java
index 7a3a2b867..d1b69b6e9 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java
@@ -1,41 +1,32 @@
 package com.crowdin.cli.commands.actions;
 
 import com.crowdin.cli.client.CrowdinProjectFull;
-import com.crowdin.cli.client.MaxNumberOfRetriesException;
 import com.crowdin.cli.client.ProjectClient;
-import com.crowdin.cli.client.ResponseException;
 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.FsFiles;
-import com.crowdin.cli.commands.functionality.RequestBuilder;
 import com.crowdin.cli.properties.ProjectProperties;
-import com.crowdin.cli.utils.PlaceholderUtil;
 import com.crowdin.cli.utils.Utils;
 import com.crowdin.cli.utils.console.ConsoleSpinner;
-import com.crowdin.client.languages.model.Language;
+import com.crowdin.client.projectsgroups.model.Type;
 import com.crowdin.client.sourcefiles.model.FileInfo;
-import com.crowdin.client.translations.model.BuildProjectTranslationRequest;
-import com.crowdin.client.translations.model.CrowdinTranslationCreateProjectBuildForm;
-import com.crowdin.client.translations.model.ProjectBuild;
 import lombok.AllArgsConstructor;
 
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URL;
-import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
 import static com.crowdin.cli.utils.console.ExecutionStatus.OK;
 import static com.crowdin.cli.utils.console.ExecutionStatus.WARNING;
+import static java.util.Objects.nonNull;
 
 @AllArgsConstructor
 class FileDownloadAction implements NewAction<ProjectProperties, ProjectClient> {
 
     private final String file;
-    private final List<String> languageIds;
     private final String dest;
 
     @Override
@@ -43,75 +34,32 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
         CrowdinProjectFull project = ConsoleSpinner
             .execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
                 true, true, client::downloadFullProject);
-
-        if (Objects.nonNull(languageIds)) {
-            List<Language> languages = filterLanguages(project);
-            PlaceholderUtil placeholderUtil = new PlaceholderUtil(
-                project.getSupportedLanguages(),
-                project.getProjectLanguages(true),
-                properties.getBasePath()
-            );
-//            BuildProjectTranslationRequest request = new CrowdinTranslationCreateProjectBuildForm();
-            CrowdinTranslationCreateProjectBuildForm request = new CrowdinTranslationCreateProjectBuildForm();
-            request.setTargetLanguageIds(languages.stream().map(Language::getId).collect(Collectors.toList()));
-            ProjectBuild build;
-            try {
-                build = client.startBuildingTranslation(request);
-            } catch (MaxNumberOfRetriesException e) {
-                ConsoleSpinner.stop(WARNING, RESOURCE_BUNDLE.getString("message.warning.another_build_in_progress"));
-            } catch (ResponseException e) {
-                //todo
-            }
-
-//            ConsoleSpinner.execute(out, "message.spinner.downloading_translation", "error.downloading_file", this.noProgress, this.plainView, () -> {
-//                URL url = client.downloadBuild(build.getId());
-//                try (InputStream data = url.openStream()) {
-//                    files.writeToFile(archivePath, data);
-//                } catch (IOException e) {
-//                    throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.write_file"), archivePath), e);
-//                }
-//            });
-
-
-//            request
-            RequestBuilder.crowdinTranslationCreateProjectPseudoBuildForm(true, null, null, null, null);
-            FilesInterface filesInterface = new FsFiles();
-//            ProjectBuild projectBuild = buildTranslation(client, request);
+        if (Objects.equals(project.getType(), Type.STRINGS_BASED)) {
+            out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.no_file_string_project")));
+            return;
+        }
+        if (!project.isManagerAccess()) {
+            out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.no_manager_access")));
+            return;
         }
 
-
-        String filePath = Utils.unixPath(file);
+        String filePath = Utils.unixPath(Utils.sepAtStart(file));
         FileInfo foundFile = project.getFileInfos().stream()
             .filter(f -> Objects.equals(filePath, f.getPath()))
             .findFirst()
             .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file_not_found"), filePath)));
         URL url = client.downloadFile(foundFile.getId());
-        String destPath = Objects.nonNull(dest) ? Utils.normalizePath(dest) + foundFile.getName() : filePath;
+        String destPath = nonNull(dest) ? Utils.normalizePath(Utils.sepAtEnd(dest)) + foundFile.getName() : filePath;
+        saveToFile(destPath, url);
+        out.println(OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.downloaded_file"), filePath)));
+    }
+
+    private void saveToFile(String destPath, URL url) {
         FilesInterface files = new FsFiles();
         try (InputStream data = url.openStream()) {
             files.writeToFile(destPath, data);
         } catch (IOException e) {
-            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.write_file"), filePath), e);
+            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.write_file"), destPath), e);
         }
-        out.println(OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.downloaded_file"), filePath)));
-    }
-
-    private List<Language> filterLanguages(CrowdinProjectFull project) {
-        return languageIds.stream()
-            .map(lang -> project.findLanguageById(lang, true)
-                .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.language_not_exist"), lang))))
-            .collect(Collectors.toList());
-    }
-
-    private void downloadTranslations(FilesInterface filesInterface, ProjectClient client, Long buildId, String archivePath, Outputter out) {
-        ConsoleSpinner.execute(out, "message.spinner.downloading_translation", "error.downloading_file", true, true, () -> {
-            URL url = client.downloadBuild(buildId);
-            try (InputStream data = url.openStream()) {
-                filesInterface.writeToFile(archivePath, data);
-            } catch (IOException e) {
-                throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.write_file"), archivePath), e);
-            }
-            return url;
-        });
     }
 }
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadTranslationAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadTranslationAction.java
new file mode 100644
index 000000000..5c7181b51
--- /dev/null
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadTranslationAction.java
@@ -0,0 +1,81 @@
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.client.CrowdinProjectFull;
+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.FsFiles;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.utils.PlaceholderUtil;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.cli.utils.console.ConsoleSpinner;
+import com.crowdin.client.languages.model.Language;
+import com.crowdin.client.projectsgroups.model.Type;
+import com.crowdin.client.sourcefiles.model.FileInfo;
+import com.crowdin.client.translations.model.BuildProjectFileTranslationRequest;
+import lombok.AllArgsConstructor;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Objects;
+
+import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
+import static com.crowdin.cli.utils.console.ExecutionStatus.OK;
+import static com.crowdin.cli.utils.console.ExecutionStatus.WARNING;
+import static java.util.Objects.nonNull;
+
+@AllArgsConstructor
+public class FileDownloadTranslationAction implements NewAction<ProjectProperties, ProjectClient> {
+
+    private final String file;
+    private final String languageId;
+    private final String dest;
+
+    @Override
+    public void act(Outputter out, ProjectProperties properties, ProjectClient client) {
+        CrowdinProjectFull project = ConsoleSpinner
+            .execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
+                true, true, client::downloadFullProject);
+        if (Objects.equals(project.getType(), Type.STRINGS_BASED)) {
+            out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.no_file_string_project")));
+            return;
+        }
+        if (!project.isManagerAccess()) {
+            out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.no_manager_access")));
+            return;
+        }
+
+        Language language = project.findLanguageById(languageId, true)
+            .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.language_not_exist"), languageId)));
+        String sourcePath = Utils.unixPath(Utils.sepAtStart(file));
+        FileInfo sourceFileInfo = project.getFileInfos().stream()
+            .filter(fi -> Objects.equals(sourcePath, fi.getPath()))
+            .findFirst()
+            .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file_not_found"), sourcePath)));
+        PlaceholderUtil placeholderUtil = new PlaceholderUtil(
+            project.getSupportedLanguages(),
+            project.getProjectLanguages(true),
+            properties.getBasePath()
+        );
+        BuildProjectFileTranslationRequest request = new BuildProjectFileTranslationRequest();
+        request.setTargetLanguageId(language.getId());
+
+        URL url = client.buildProjectFileTranslation(sourceFileInfo.getId(), request);
+        String destPath = nonNull(dest)
+            ? placeholderUtil.replaceLanguageDependentPlaceholders(dest + Utils.PATH_SEPARATOR + sourceFileInfo.getName(), language)
+            : languageId + sourcePath;
+        saveToFile(Utils.normalizePath(destPath), url);
+        out.println(OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.downloaded_file"), destPath)));
+    }
+
+    private void saveToFile(String destPath, URL url) {
+        FilesInterface files = new FsFiles();
+        try (InputStream data = url.openStream()) {
+            files.writeToFile(destPath, data);
+        } catch (IOException e) {
+            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.write_file"), destPath), e);
+        }
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java
index 895f9cd2e..b9fcedae8 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java
@@ -14,12 +14,13 @@
 import com.crowdin.client.languages.model.Language;
 import com.crowdin.client.projectsgroups.model.Type;
 import com.crowdin.client.sourcefiles.model.*;
-import com.crowdin.client.sourcestrings.model.ImportOptions;
+import com.crowdin.client.sourcestrings.model.UploadStringsProgress;
 import com.crowdin.client.sourcestrings.model.UploadStringsRequest;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.util.*;
@@ -64,14 +65,16 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
             Map<String, FileInfo> paths = ProjectFilesUtils.buildFilePaths(project.getDirectories(), project.getBranches(), project.getFileInfos());
             FileInfo projectFile = paths.get(fileFullPath);
 
-            if (nonNull(projectFile) && autoUpdate) {
+            if (nonNull(projectFile)) {
+                if (!autoUpdate) {
+                    out.println(SKIPPED.withIcon(String.format(RESOURCE_BUNDLE.getString("error.file_already_exists"), fileFullPath)));
+                    return;
+                }
                 final UpdateFileRequest request = new UpdateFileRequest();
                 final Long sourceId = projectFile.getId();
                 attachLabelIds.ifPresent(request::setAttachLabelIds);
 
-                Optional<Long> storageIdOptional = getStorageId(out, client);
-                if (!storageIdOptional.isPresent()) return;
-                Long storageId = storageIdOptional.get();
+                Long storageId = getStorageId(client);
                 request.setStorageId(storageId);
 
                 try {
@@ -99,18 +102,18 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
                 } catch (Exception e) {
                     throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.uploading_file"), fileFullPath), e);
                 }
+                return;
             }
-            return;
         }
 
         Optional<Branch> branch = Optional.empty();
         if (StringUtils.isNotEmpty(branchName)) {
             branch = Optional.ofNullable(BranchUtils.getOrCreateBranch(out, branchName, client, project, plainView));
+        } else if (Objects.equals(Type.STRINGS_BASED, project.getType())) {
+            throw new RuntimeException(RESOURCE_BUNDLE.getString("error.branch_required_string_project"));
         }
 
-        Optional<Long> storageIdOptional = getStorageId(out, client);
-        if (!storageIdOptional.isPresent()) return;
-        Long storageId = storageIdOptional.get();
+        Long storageId = getStorageId(client);
 
         Optional<List<String>> excludedLanguageNames = Optional.empty();
         if (nonNull(excludedLanguages) && !excludedLanguages.isEmpty()) {
@@ -139,17 +142,37 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
         }
         if (Objects.equals(Type.STRINGS_BASED, project.getType())) {
             UploadStringsRequest request = new UploadStringsRequest();
-            //todo create error message
-            request.setBranchId(branch.orElseThrow(() -> new RuntimeException(RESOURCE_BUNDLE.getString("error.branch_required"))).getId());
+            request.setBranchId(branch.orElseThrow(() -> new RuntimeException(RESOURCE_BUNDLE.getString("error.branch_required_string_project"))).getId());
             request.setCleanupMode(cleanupMode);
             attachLabelIds.ifPresent(request::setLabelIds);
             request.setUpdateStrings(updateStrings);
             request.setStorageId(storageId);
-//            ImportOptions importOptions = new ImportOptions();
-//            request.setImportOptions(importOptions);
-            client.addSourceStringsBased(request);
+            ConsoleSpinner.execute(
+                out,
+                "message.spinner.uploading_strings",
+                "message.spinner.upload_strings_failed",
+                this.plainView,
+                this.plainView,
+                () -> {
+                    UploadStringsProgress uploadStrings = client.addSourceStringsBased(request);
+                    String uploadId = uploadStrings.getIdentifier();
+
+                    while (!"finished".equalsIgnoreCase(uploadStrings.getStatus())) {
+                        ConsoleSpinner.update(
+                            String.format(RESOURCE_BUNDLE.getString("message.spinner.uploading_strings_percents"),
+                                uploadStrings.getProgress()));
+                        Thread.sleep(1000);
+
+                        uploadStrings = client.getUploadStringsStatus(uploadId);
+
+                        if ("failed".equalsIgnoreCase(uploadStrings.getStatus())) {
+                            throw new RuntimeException(RESOURCE_BUNDLE.getString("message.spinner.upload_strings_failed"));
+                        }
+                    }
+                    ConsoleSpinner.update(String.format(RESOURCE_BUNDLE.getString("message.spinner.uploading_strings_percents"), 100));
+                    return uploadStrings;
+                });
         }
-
         if (!plainView) {
             out.println(OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.uploading_file"), fileFullPath)));
         } else {
@@ -174,14 +197,9 @@ private Long getOrCreateLabel(String labelName, ProjectClient client) {
             .collect(Collectors.toMap(Label::getTitle, Label::getId));
         if (labelList.containsKey(labelName)) return labelList.get(labelName);
         else {
-            Label createdLabel = new Label();
-            try {
-                AddLabelRequest request = new AddLabelRequest();
-                request.setTitle(labelName);
-                createdLabel = client.addLabel(request);
-            } catch (Exception e) {
-                System.out.println(e);
-            }
+            AddLabelRequest request = new AddLabelRequest();
+            request.setTitle(labelName);
+            Label createdLabel = client.addLabel(request);
             return createdLabel.getId();
         }
     }
@@ -203,16 +221,16 @@ private Optional<Long> getOrCreateDirectoryId(Outputter out, ProjectClient clien
         return directoryId;
     }
 
-    private Optional<Long> getStorageId(Outputter out, ProjectClient client) {
+    private Long getStorageId(ProjectClient client) {
         try (InputStream fileStream = Files.newInputStream(file.toPath())) {
-            return Optional.of(client.uploadStorage(file.getName(), fileStream));
+            return client.uploadStorage(file.getName(), fileStream);
+        } catch (FileNotFoundException e) {
+            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.local_file_not_found"), file.getAbsolutePath()));
         } catch (EmptyFileException e){
-            out.println(SKIPPED.withIcon(String.format(RESOURCE_BUNDLE.getString("message.uploading_file_skipped"), file.getAbsolutePath())));
-            return Optional.empty();
+            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("message.uploading_file_skipped"), file.getAbsolutePath()));
         } catch (Exception e) {
             throw new RuntimeException(
                 String.format(RESOURCE_BUNDLE.getString("error.upload_to_storage"), file.getAbsolutePath()), e);
         }
     }
-
 }
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileUploadTranslationAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileUploadTranslationAction.java
new file mode 100644
index 000000000..ceca1cc12
--- /dev/null
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileUploadTranslationAction.java
@@ -0,0 +1,95 @@
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.EmptyFileException;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.commands.functionality.BranchUtils;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.cli.utils.console.ConsoleSpinner;
+import com.crowdin.client.projectsgroups.model.Type;
+import com.crowdin.client.sourcefiles.model.Branch;
+import com.crowdin.client.sourcefiles.model.FileInfo;
+import com.crowdin.client.translations.model.UploadTranslationsRequest;
+import com.crowdin.client.translations.model.UploadTranslationsStringsRequest;
+import lombok.AllArgsConstructor;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.util.Objects;
+
+import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
+import static com.crowdin.cli.utils.console.ExecutionStatus.OK;
+
+@AllArgsConstructor
+public class FileUploadTranslationAction implements NewAction<ProjectProperties, ProjectClient> {
+
+    private final File file;
+    private final String branchName;
+    private final String dest;
+    private final String languageId;
+    private final boolean plainView;
+
+    @Override
+    public void act(Outputter out, ProjectProperties properties, ProjectClient client) {
+        CrowdinProjectFull project = ConsoleSpinner.execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
+            this.plainView, this.plainView, () -> client.downloadFullProject(branchName));
+
+        if (!project.findLanguageById(languageId, true).isPresent())
+            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.language_not_exist"), languageId));
+
+        if (Objects.equals(Type.FILES_BASED, project.getType())) {
+            if (Objects.isNull(dest))
+                throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file.dest_required"), languageId));
+            String sourcePath = Utils.unixPath(Utils.sepAtStart(dest));
+            FileInfo sourceFileInfo = project.getFileInfos().stream()
+                .filter(fi -> Objects.equals(sourcePath, fi.getPath()))
+                .findFirst()
+                .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file_not_found"), sourcePath)));
+
+            UploadTranslationsRequest request = new UploadTranslationsRequest();
+            Long storageId = getStorageId(client);
+            request.setFileId(sourceFileInfo.getId());
+            request.setStorageId(storageId);
+            try {
+                client.uploadTranslations(languageId, request);
+            } catch (Exception e) {
+                throw new RuntimeException(String.format(
+                    RESOURCE_BUNDLE.getString("error.upload_translation"), file.getPath()), e);
+            }
+        } else if (Objects.equals(Type.STRINGS_BASED, project.getType())) {
+            UploadTranslationsStringsRequest request = new UploadTranslationsStringsRequest();
+            Branch branch = BranchUtils.getOrCreateBranch(out, branchName, client, project, plainView);
+            if (Objects.isNull(branch))
+                throw new RuntimeException(RESOURCE_BUNDLE.getString("error.branch_required_string_project"));
+            Long storageId = getStorageId(client);
+            request.setBranchId(branch.getId());
+            request.setStorageId(storageId);
+            client.uploadTranslationStringsBased(languageId, request);
+        }
+
+        if (!plainView) {
+            out.println(OK.withIcon(String.format(
+                RESOURCE_BUNDLE.getString("message.translation_uploaded"), file.getPath())));
+        } else {
+            out.println(file.getPath());
+        }
+    }
+
+    private Long getStorageId(ProjectClient client) {
+        try (InputStream fileStream = Files.newInputStream(file.toPath())) {
+            return client.uploadStorage(file.getName(), fileStream);
+        } catch (FileNotFoundException e) {
+            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.local_file_not_found"), file.getAbsolutePath()));
+        } catch (EmptyFileException e){
+            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("message.uploading_file_skipped"), file.getAbsolutePath()));
+        } catch (Exception e) {
+            throw new RuntimeException(
+                String.format(RESOURCE_BUNDLE.getString("error.upload_to_storage"), file.getAbsolutePath()), e);
+        }
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/functionality/BranchUtils.java b/src/main/java/com/crowdin/cli/commands/functionality/BranchUtils.java
new file mode 100644
index 000000000..2911622f3
--- /dev/null
+++ b/src/main/java/com/crowdin/cli/commands/functionality/BranchUtils.java
@@ -0,0 +1,39 @@
+package com.crowdin.cli.commands.functionality;
+
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.utils.console.ExecutionStatus;
+import com.crowdin.client.sourcefiles.model.AddBranchRequest;
+import com.crowdin.client.sourcefiles.model.Branch;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Optional;
+
+import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
+import static com.crowdin.cli.utils.console.ExecutionStatus.SKIPPED;
+
+public class BranchUtils {
+
+    public static Branch getOrCreateBranch(Outputter out, String branchName, ProjectClient client, CrowdinProjectFull project, boolean plainView) {
+        if (StringUtils.isEmpty(branchName)) {
+            return null;
+        }
+        Optional<Branch> branchOpt = project.findBranchByName(branchName);
+        if (branchOpt.isPresent()) {
+            if (!plainView) {
+                out.println(SKIPPED.withIcon(String.format(RESOURCE_BUNDLE.getString("message.branch_already_exists"), branchName)));
+            }
+            return branchOpt.get();
+        } else {
+            AddBranchRequest request = new AddBranchRequest();
+            request.setName(branchName);
+            Branch newBranch = client.addBranch(request);
+            if (!plainView) {
+                out.println(ExecutionStatus.OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.branch"), branchName)));
+            }
+            project.addBranchToLocalList(newBranch);
+            return newBranch;
+        }
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommand.java
index c91535059..15d5b4178 100644
--- a/src/main/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommand.java
+++ b/src/main/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommand.java
@@ -13,7 +13,7 @@
 )
 class FileDeleteSubcommand extends ActCommandProject {
 
-    @Parameters(descriptionKey = "crowdin.file.file")
+    @Parameters(descriptionKey = "crowdin.file.delete.file")
     protected String file;
 
     @Override
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommand.java
index f34fb8979..c7e58e18d 100644
--- a/src/main/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommand.java
+++ b/src/main/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommand.java
@@ -8,8 +8,7 @@
 import picocli.CommandLine.Option;
 import picocli.CommandLine.Parameters;
 
-import java.io.File;
-import java.util.List;
+import java.util.Objects;
 
 @Command(
     name = CommandNames.FILE_DOWNLOAD,
@@ -20,14 +19,16 @@ class FileDownloadSubcommand extends ActCommandProject {
     @Parameters(descriptionKey = "crowdin.file.upload.file")
     protected String file;
 
-    @Option(names = {"-l", "--language"}, paramLabel = "...", order = -2)
-    protected List<String> languageIds;
+    @Option(names = {"-l", "--language"}, paramLabel = "...", descriptionKey = "crowdin.file.language", order = -2)
+    protected String languageId;
 
-    @Option(names = {"--dest"}, paramLabel = "...", descriptionKey = "crowdin.file.dest")
+    @Option(names = {"-d", "--dest"}, paramLabel = "...", descriptionKey = "crowdin.file.dest")
     private String destination;
 
     @Override
     protected NewAction<ProjectProperties, ProjectClient> getAction(Actions actions) {
-        return actions.fileDownload(file, languageIds, destination);
+        if (Objects.nonNull(languageId))
+            return actions.fileDownloadTranslation(file, languageId, destination);
+        return actions.fileDownload(file, destination);
     }
 }
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java
index 7be7cc1f8..962567914 100644
--- a/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java
+++ b/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java
@@ -10,6 +10,7 @@
 
 import java.io.File;
 import java.util.List;
+import java.util.Objects;
 
 @CommandLine.Command(
     name = CommandNames.FILE_UPLOAD,
@@ -29,7 +30,7 @@ class FileUploadSubcommand extends ActCommandProject {
     @Option(names = {"--label"}, descriptionKey = "params.label", paramLabel = "...", order = -2)
     protected List<String> labels;
 
-    @Option(names = {"--dest"}, paramLabel = "...", descriptionKey = "crowdin.file.dest")
+    @Option(names = {"-d", "--dest"}, paramLabel = "...", descriptionKey = "crowdin.file.dest")
     private String destination;
 
     @Option(names = {"--excluded-language"}, descriptionKey = "params.excluded-languages", paramLabel = "...", order = -2)
@@ -41,11 +42,17 @@ class FileUploadSubcommand extends ActCommandProject {
     @Option(names = {"--no-update-strings"}, negatable = true, order = -2)
     protected boolean updateStrings;
 
-    @Option(names = {"--plain"}, descriptionKey = "crowdin.list.usage.plain")
+    @Option(names = {"-l", "--language"}, paramLabel = "...", descriptionKey = "crowdin.file.language", order = -2)
+    protected String languageId;
+
+    @Option(names = {"--plain"})
     protected boolean plainView;
 
     @Override
     protected NewAction<ProjectProperties, ProjectClient> getAction(Actions actions) {
+        if (Objects.nonNull(languageId)) {
+            return actions.fileUploadTranslation(file, branch, destination, languageId, plainView);
+        }
         return actions.fileUpload(file, branch, autoUpdate, labels, destination, excludedLanguages, plainView, cleanupMode, updateStrings);
     }
 }
diff --git a/src/main/resources/messages/messages.properties b/src/main/resources/messages/messages.properties
index 9dc5cd68c..754c765d4 100755
--- a/src/main/resources/messages/messages.properties
+++ b/src/main/resources/messages/messages.properties
@@ -122,14 +122,24 @@ crowdin.upload.translations.import-eq-suggestions=Add translations even if they'
 crowdin.upload.translations.translate-hidden=Upload translations to hidden source strings
 
 # CROWDIN FILE COMMAND
-crowdin.file.file=File path to add
+crowdin.file.usage.description=Manage source files in a Crowdin project
+crowdin.file.usage.customSynopsis=@|fg(green) crowdin file|@ [SUBCOMMAND] [CONFIG OPTIONS] [OPTIONS]
 crowdin.file.dest=File destination in the Crowdin project
+crowdin.file.language=File language
 
 # CROWDIN FILE UPLOAD COMMAND
+crowdin.file.upload.usage.description=Upload a file to a specified place
+crowdin.file.upload.usage.customSynopsis=@|fg(green) crowdin file upload branches|@ [CONFIG OPTIONS] [OPTIONS]
+crowdin.file.upload.file=Path to file to upload
 
 # CROWDIN FILE DOWNLOAD COMMAND
+crowdin.file.download.usage.description=Download a file to a specified place
+crowdin.file.download.usage.customSynopsis=@|fg(green) crowdin file download|@ [CONFIG OPTIONS] [OPTIONS]
 
 # CROWDIN FILE DELETE COMMAND
+crowdin.file.delete.usage.description=Delete a file in a Crowdin project
+crowdin.file.delete.usage.customSynopsis=@|fg(green) crowdin file delete|@ [CONFIG OPTIONS] [OPTIONS]
+crowdin.file.delete.file=Path to file in the Crowdin project
 
 # CROWDIN STATUS COMMAND
 crowdin.status.usage.description=Show translation and proofreading progress for a project
@@ -548,6 +558,8 @@ error.screenshot.not_updated=Screenshot was not updated
 
 error.label.not_found=Couldn't find label by the specified title
 
+error.file.dest_required='dest' parameter required to specify source file path
+
 error.response.401=Couldn't authorize. Check your 'api_token'
 error.response.403=You do not have permission to view/edit project with provided id
 error.response.403_upgrade_subscription=Please, upgrade your subscription plan to upload more file formats
@@ -595,6 +607,8 @@ error.spinner.pre_translate=Failed to pre-translate the project. Please contact
 error.spinner.reviewed_sources=Failed to load reviewed sources. Please contact our support team for help
 
 error.file_not_found=File '%s' not found in the Crowdin project
+error.local_file_not_found=File '%s' not found by the specified path
+error.branch_required_string_project=Branch required for string-based projects
 
 message.new_version_text=New version of Crowdin CLI is available! %s -> %s
 message.new_version_text.2=Changelog: @|cyan https://github.com/crowdin/crowdin-cli/releases/latest|@
@@ -648,6 +662,8 @@ message.no_target_to_exec=Couldn't find @|bold '%s'|@ target to download
 message.description=%s @|bold '%s'|@
 message.obsolete_file=Obsolete file @|bold '%s'|@
 message.file_id_deprecated=File id is deprecated and will be removed in future releases. Please use file path instead
+message.file_deleted=File @|bold '%s'|@ deleted
+message.no_file_string_project=String-based projects don't have files
 
 message.download_sources.preserve_hierarchy_warning=Because the @|bold 'preserve_hierarchy'|@ parameter is set to 'false':\n\t- CLI might download some unexpected files that match the pattern;\n\t- Source file hierarchy may not be preserved and will be the same as in Crowdin.
 message.download_translations.preserve_hierarchy_warning=Because the @|bold 'preserve_hierarchy'|@ parameter is set to 'false' CLI might download some unexpected files that match the pattern
@@ -752,6 +768,9 @@ message.spinner.pre_translate=Pre-translation is running...
 message.spinner.pre_translate_percents=Pre-translation is completed by @|bold (%d%%)|@
 message.spinner.pre_translate_done=Pre-translation is finished @|bold (%d%%)|@
 message.spinner.build_has_failed=The build has failed
+message.spinner.uploading_strings=Uploading strings
+message.spinner.uploading_strings_percents=Uploading strings @|bold (%d%%)|@
+message.spinner.upload_strings_failed=Upload has failed
 
 message.faq_link=Visit the @|cyan https://crowdin.github.io/crowdin-cli/faq|@ for more details
 message.translations_build_unsuccessful=Didn't manage to build translations
diff --git a/src/test/java/com/crowdin/cli/commands/actions/CliActionsTest.java b/src/test/java/com/crowdin/cli/commands/actions/CliActionsTest.java
index f513e67ee..8224e7de0 100644
--- a/src/test/java/com/crowdin/cli/commands/actions/CliActionsTest.java
+++ b/src/test/java/com/crowdin/cli/commands/actions/CliActionsTest.java
@@ -156,4 +156,29 @@ void testLabelAdd() {
     void testLabelDelete() {
         assertNotNull(actions.labelDelete(null));
     }
+
+    @Test
+    void testFileUpload() {
+        assertNotNull(actions.fileUpload(null, null, false, null, null, null,false, true, false));
+    }
+
+    @Test
+    void testFileUploadTranslation() {
+        assertNotNull(actions.fileUploadTranslation(null, null, null, null,false));
+    }
+
+    @Test
+    void testFileDownload() {
+        assertNotNull(actions.fileDownload(null, null));
+    }
+
+    @Test
+    void testFileDownloadTranslation() {
+        assertNotNull(actions.fileDownloadTranslation(null, null, null));
+    }
+
+    @Test
+    void testFileDelete() {
+        assertNotNull(actions.fileDelete(null));
+    }
 }
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileDeleteActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileDeleteActionTest.java
new file mode 100644
index 000000000..fd986456d
--- /dev/null
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileDeleteActionTest.java
@@ -0,0 +1,55 @@
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.ProjectBuilder;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.properties.NewPropertiesWithFilesUtilBuilder;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.properties.PropertiesWithFiles;
+import com.crowdin.cli.properties.helper.FileHelperTest;
+import com.crowdin.cli.properties.helper.TempProject;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.client.projectsgroups.model.Type;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+
+class FileDeleteActionTest {
+    private TempProject project;
+
+    @BeforeEach
+    public void createProj() {
+        project = new TempProject(FileHelperTest.class);
+    }
+
+    @AfterEach
+    public void deleteProj() {
+        project.delete();
+    }
+
+    @Test
+    public void testDelete() {
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
+            .addFile("/first.po", "gettext", 101L, null, null, null).build();
+        build.setType(Type.FILES_BASED);
+        when(client.downloadFullProject())
+            .thenReturn(build);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileDeleteAction("first.po");
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client).deleteSource(eq(101L));
+        verifyNoMoreInteractions(client);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileDownloadActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadActionTest.java
new file mode 100644
index 000000000..a53cdf444
--- /dev/null
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadActionTest.java
@@ -0,0 +1,61 @@
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.MockitoUtils;
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.ProjectBuilder;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.properties.NewPropertiesWithFilesUtilBuilder;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.properties.PropertiesWithFiles;
+import com.crowdin.cli.properties.helper.FileHelperTest;
+import com.crowdin.cli.properties.helper.TempProject;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.client.projectsgroups.model.Type;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.net.URL;
+
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+
+class FileDownloadActionTest {
+    private TempProject project;
+
+    @BeforeEach
+    public void createProj() {
+        project = new TempProject(FileHelperTest.class);
+    }
+
+    @AfterEach
+    public void deleteProj() {
+        project.delete();
+    }
+
+    @Test
+    public void testDownload() {
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        URL urlMock = MockitoUtils.getMockUrl(getClass());
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
+            .addFile("/first.po", "gettext", 101L, null, null, null).build();
+        build.setType(Type.FILES_BASED);
+        when(client.downloadFullProject())
+            .thenReturn(build);
+        when(client.downloadFile(eq(101L)))
+            .thenReturn(urlMock);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadAction("first.po", null);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client).downloadFile(eq(101L));
+        verifyNoMoreInteractions(client);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileDownloadTranslationActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadTranslationActionTest.java
new file mode 100644
index 000000000..1e66bf359
--- /dev/null
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadTranslationActionTest.java
@@ -0,0 +1,66 @@
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.MockitoUtils;
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.ProjectBuilder;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.properties.NewPropertiesWithFilesUtilBuilder;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.properties.PropertiesWithFiles;
+import com.crowdin.cli.properties.helper.FileHelperTest;
+import com.crowdin.cli.properties.helper.TempProject;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.client.projectsgroups.model.Type;
+import com.crowdin.client.translations.model.BuildProjectFileTranslationRequest;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.net.URL;
+
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+
+class FileDownloadTranslationActionTest {
+    private TempProject project;
+
+    @BeforeEach
+    public void createProj() {
+        project = new TempProject(FileHelperTest.class);
+    }
+
+    @AfterEach
+    public void deleteProj() {
+        project.delete();
+    }
+
+    @Test
+    public void testDownloadTranslation() {
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        URL urlMock = MockitoUtils.getMockUrl(getClass());
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
+            .addFile("/first.po", "gettext", 101L, null, null, null).build();
+        build.setType(Type.FILES_BASED);
+        BuildProjectFileTranslationRequest request = new BuildProjectFileTranslationRequest() {{
+            setTargetLanguageId("ua");
+        }};
+        when(client.downloadFullProject())
+            .thenReturn(build);
+        when(client.buildProjectFileTranslation(eq(101L), eq(request)))
+            .thenReturn(urlMock);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadTranslationAction("first.po", "ua", "first.po");
+        action.act(Outputter.getDefault(), pb, client);
+
+
+        verify(client).downloadFullProject();
+        verify(client).buildProjectFileTranslation(eq(101L), eq(request));
+        verifyNoMoreInteractions(client);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileUploadActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileUploadActionTest.java
new file mode 100644
index 000000000..b75241e70
--- /dev/null
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileUploadActionTest.java
@@ -0,0 +1,145 @@
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.ProjectBuilder;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.client.ResponseException;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.properties.NewPropertiesWithFilesUtilBuilder;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.properties.PropertiesWithFiles;
+import com.crowdin.cli.properties.helper.FileHelperTest;
+import com.crowdin.cli.properties.helper.TempProject;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.client.projectsgroups.model.Type;
+import com.crowdin.client.sourcefiles.model.*;
+import com.crowdin.client.sourcestrings.model.UploadStringsProgress;
+import com.crowdin.client.sourcestrings.model.UploadStringsRequest;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+
+class FileUploadActionTest {
+    private TempProject project;
+
+    @BeforeEach
+    public void createProj() {
+        project = new TempProject(FileHelperTest.class);
+    }
+
+    @AfterEach
+    public void deleteProj() {
+        project.delete();
+    }
+
+    @Test
+    public void testUpload_FileBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first.po");
+        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.FILES_BASED);
+        when(client.downloadFullProject(any()))
+            .thenReturn(build);
+        when(client.uploadStorage(eq("first.po"), any()))
+            .thenReturn(1L);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, null, false, null, null, false, false, null, false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject(any());
+        verify(client).uploadStorage(eq("first.po"), any());
+        AddFileRequest addFileRequest = new AddFileRequest() {{
+            setName("first.po");
+            setStorageId(1L);
+        }};
+        verify(client).addSource(eq(addFileRequest));
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testUpload_StringBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first.po");
+        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        Branch branch = mock(Branch.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.STRINGS_BASED);
+        UploadStringsProgress progress = new UploadStringsProgress() {{
+            setIdentifier("id");
+            setProgress(100);
+        }};
+        UploadStringsProgress progressFinished = new UploadStringsProgress() {{
+            setIdentifier("id");
+            setStatus("finished");
+            setProgress(100);
+        }};
+
+        when(branch.getId()).thenReturn(2L);
+        when(client.downloadFullProject(any())).thenReturn(build);
+        when(client.uploadStorage(eq("first.po"), any())).thenReturn(1L);
+        when(client.addBranch(any())).thenReturn(branch);
+        when(client.addSourceStringsBased(any())).thenReturn(progress);
+        when(client.getUploadStringsStatus(any())).thenReturn(progressFinished);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, "branch", false, null, null, false, false, null, false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject(any());
+        verify(client).uploadStorage(eq("first.po"), any());
+        verify(client).addBranch(any());
+        verify(client).getUploadStringsStatus(any());
+        UploadStringsRequest addFileRequest = new UploadStringsRequest() {{
+            setBranchId(2L);
+            setStorageId(1L);
+            setCleanupMode(false);
+            setUpdateStrings(false);
+        }};
+        verify(client).addSourceStringsBased(eq(addFileRequest));
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testUploadUpdate_FileBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first.po");
+        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
+            .addFile("first.po", "gettext", 101L, null, null).build();
+        build.setType(Type.FILES_BASED);
+        when(client.downloadFullProject(any()))
+            .thenReturn(build);
+        when(client.uploadStorage(eq("first.po"), any()))
+            .thenReturn(1L);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, null, true, null, null, false, false, null, false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject(any());
+        verify(client).uploadStorage(eq("first.po"), any());
+        UpdateFileRequest addFileRequest = new UpdateFileRequest() {{
+            setStorageId(1L);
+        }};
+        verify(client).updateSource(any(), eq(addFileRequest));
+        verifyNoMoreInteractions(client);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileUploadTranslationActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileUploadTranslationActionTest.java
new file mode 100644
index 000000000..f135e6892
--- /dev/null
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileUploadTranslationActionTest.java
@@ -0,0 +1,105 @@
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.ProjectBuilder;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.client.ResponseException;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.properties.NewPropertiesWithFilesUtilBuilder;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.properties.PropertiesWithFiles;
+import com.crowdin.cli.properties.helper.FileHelperTest;
+import com.crowdin.cli.properties.helper.TempProject;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.client.projectsgroups.model.Type;
+import com.crowdin.client.sourcefiles.model.Branch;
+import com.crowdin.client.translations.model.UploadTranslationsRequest;
+import com.crowdin.client.translations.model.UploadTranslationsStringsRequest;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+
+class FileUploadTranslationActionTest {
+    private TempProject project;
+
+    @BeforeEach
+    public void createProj() {
+        project = new TempProject(FileHelperTest.class);
+    }
+
+    @AfterEach
+    public void deleteProj() {
+        project.delete();
+    }
+
+    @Test
+    public void testUploadTranslation_FileBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first_uk.po");
+        project.addFile(Utils.normalizePath("first_uk.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
+            .addFile("/first.po", "gettext", 101L, null, null, null).build();
+        build.setType(Type.FILES_BASED);
+        when(client.downloadFullProject(any()))
+            .thenReturn(build);
+        when(client.uploadStorage(eq("first_uk.po"), any()))
+            .thenReturn(1L);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadTranslationAction(fileToUpload, null, "first.po", "ua", false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject(any());
+        verify(client).uploadStorage(eq("first_uk.po"), any());
+        UploadTranslationsRequest request = new UploadTranslationsRequest() {{
+            setFileId(101L);
+            setStorageId(1L);
+        }};
+        verify(client).uploadTranslations(eq("ua"), eq(request));
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testUploadTranslation_StringBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first_uk.po");
+        project.addFile(Utils.normalizePath("first_uk.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.STRINGS_BASED);
+        Branch branch = mock(Branch.class);
+        when(branch.getId()).thenReturn(2L);
+        when(client.downloadFullProject(any()))
+            .thenReturn(build);
+        when(client.uploadStorage(eq("first_uk.po"), any()))
+            .thenReturn(1L);
+        when(client.addBranch(any()))
+            .thenReturn(branch);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadTranslationAction(fileToUpload, "main", null, "ua", false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject(any());
+        verify(client).addBranch(any());
+        verify(client).uploadStorage(eq("first_uk.po"), any());
+        UploadTranslationsStringsRequest request = new UploadTranslationsStringsRequest() {{
+            setBranchId(2L);
+            setStorageId(1L);
+        }};
+        verify(client).uploadTranslationStringsBased(eq("ua"), eq(request));
+        verifyNoMoreInteractions(client);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/crowdin/cli/commands/picocli/DownloadSubcommandTest.java b/src/test/java/com/crowdin/cli/commands/picocli/DownloadSubcommandTest.java
index 401c123b3..17196b55e 100644
--- a/src/test/java/com/crowdin/cli/commands/picocli/DownloadSubcommandTest.java
+++ b/src/test/java/com/crowdin/cli/commands/picocli/DownloadSubcommandTest.java
@@ -2,17 +2,12 @@
 
 import org.hamcrest.Matchers;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Stream;
 
 import static com.crowdin.cli.commands.picocli.GenericCommand.RESOURCE_BUNDLE;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.junit.jupiter.params.provider.Arguments.arguments;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.Mockito.verify;
@@ -43,5 +38,4 @@ public void testSubCommandCheckInvalidOptions() {
         List<String> errors = downloadSubcommand.checkOptions();
         assertThat(errors, Matchers.equalTo(Arrays.asList(RESOURCE_BUNDLE.getString("error.download.include_exclude_lang_conflict"))));
     }
-
 }
diff --git a/src/test/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommandTest.java b/src/test/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommandTest.java
new file mode 100644
index 000000000..052b50e29
--- /dev/null
+++ b/src/test/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommandTest.java
@@ -0,0 +1,21 @@
+package com.crowdin.cli.commands.picocli;
+
+import org.junit.jupiter.api.Test;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+
+class FileDeleteSubcommandTest extends PicocliTestUtils {
+
+    @Test
+    public void testFileDelete() {
+        this.execute(CommandNames.FILE, CommandNames.FILE_DELETE, "file.txt");
+        verify(actionsMock).fileDelete(any());
+        this.check(true);
+    }
+
+    @Test
+    public void testFileDeleteInvalidOptions() {
+        this.executeInvalidParams(CommandNames.FILE, CommandNames.FILE_DELETE);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommandTest.java b/src/test/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommandTest.java
new file mode 100644
index 000000000..1030d8ed7
--- /dev/null
+++ b/src/test/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommandTest.java
@@ -0,0 +1,28 @@
+package com.crowdin.cli.commands.picocli;
+
+import org.junit.jupiter.api.Test;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+
+class FileDownloadSubcommandTest extends PicocliTestUtils {
+
+    @Test
+    public void testFileDownload() {
+        this.execute(CommandNames.FILE, CommandNames.FILE_DOWNLOAD, "file.txt");
+        verify(actionsMock).fileDownload(any(), any());
+        this.check(true);
+    }
+
+    @Test
+    public void testFileDownloadTranslations() {
+        this.execute(CommandNames.FILE, CommandNames.FILE_DOWNLOAD, "file.txt", "--language", "uk");
+        verify(actionsMock).fileDownloadTranslation(any(), any(), any());
+        this.check(true);
+    }
+
+    @Test
+    public void testFileDownloadInvalidOptions() {
+        this.executeInvalidParams(CommandNames.FILE, CommandNames.FILE_DOWNLOAD);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/crowdin/cli/commands/picocli/FileUploadSubcommandTest.java b/src/test/java/com/crowdin/cli/commands/picocli/FileUploadSubcommandTest.java
new file mode 100644
index 000000000..7ec885bea
--- /dev/null
+++ b/src/test/java/com/crowdin/cli/commands/picocli/FileUploadSubcommandTest.java
@@ -0,0 +1,29 @@
+package com.crowdin.cli.commands.picocli;
+
+import org.junit.jupiter.api.Test;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.Mockito.verify;
+
+class FileUploadSubcommandTest extends PicocliTestUtils {
+
+    @Test
+    public void testFileUpload() {
+        this.execute(CommandNames.FILE, CommandNames.FILE_UPLOAD, "file.txt");
+        verify(actionsMock).fileUpload(any(), any(), anyBoolean(), any(), any(), any(), anyBoolean(), anyBoolean(), anyBoolean());
+        this.check(true);
+    }
+
+    @Test
+    public void testFileUploadTranslations() {
+        this.execute(CommandNames.FILE, CommandNames.FILE_UPLOAD, "file.txt", "--language", "uk");
+        verify(actionsMock).fileUploadTranslation(any(), any(), any(), any(), anyBoolean());
+        this.check(true);
+    }
+
+    @Test
+    public void testFileUploadInvalidOptions() {
+        this.executeInvalidParams(CommandNames.FILE, CommandNames.FILE_UPLOAD);
+    }
+}
\ No newline at end of file
diff --git a/src/test/java/com/crowdin/cli/commands/picocli/PicocliTestUtils.java b/src/test/java/com/crowdin/cli/commands/picocli/PicocliTestUtils.java
index 7ff5b45b2..b93f52d00 100644
--- a/src/test/java/com/crowdin/cli/commands/picocli/PicocliTestUtils.java
+++ b/src/test/java/com/crowdin/cli/commands/picocli/PicocliTestUtils.java
@@ -120,6 +120,16 @@ void mockActions() {
                 .thenReturn(actionMock);
         when(actionsMock.labelDelete(any()))
                 .thenReturn(actionMock);
+        when(actionsMock.fileUpload(any(), any(), anyBoolean(), any(), any(), any(), anyBoolean(), anyBoolean(), anyBoolean()))
+                .thenReturn(actionMock);
+        when(actionsMock.fileUploadTranslation(any(), any(), any(), any(), anyBoolean()))
+                .thenReturn(actionMock);
+        when(actionsMock.fileDownload(any(), any()))
+                .thenReturn(actionMock);
+        when(actionsMock.fileDownloadTranslation(any(), any(), any()))
+                .thenReturn(actionMock);
+        when(actionsMock.fileDelete(any()))
+                .thenReturn(actionMock);
         when(actionsMock.resolve(any()))
                 .thenReturn(actionMock);
         when(actionsMock.commentList(anyBoolean(), anyBoolean(),any(),any(),any(),any()))

From 9bbefbd2a12dfe3507d9362e8571ce9c50c570c8 Mon Sep 17 00:00:00 2001
From: Kateryna Oblakevych <malutina.catya14@gmail.com>
Date: Tue, 16 Jan 2024 20:24:08 +0200
Subject: [PATCH 04/11] experimental message and adocs

---
 .../commands/actions/FileDownloadAction.java  |  1 +
 .../FileDownloadTranslationAction.java        |  1 +
 .../commands/actions/FileUploadAction.java    |  4 ++--
 .../actions/FileUploadTranslationAction.java  |  2 ++
 .../resources/messages/messages.properties    |  1 +
 website/mantemplates/crowdin-file-delete.adoc | 16 ++++++++++++++++
 .../mantemplates/crowdin-file-download.adoc   | 19 +++++++++++++++++++
 website/mantemplates/crowdin-file-upload.adoc | 19 +++++++++++++++++++
 website/mantemplates/crowdin-file.adoc        | 16 ++++++++++++++++
 website/sidebars.js                           | 15 +++++++++++++++
 10 files changed, 92 insertions(+), 2 deletions(-)
 create mode 100644 website/mantemplates/crowdin-file-delete.adoc
 create mode 100644 website/mantemplates/crowdin-file-download.adoc
 create mode 100644 website/mantemplates/crowdin-file-upload.adoc
 create mode 100644 website/mantemplates/crowdin-file.adoc

diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java
index d1b69b6e9..1b6ed01da 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java
@@ -52,6 +52,7 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
         String destPath = nonNull(dest) ? Utils.normalizePath(Utils.sepAtEnd(dest)) + foundFile.getName() : filePath;
         saveToFile(destPath, url);
         out.println(OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.downloaded_file"), filePath)));
+        out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.experimental_command")));
     }
 
     private void saveToFile(String destPath, URL url) {
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadTranslationAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadTranslationAction.java
index 5c7181b51..008ca058a 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadTranslationAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadTranslationAction.java
@@ -68,6 +68,7 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
             : languageId + sourcePath;
         saveToFile(Utils.normalizePath(destPath), url);
         out.println(OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.downloaded_file"), destPath)));
+        out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.experimental_command")));
     }
 
     private void saveToFile(String destPath, URL url) {
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java
index b9fcedae8..0331dfe65 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java
@@ -27,8 +27,7 @@
 import java.util.stream.Collectors;
 
 import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
-import static com.crowdin.cli.utils.console.ExecutionStatus.OK;
-import static com.crowdin.cli.utils.console.ExecutionStatus.SKIPPED;
+import static com.crowdin.cli.utils.console.ExecutionStatus.*;
 import static java.util.Objects.nonNull;
 
 @AllArgsConstructor
@@ -178,6 +177,7 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
         } else {
             out.println(fileFullPath);
         }
+        out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.experimental_command")));
     }
 
     private List<String> filterExcludedLanguages(List<String> excludedLanguages, CrowdinProjectFull project) {
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileUploadTranslationAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileUploadTranslationAction.java
index ceca1cc12..7f8ef2498 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/FileUploadTranslationAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileUploadTranslationAction.java
@@ -24,6 +24,7 @@
 
 import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
 import static com.crowdin.cli.utils.console.ExecutionStatus.OK;
+import static com.crowdin.cli.utils.console.ExecutionStatus.WARNING;
 
 @AllArgsConstructor
 public class FileUploadTranslationAction implements NewAction<ProjectProperties, ProjectClient> {
@@ -78,6 +79,7 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
         } else {
             out.println(file.getPath());
         }
+        out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.experimental_command")));
     }
 
     private Long getStorageId(ProjectClient client) {
diff --git a/src/main/resources/messages/messages.properties b/src/main/resources/messages/messages.properties
index 754c765d4..57583c4ec 100755
--- a/src/main/resources/messages/messages.properties
+++ b/src/main/resources/messages/messages.properties
@@ -613,6 +613,7 @@ error.branch_required_string_project=Branch required for string-based projects
 message.new_version_text=New version of Crowdin CLI is available! %s -> %s
 message.new_version_text.2=Changelog: @|cyan https://github.com/crowdin/crowdin-cli/releases/latest|@
 message.new_version_text.3=Please update for the best experience!
+message.experimental_command=This command is experimental. Experimental features are not covered by semver and might change in the future. If you have any feedback, feel free to raise a discussion: https://github.com/crowdin/crowdin-cli/discussions
 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
diff --git a/website/mantemplates/crowdin-file-delete.adoc b/website/mantemplates/crowdin-file-delete.adoc
new file mode 100644
index 000000000..640019536
--- /dev/null
+++ b/website/mantemplates/crowdin-file-delete.adoc
@@ -0,0 +1,16 @@
+:includedir: ../generated-picocli-docs
+:command: crowdin-file-delete
+
+== crowdin file delete
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-description]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-synopsis]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-arguments]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-commands]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-options]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-footer]
diff --git a/website/mantemplates/crowdin-file-download.adoc b/website/mantemplates/crowdin-file-download.adoc
new file mode 100644
index 000000000..410a483ba
--- /dev/null
+++ b/website/mantemplates/crowdin-file-download.adoc
@@ -0,0 +1,19 @@
+:includedir: ../generated-picocli-docs
+:command: crowdin-file-download
+
+== crowdin file download
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-description]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-synopsis]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-arguments]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-commands]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-options]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-footer]
+
+=== Notes
+This command is experimental. Experimental features are not covered by semver and might change in the future. If you have any feedback, feel free to raise a discussion: https://github.com/crowdin/crowdin-cli/discussions
diff --git a/website/mantemplates/crowdin-file-upload.adoc b/website/mantemplates/crowdin-file-upload.adoc
new file mode 100644
index 000000000..15b6d7851
--- /dev/null
+++ b/website/mantemplates/crowdin-file-upload.adoc
@@ -0,0 +1,19 @@
+:includedir: ../generated-picocli-docs
+:command: crowdin-file-upload
+
+== crowdin file upload
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-description]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-synopsis]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-arguments]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-commands]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-options]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-footer]
+
+=== Notes
+This command is experimental. Experimental features are not covered by semver and might change in the future. If you have any feedback, feel free to raise a discussion: https://github.com/crowdin/crowdin-cli/discussions
diff --git a/website/mantemplates/crowdin-file.adoc b/website/mantemplates/crowdin-file.adoc
new file mode 100644
index 000000000..6b6207302
--- /dev/null
+++ b/website/mantemplates/crowdin-file.adoc
@@ -0,0 +1,16 @@
+:includedir: ../generated-picocli-docs
+:command: crowdin-file
+
+== crowdin file
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-description]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-synopsis]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-arguments]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-commands]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-options]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-footer]
diff --git a/website/sidebars.js b/website/sidebars.js
index 4e0ee5dd2..d201c9adc 100644
--- a/website/sidebars.js
+++ b/website/sidebars.js
@@ -55,6 +55,21 @@ const sidebars = {
             'commands/crowdin-download-bundle',
           ]
         },
+        {
+          type: 'category',
+          label: 'crowdin file',
+          link: {
+            type: 'doc',
+            id: 'commands/crowdin-file'
+          },
+          collapsible: true,
+          collapsed: true,
+          items: [
+            'commands/crowdin-file-upload',
+            'commands/crowdin-file-download',
+            'commands/crowdin-file-delete',
+          ]
+        },
         {
           type: 'category',
           label: 'crowdin list',

From 19c0ab3d7cc4fe519a68dbcd399b961faba5424d Mon Sep 17 00:00:00 2001
From: Kateryna Oblakevych <malutina.catya14@gmail.com>
Date: Tue, 16 Jan 2024 20:32:32 +0200
Subject: [PATCH 05/11] fix method rename and new client version

---
 .../com/crowdin/cli/commands/actions/FileDeleteAction.java  | 2 +-
 .../crowdin/cli/commands/actions/FileDownloadAction.java    | 6 +++---
 .../cli/commands/actions/FileDownloadTranslationAction.java | 2 +-
 .../cli/commands/actions/FileUploadTranslationAction.java   | 2 +-
 .../cli/commands/actions/FileDownloadActionTest.java        | 2 +-
 .../commands/actions/FileDownloadTranslationActionTest.java | 2 +-
 .../commands/actions/FileUploadTranslationActionTest.java   | 2 +-
 versions.properties                                         | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileDeleteAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileDeleteAction.java
index 8ecd041cc..80b6af8f2 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/FileDeleteAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileDeleteAction.java
@@ -32,7 +32,7 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
             out.println(SKIPPED.withIcon(RESOURCE_BUNDLE.getString("message.no_file_string_project")));
             return;
         }
-        String filePath = Utils.unixPath(Utils.sepAtStart(file));
+        String filePath = Utils.toUnixPath(Utils.sepAtStart(file));
         List<FileInfo> projectFiles = project.getFileInfos();
         FileInfo foundFile = projectFiles.stream()
             .filter(f -> Objects.equals(filePath, f.getPath()))
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java
index 1b6ed01da..3874fee52 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java
@@ -43,14 +43,14 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
             return;
         }
 
-        String filePath = Utils.unixPath(Utils.sepAtStart(file));
+        String filePath = Utils.toUnixPath(Utils.sepAtStart(file));
         FileInfo foundFile = project.getFileInfos().stream()
             .filter(f -> Objects.equals(filePath, f.getPath()))
             .findFirst()
             .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file_not_found"), filePath)));
         URL url = client.downloadFile(foundFile.getId());
-        String destPath = nonNull(dest) ? Utils.normalizePath(Utils.sepAtEnd(dest)) + foundFile.getName() : filePath;
-        saveToFile(destPath, url);
+        String destPath = nonNull(dest) ? Utils.sepAtEnd(dest) + foundFile.getName() : file;
+        saveToFile(Utils.normalizePath(destPath), url);
         out.println(OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.downloaded_file"), filePath)));
         out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.experimental_command")));
     }
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadTranslationAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadTranslationAction.java
index 008ca058a..ac49ab69c 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadTranslationAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadTranslationAction.java
@@ -49,7 +49,7 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
 
         Language language = project.findLanguageById(languageId, true)
             .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.language_not_exist"), languageId)));
-        String sourcePath = Utils.unixPath(Utils.sepAtStart(file));
+        String sourcePath = Utils.toUnixPath(Utils.sepAtStart(file));
         FileInfo sourceFileInfo = project.getFileInfos().stream()
             .filter(fi -> Objects.equals(sourcePath, fi.getPath()))
             .findFirst()
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileUploadTranslationAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileUploadTranslationAction.java
index 7f8ef2498..e0acf355c 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/FileUploadTranslationAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileUploadTranslationAction.java
@@ -46,7 +46,7 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
         if (Objects.equals(Type.FILES_BASED, project.getType())) {
             if (Objects.isNull(dest))
                 throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file.dest_required"), languageId));
-            String sourcePath = Utils.unixPath(Utils.sepAtStart(dest));
+            String sourcePath = Utils.toUnixPath(Utils.sepAtStart(dest));
             FileInfo sourceFileInfo = project.getFileInfos().stream()
                 .filter(fi -> Objects.equals(sourcePath, fi.getPath()))
                 .findFirst()
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileDownloadActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadActionTest.java
index a53cdf444..228acae3b 100644
--- a/src/test/java/com/crowdin/cli/commands/actions/FileDownloadActionTest.java
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadActionTest.java
@@ -51,7 +51,7 @@ public void testDownload() {
         when(client.downloadFile(eq(101L)))
             .thenReturn(urlMock);
 
-        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadAction("first.po", null);
+        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadAction("first.po", "dest");
         action.act(Outputter.getDefault(), pb, client);
 
         verify(client).downloadFullProject();
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileDownloadTranslationActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadTranslationActionTest.java
index 1e66bf359..acbef188d 100644
--- a/src/test/java/com/crowdin/cli/commands/actions/FileDownloadTranslationActionTest.java
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadTranslationActionTest.java
@@ -55,7 +55,7 @@ public void testDownloadTranslation() {
         when(client.buildProjectFileTranslation(eq(101L), eq(request)))
             .thenReturn(urlMock);
 
-        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadTranslationAction("first.po", "ua", "first.po");
+        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadTranslationAction("first.po", "ua", null);
         action.act(Outputter.getDefault(), pb, client);
 
 
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileUploadTranslationActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileUploadTranslationActionTest.java
index f135e6892..adfd66200 100644
--- a/src/test/java/com/crowdin/cli/commands/actions/FileUploadTranslationActionTest.java
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileUploadTranslationActionTest.java
@@ -56,7 +56,7 @@ public void testUploadTranslation_FileBasedProject() throws ResponseException {
         when(client.uploadStorage(eq("first_uk.po"), any()))
             .thenReturn(1L);
 
-        NewAction<ProjectProperties, ProjectClient> action = new FileUploadTranslationAction(fileToUpload, null, "first.po", "ua", false);
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadTranslationAction(fileToUpload, null, "/first.po", "ua", false);
         action.act(Outputter.getDefault(), pb, client);
 
         verify(client).downloadFullProject(any());
diff --git a/versions.properties b/versions.properties
index 0968aaae8..f036d702f 100644
--- a/versions.properties
+++ b/versions.properties
@@ -45,7 +45,7 @@ version.commons-cli..commons-cli=1.5.0
 
 version.com.h3xstream.findsecbugs..findsecbugs-plugin=1.12.0
 
-version.com.github.crowdin..crowdin-api-client-java=1.13.0
+version.com.github.crowdin..crowdin-api-client-java=1.14.0
 
 plugin.org.asciidoctor.jvm.convert=3.3.2
 

From 65dab30b66962374cc4902dffd936c481cca0bb1 Mon Sep 17 00:00:00 2001
From: Kateryna Oblakevych <malutina.catya14@gmail.com>
Date: Fri, 19 Jan 2024 12:28:42 +0200
Subject: [PATCH 06/11] update descriptions

---
 .../cli/client/CrowdinProjectClient.java      |  5 +++-
 .../actions/FileUploadTranslationAction.java  |  6 +++--
 .../picocli/FileDownloadSubcommand.java       |  4 +--
 .../picocli/FileUploadSubcommand.java         | 10 ++++----
 .../resources/messages/messages.properties    | 25 +++++++++++--------
 5 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/crowdin/cli/client/CrowdinProjectClient.java b/src/main/java/com/crowdin/cli/client/CrowdinProjectClient.java
index bb8f2293c..ccd96b7bf 100644
--- a/src/main/java/com/crowdin/cli/client/CrowdinProjectClient.java
+++ b/src/main/java/com/crowdin/cli/client/CrowdinProjectClient.java
@@ -66,7 +66,10 @@ private void populateProjectWithStructure(CrowdinProjectFull project, String bra
                 )
                 .ifPresent(project::setBranch);
         Long branchId = Optional.ofNullable(project.getBranch()).map(Branch::getId).orElse(null);
-        if (Objects.equals(project.getType(), Type.STRINGS_BASED)) return;
+
+        if (Objects.equals(project.getType(), Type.STRINGS_BASED)) {
+            return;
+        }
         project.setFiles(executeRequestFullList((limit, offset) -> this.client.getSourceFilesApi()
             .listFiles(this.projectId, branchId, null, null, true, limit, offset)));
         project.setDirectories(executeRequestFullList((limit, offset) -> this.client.getSourceFilesApi()
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileUploadTranslationAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileUploadTranslationAction.java
index e0acf355c..bdb08981f 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/FileUploadTranslationAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileUploadTranslationAction.java
@@ -40,8 +40,9 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
         CrowdinProjectFull project = ConsoleSpinner.execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
             this.plainView, this.plainView, () -> client.downloadFullProject(branchName));
 
-        if (!project.findLanguageById(languageId, true).isPresent())
+        if (!project.findLanguageById(languageId, true).isPresent()) {
             throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.language_not_exist"), languageId));
+        }
 
         if (Objects.equals(Type.FILES_BASED, project.getType())) {
             if (Objects.isNull(dest))
@@ -65,8 +66,9 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
         } else if (Objects.equals(Type.STRINGS_BASED, project.getType())) {
             UploadTranslationsStringsRequest request = new UploadTranslationsStringsRequest();
             Branch branch = BranchUtils.getOrCreateBranch(out, branchName, client, project, plainView);
-            if (Objects.isNull(branch))
+            if (Objects.isNull(branch)) {
                 throw new RuntimeException(RESOURCE_BUNDLE.getString("error.branch_required_string_project"));
+            }
             Long storageId = getStorageId(client);
             request.setBranchId(branch.getId());
             request.setStorageId(storageId);
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommand.java
index c7e58e18d..db20231a9 100644
--- a/src/main/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommand.java
+++ b/src/main/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommand.java
@@ -16,13 +16,13 @@
 )
 class FileDownloadSubcommand extends ActCommandProject {
 
-    @Parameters(descriptionKey = "crowdin.file.upload.file")
+    @Parameters(descriptionKey = "crowdin.file.download.file")
     protected String file;
 
     @Option(names = {"-l", "--language"}, paramLabel = "...", descriptionKey = "crowdin.file.language", order = -2)
     protected String languageId;
 
-    @Option(names = {"-d", "--dest"}, paramLabel = "...", descriptionKey = "crowdin.file.dest")
+    @Option(names = {"-d", "--dest"}, paramLabel = "...", descriptionKey = "crowdin.file.download.dest", order = -2)
     private String destination;
 
     @Override
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java
index 962567914..dd055a6bf 100644
--- a/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java
+++ b/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java
@@ -24,28 +24,28 @@ class FileUploadSubcommand extends ActCommandProject {
     @Option(names = {"-b", "--branch"}, paramLabel = "...", order = -2)
     protected String branch;
 
-    @Option(names = {"--no-auto-update"}, negatable = true, order = -2)
+    @Option(names = {"--no-auto-update"}, descriptionKey = "crowdin.file.upload.auto-update", negatable = true, order = -2)
     protected boolean autoUpdate = true;
 
     @Option(names = {"--label"}, descriptionKey = "params.label", paramLabel = "...", order = -2)
     protected List<String> labels;
 
-    @Option(names = {"-d", "--dest"}, paramLabel = "...", descriptionKey = "crowdin.file.dest")
+    @Option(names = {"-d", "--dest"}, paramLabel = "...", descriptionKey = "crowdin.file.upload.dest", order = -2)
     private String destination;
 
     @Option(names = {"--excluded-language"}, descriptionKey = "params.excluded-languages", paramLabel = "...", order = -2)
     protected List<String> excludedLanguages;
 
-    @Option(names = {"--no-cleanup-mode"}, negatable = true, order = -2)
+    @Option(names = {"--no-cleanup-mode"}, negatable = true, descriptionKey = "crowdin.file.upload.cleanup-mode", order = -2)
     protected boolean cleanupMode;
 
-    @Option(names = {"--no-update-strings"}, negatable = true, order = -2)
+    @Option(names = {"--no-update-strings"}, negatable = true, descriptionKey = "crowdin.file.upload.update-strings", order = -2)
     protected boolean updateStrings;
 
     @Option(names = {"-l", "--language"}, paramLabel = "...", descriptionKey = "crowdin.file.language", order = -2)
     protected String languageId;
 
-    @Option(names = {"--plain"})
+    @Option(names = {"--plain"}, descriptionKey = "crowdin.list.usage.plain")
     protected boolean plainView;
 
     @Override
diff --git a/src/main/resources/messages/messages.properties b/src/main/resources/messages/messages.properties
index 57583c4ec..ad6bc6550 100755
--- a/src/main/resources/messages/messages.properties
+++ b/src/main/resources/messages/messages.properties
@@ -122,23 +122,28 @@ crowdin.upload.translations.import-eq-suggestions=Add translations even if they'
 crowdin.upload.translations.translate-hidden=Upload translations to hidden source strings
 
 # CROWDIN FILE COMMAND
-crowdin.file.usage.description=Manage source files in a Crowdin project
+crowdin.file.usage.description=Manage source files and translations in a Crowdin project
 crowdin.file.usage.customSynopsis=@|fg(green) crowdin file|@ [SUBCOMMAND] [CONFIG OPTIONS] [OPTIONS]
-crowdin.file.dest=File destination in the Crowdin project
-crowdin.file.language=File language
+crowdin.file.language=Target language identifier
 
 # CROWDIN FILE UPLOAD COMMAND
-crowdin.file.upload.usage.description=Upload a file to a specified place
-crowdin.file.upload.usage.customSynopsis=@|fg(green) crowdin file upload branches|@ [CONFIG OPTIONS] [OPTIONS]
+crowdin.file.upload.usage.description=Upload a file to a Crowdin project
+crowdin.file.upload.usage.customSynopsis=@|fg(green) crowdin file upload|@ <file> [CONFIG OPTIONS] [OPTIONS]
 crowdin.file.upload.file=Path to file to upload
+crowdin.file.upload.dest=File destination in the Crowdin project
+crowdin.file.upload.auto-update=Specify whether to update the file in the Crowdin project if it already exists
+crowdin.file.upload.cleanup-mode=Specify whether to delete all strings with a system label that do not exist in the file
+crowdin.file.upload.update-strings=Specify whether to update strings that have the same keys
 
 # CROWDIN FILE DOWNLOAD COMMAND
-crowdin.file.download.usage.description=Download a file to a specified place
-crowdin.file.download.usage.customSynopsis=@|fg(green) crowdin file download|@ [CONFIG OPTIONS] [OPTIONS]
+crowdin.file.download.usage.description=Download a file to a specified location
+crowdin.file.download.usage.customSynopsis=@|fg(green) crowdin file download|@ <file> [CONFIG OPTIONS] [OPTIONS]
+crowdin.file.download.file=Crowdin file path for download
+crowdin.file.download.dest=Path where the downloaded file should be saved
 
 # CROWDIN FILE DELETE COMMAND
 crowdin.file.delete.usage.description=Delete a file in a Crowdin project
-crowdin.file.delete.usage.customSynopsis=@|fg(green) crowdin file delete|@ [CONFIG OPTIONS] [OPTIONS]
+crowdin.file.delete.usage.customSynopsis=@|fg(green) crowdin file delete|@ <file> [CONFIG OPTIONS] [OPTIONS]
 crowdin.file.delete.file=Path to file in the Crowdin project
 
 # CROWDIN STATUS COMMAND
@@ -608,7 +613,7 @@ error.spinner.reviewed_sources=Failed to load reviewed sources. Please contact o
 
 error.file_not_found=File '%s' not found in the Crowdin project
 error.local_file_not_found=File '%s' not found by the specified path
-error.branch_required_string_project=Branch required for string-based projects
+error.branch_required_string_project=Branch is required for string-based projects
 
 message.new_version_text=New version of Crowdin CLI is available! %s -> %s
 message.new_version_text.2=Changelog: @|cyan https://github.com/crowdin/crowdin-cli/releases/latest|@
@@ -664,7 +669,7 @@ message.description=%s @|bold '%s'|@
 message.obsolete_file=Obsolete file @|bold '%s'|@
 message.file_id_deprecated=File id is deprecated and will be removed in future releases. Please use file path instead
 message.file_deleted=File @|bold '%s'|@ deleted
-message.no_file_string_project=String-based projects don't have files
+message.no_file_string_project=File management is not available for string-based projects
 
 message.download_sources.preserve_hierarchy_warning=Because the @|bold 'preserve_hierarchy'|@ parameter is set to 'false':\n\t- CLI might download some unexpected files that match the pattern;\n\t- Source file hierarchy may not be preserved and will be the same as in Crowdin.
 message.download_translations.preserve_hierarchy_warning=Because the @|bold 'preserve_hierarchy'|@ parameter is set to 'false' CLI might download some unexpected files that match the pattern

From 362cf2bc886160763680e71f30a08bc4a1d86d35 Mon Sep 17 00:00:00 2001
From: Kateryna Oblakevych <malutina.catya14@gmail.com>
Date: Sun, 21 Jan 2024 18:22:35 +0200
Subject: [PATCH 07/11] commands fixes

---
 prepare-docs.sh                               |  2 +
 .../com/crowdin/cli/commands/Actions.java     |  6 +--
 .../cli/commands/actions/CliActions.java      | 12 +++---
 .../cli/commands/actions/DownloadAction.java  |  4 +-
 .../commands/actions/FileDeleteAction.java    |  5 ++-
 .../commands/actions/FileDownloadAction.java  | 22 +++++++---
 .../FileDownloadTranslationAction.java        | 42 ++++++++++++++-----
 .../commands/actions/FileUploadAction.java    |  4 +-
 .../actions/FileUploadTranslationAction.java  |  6 +--
 .../picocli/FileDeleteSubcommand.java         |  6 ++-
 .../picocli/FileDownloadSubcommand.java       |  7 +++-
 .../picocli/FileUploadSubcommand.java         |  4 +-
 .../resources/messages/messages.properties    |  7 +++-
 .../cli/commands/actions/CliActionsTest.java  |  6 +--
 .../actions/FileDeleteActionTest.java         |  2 +-
 .../actions/FileDownloadActionTest.java       |  6 +--
 .../FileDownloadTranslationActionTest.java    |  2 +-
 .../actions/FileUploadActionTest.java         | 12 +++---
 .../FileUploadTranslationActionTest.java      |  8 +---
 .../picocli/FileDeleteSubcommandTest.java     |  2 +-
 .../picocli/FileDownloadSubcommandTest.java   |  4 +-
 .../commands/picocli/PicocliTestUtils.java    |  6 +--
 22 files changed, 108 insertions(+), 67 deletions(-)

diff --git a/prepare-docs.sh b/prepare-docs.sh
index d564c2e1f..7f42eb035 100755
--- a/prepare-docs.sh
+++ b/prepare-docs.sh
@@ -80,6 +80,8 @@ sed -i.bak -e 's/\*\*--\[no-\]import-eq-suggestions\*\*/`--[no-]import-eq-sugges
 sed -i.bak -e 's/\*\*--\[no-\]translate-hidden\*\*/`--[no-]translate-hidden`/g' -- *.md
 sed -i.bak -e 's/\*\*--\[no-\]preserve-hierarchy\*\*/`--[no-]preserve-hierarchy`/g' -- *.md
 sed -i.bak -e 's/\*\*--\[no-\]auto-tag\*\*/`--[no-]auto-tag`/g' -- *.md
+sed -i.bak -e 's/\*\*--\[no-\]cleanup-mode\*\*/`--[no-]cleanup-mode`/g' -- *.md
+sed -i.bak -e 's/\*\*--\[no-\]update-strings\*\*/`--[no-]update-strings`/g' -- *.md
 
 rm -- *.md.bak
 
diff --git a/src/main/java/com/crowdin/cli/commands/Actions.java b/src/main/java/com/crowdin/cli/commands/Actions.java
index 90dbd02de..6a9702c96 100644
--- a/src/main/java/com/crowdin/cli/commands/Actions.java
+++ b/src/main/java/com/crowdin/cli/commands/Actions.java
@@ -137,9 +137,9 @@ NewAction<PropertiesWithFiles, ProjectClient> preTranslate(
 
     NewAction<ProjectProperties, ProjectClient> fileUploadTranslation(File file, String branch, String dest, String languageId, boolean plainView);
 
-    NewAction<ProjectProperties, ProjectClient> fileDownload(String file, String destParam);
+    NewAction<ProjectProperties, ProjectClient> fileDownload(String file, String branch, String destParam);
 
-    NewAction<ProjectProperties, ProjectClient> fileDownloadTranslation(String file, String languageId, String destParam);
+    NewAction<ProjectProperties, ProjectClient> fileDownloadTranslation(String file, String languageId, String branch, String destParam);
 
-    NewAction<ProjectProperties, ProjectClient> fileDelete(String file);
+    NewAction<ProjectProperties, ProjectClient> fileDelete(String file, String branch);
 }
diff --git a/src/main/java/com/crowdin/cli/commands/actions/CliActions.java b/src/main/java/com/crowdin/cli/commands/actions/CliActions.java
index dd9837eaf..2d9a71fab 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/CliActions.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/CliActions.java
@@ -288,17 +288,17 @@ public NewAction<ProjectProperties, ProjectClient> fileUploadTranslation(File fi
     }
 
     @Override
-    public NewAction<ProjectProperties, ProjectClient> fileDownload(String file, String destParam) {
-        return new FileDownloadAction(file, destParam);
+    public NewAction<ProjectProperties, ProjectClient> fileDownload(String file, String branch, String destParam) {
+        return new FileDownloadAction(file, branch, destParam);
     }
 
     @Override
-    public NewAction<ProjectProperties, ProjectClient> fileDownloadTranslation(String file, String languageId, String destParam) {
-        return new FileDownloadTranslationAction(file, languageId, destParam);
+    public NewAction<ProjectProperties, ProjectClient> fileDownloadTranslation(String file, String languageId, String branch, String destParam) {
+        return new FileDownloadTranslationAction(file, languageId, branch, destParam);
     }
 
     @Override
-    public NewAction<ProjectProperties, ProjectClient> fileDelete(String file) {
-        return new FileDeleteAction(file);
+    public NewAction<ProjectProperties, ProjectClient> fileDelete(String file, String branch) {
+        return new FileDeleteAction(file, branch);
     }
 }
diff --git a/src/main/java/com/crowdin/cli/commands/actions/DownloadAction.java b/src/main/java/com/crowdin/cli/commands/actions/DownloadAction.java
index bc47f8b1c..48e9b556f 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/DownloadAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/DownloadAction.java
@@ -416,7 +416,7 @@ private ProjectBuild buildTranslation(ProjectClient client, BuildProjectTranslat
 
         return ConsoleSpinner.execute(
             out,
-            "message.spinner.building_translation",
+            "message.spinner.building_translations",
             "error.building_translation",
             this.noProgress,
             this.plainView,
@@ -537,7 +537,7 @@ private Map<String, String> doTranslationMapping(
     }
 
     private void downloadTranslations(ProjectClient client, Long buildId, String archivePath) {
-        ConsoleSpinner.execute(out, "message.spinner.downloading_translation", "error.downloading_file", this.noProgress, this.plainView, () -> {
+        ConsoleSpinner.execute(out, "message.spinner.downloading_translations", "error.downloading_file", this.noProgress, this.plainView, () -> {
             URL url = client.downloadBuild(buildId);
             try (InputStream data = url.openStream()) {
                 files.writeToFile(archivePath, data);
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileDeleteAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileDeleteAction.java
index 80b6af8f2..7a8b46c3f 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/FileDeleteAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileDeleteAction.java
@@ -17,11 +17,13 @@
 
 import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
 import static com.crowdin.cli.utils.console.ExecutionStatus.SKIPPED;
+import static java.util.Objects.nonNull;
 
 @AllArgsConstructor
 class FileDeleteAction implements NewAction<ProjectProperties, ProjectClient> {
 
     private final String file;
+    private final String branch;
 
     @Override
     public void act(Outputter out, ProjectProperties properties, ProjectClient client) {
@@ -32,7 +34,8 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
             out.println(SKIPPED.withIcon(RESOURCE_BUNDLE.getString("message.no_file_string_project")));
             return;
         }
-        String filePath = Utils.toUnixPath(Utils.sepAtStart(file));
+        String branchPrefix = nonNull(branch) ? branch + Utils.PATH_SEPARATOR : "";
+        String filePath = Utils.toUnixPath(Utils.sepAtStart(branchPrefix + file));
         List<FileInfo> projectFiles = project.getFileInfos();
         FileInfo foundFile = projectFiles.stream()
             .filter(f -> Objects.equals(filePath, f.getPath()))
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java
index 3874fee52..81303b650 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java
@@ -27,13 +27,14 @@
 class FileDownloadAction implements NewAction<ProjectProperties, ProjectClient> {
 
     private final String file;
+    private final String branch;
     private final String dest;
 
     @Override
     public void act(Outputter out, ProjectProperties properties, ProjectClient client) {
         CrowdinProjectFull project = ConsoleSpinner
             .execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
-                true, true, client::downloadFullProject);
+                false, false, () -> client.downloadFullProject(branch));
         if (Objects.equals(project.getType(), Type.STRINGS_BASED)) {
             out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.no_file_string_project")));
             return;
@@ -43,14 +44,25 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
             return;
         }
 
-        String filePath = Utils.toUnixPath(Utils.sepAtStart(file));
+        String branchPrefix = nonNull(branch) ? branch + Utils.PATH_SEPARATOR : "";
+        String filePath = Utils.toUnixPath(Utils.sepAtStart(branchPrefix + file));
         FileInfo foundFile = project.getFileInfos().stream()
             .filter(f -> Objects.equals(filePath, f.getPath()))
             .findFirst()
             .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file_not_found"), filePath)));
-        URL url = client.downloadFile(foundFile.getId());
-        String destPath = nonNull(dest) ? Utils.sepAtEnd(dest) + foundFile.getName() : file;
-        saveToFile(Utils.normalizePath(destPath), url);
+        ConsoleSpinner.execute(
+            out,
+            "message.spinner.downloading_file",
+            "error.downloading_file",
+            false,
+            false,
+            () -> {
+                URL url = client.downloadFile(foundFile.getId());
+                String destPath = nonNull(dest) ? Utils.sepAtEnd(dest) + foundFile.getName() : Utils.joinPaths(properties.getBasePath(), file);
+                saveToFile(Utils.normalizePath(destPath), url);
+                return url;
+            }
+        );
         out.println(OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.downloaded_file"), filePath)));
         out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.experimental_command")));
     }
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadTranslationAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadTranslationAction.java
index ac49ab69c..b6e6973db 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadTranslationAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadTranslationAction.java
@@ -31,13 +31,14 @@ public class FileDownloadTranslationAction implements NewAction<ProjectPropertie
 
     private final String file;
     private final String languageId;
+    private final String branch;
     private final String dest;
 
     @Override
     public void act(Outputter out, ProjectProperties properties, ProjectClient client) {
         CrowdinProjectFull project = ConsoleSpinner
             .execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
-                true, true, client::downloadFullProject);
+                false, false, client::downloadFullProject);
         if (Objects.equals(project.getType(), Type.STRINGS_BASED)) {
             out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.no_file_string_project")));
             return;
@@ -49,7 +50,9 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
 
         Language language = project.findLanguageById(languageId, true)
             .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.language_not_exist"), languageId)));
-        String sourcePath = Utils.toUnixPath(Utils.sepAtStart(file));
+
+        String branchPrefix = nonNull(branch) ? branch + Utils.PATH_SEPARATOR : "";
+        String sourcePath = Utils.toUnixPath(Utils.sepAtStart(branchPrefix + file));
         FileInfo sourceFileInfo = project.getFileInfos().stream()
             .filter(fi -> Objects.equals(sourcePath, fi.getPath()))
             .findFirst()
@@ -62,21 +65,38 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
         BuildProjectFileTranslationRequest request = new BuildProjectFileTranslationRequest();
         request.setTargetLanguageId(language.getId());
 
-        URL url = client.buildProjectFileTranslation(sourceFileInfo.getId(), request);
+        URL url = ConsoleSpinner.execute(
+            out,
+            "message.spinner.building_translation",
+            "error.building_translation",
+            false,
+            false,
+            () -> client.buildProjectFileTranslation(sourceFileInfo.getId(), request)
+        );
         String destPath = nonNull(dest)
             ? placeholderUtil.replaceLanguageDependentPlaceholders(dest + Utils.PATH_SEPARATOR + sourceFileInfo.getName(), language)
             : languageId + sourcePath;
-        saveToFile(Utils.normalizePath(destPath), url);
+        saveToFile(Utils.normalizePath(destPath), url, out);
         out.println(OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.downloaded_file"), destPath)));
         out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.experimental_command")));
     }
 
-    private void saveToFile(String destPath, URL url) {
-        FilesInterface files = new FsFiles();
-        try (InputStream data = url.openStream()) {
-            files.writeToFile(destPath, data);
-        } catch (IOException e) {
-            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.write_file"), destPath), e);
-        }
+    private void saveToFile(String destPath, URL url, Outputter out) {
+        ConsoleSpinner.execute(
+            out,
+            "message.spinner.downloading_translation",
+            "error.write_file",
+            false,
+            false,
+            () -> {
+                FilesInterface files = new FsFiles();
+                try (InputStream data = url.openStream()) {
+                    files.writeToFile(destPath, data);
+                } catch (IOException e) {
+                    throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.write_file"), destPath), e);
+                }
+                return url;
+            }
+        );
     }
 }
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java
index 0331dfe65..256d308b9 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java
@@ -46,7 +46,7 @@ class FileUploadAction implements NewAction<ProjectProperties, ProjectClient> {
     @Override
     public void act(Outputter out, ProjectProperties properties, ProjectClient client) {
         CrowdinProjectFull project = ConsoleSpinner.execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
-            this.plainView, this.plainView, () -> client.downloadFullProject(branchName));
+            this.plainView, this.plainView, client::downloadFullProject);
         PlaceholderUtil placeholderUtil = new PlaceholderUtil(project.getSupportedLanguages(), project.getProjectLanguages(false), properties.getBasePath());
 
         Optional<List<Long>> attachLabelIds = Optional.empty();
@@ -60,7 +60,7 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
             final String filePath = (nonNull(dest))
                 ? PropertiesBeanUtils.prepareDest(dest, StringUtils.removeStart(file.getAbsolutePath(), properties.getBasePath()), placeholderUtil)
                 : StringUtils.removeStart(file.getAbsolutePath(), properties.getBasePath() + commonPath);
-            fileFullPath = (branchName != null ? branchName + Utils.PATH_SEPARATOR : "") + filePath;
+            fileFullPath = (nonNull(branchName) ? branchName + Utils.PATH_SEPARATOR : "") + filePath;
             Map<String, FileInfo> paths = ProjectFilesUtils.buildFilePaths(project.getDirectories(), project.getBranches(), project.getFileInfos());
             FileInfo projectFile = paths.get(fileFullPath);
 
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileUploadTranslationAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileUploadTranslationAction.java
index bdb08981f..068ec11b5 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/FileUploadTranslationAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileUploadTranslationAction.java
@@ -65,10 +65,8 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
             }
         } else if (Objects.equals(Type.STRINGS_BASED, project.getType())) {
             UploadTranslationsStringsRequest request = new UploadTranslationsStringsRequest();
-            Branch branch = BranchUtils.getOrCreateBranch(out, branchName, client, project, plainView);
-            if (Objects.isNull(branch)) {
-                throw new RuntimeException(RESOURCE_BUNDLE.getString("error.branch_required_string_project"));
-            }
+            Branch branch = project.findBranchByName(branchName)
+                .orElseThrow(() -> new RuntimeException(RESOURCE_BUNDLE.getString("error.branch_required_string_project")));
             Long storageId = getStorageId(client);
             request.setBranchId(branch.getId());
             request.setStorageId(storageId);
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommand.java
index 15d5b4178..74d7fb883 100644
--- a/src/main/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommand.java
+++ b/src/main/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommand.java
@@ -4,6 +4,7 @@
 import com.crowdin.cli.commands.Actions;
 import com.crowdin.cli.commands.NewAction;
 import com.crowdin.cli.properties.ProjectProperties;
+import picocli.CommandLine;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Parameters;
 
@@ -16,8 +17,11 @@ class FileDeleteSubcommand extends ActCommandProject {
     @Parameters(descriptionKey = "crowdin.file.delete.file")
     protected String file;
 
+    @CommandLine.Option(names = {"-b", "--branch"}, paramLabel = "...", order = -2)
+    protected String branch;
+
     @Override
     protected NewAction<ProjectProperties, ProjectClient> getAction(Actions actions) {
-        return actions.fileDelete(file);
+        return actions.fileDelete(file, branch);
     }
 }
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommand.java
index db20231a9..c97917b82 100644
--- a/src/main/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommand.java
+++ b/src/main/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommand.java
@@ -22,13 +22,16 @@ class FileDownloadSubcommand extends ActCommandProject {
     @Option(names = {"-l", "--language"}, paramLabel = "...", descriptionKey = "crowdin.file.language", order = -2)
     protected String languageId;
 
+    @Option(names = {"-b", "--branch"}, paramLabel = "...", order = -2)
+    protected String branch;
+
     @Option(names = {"-d", "--dest"}, paramLabel = "...", descriptionKey = "crowdin.file.download.dest", order = -2)
     private String destination;
 
     @Override
     protected NewAction<ProjectProperties, ProjectClient> getAction(Actions actions) {
         if (Objects.nonNull(languageId))
-            return actions.fileDownloadTranslation(file, languageId, destination);
-        return actions.fileDownload(file, destination);
+            return actions.fileDownloadTranslation(file, languageId, branch, destination);
+        return actions.fileDownload(file, branch, destination);
     }
 }
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java
index dd055a6bf..9a2f8d57e 100644
--- a/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java
+++ b/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java
@@ -37,10 +37,10 @@ class FileUploadSubcommand extends ActCommandProject {
     protected List<String> excludedLanguages;
 
     @Option(names = {"--no-cleanup-mode"}, negatable = true, descriptionKey = "crowdin.file.upload.cleanup-mode", order = -2)
-    protected boolean cleanupMode;
+    protected boolean cleanupMode = true;
 
     @Option(names = {"--no-update-strings"}, negatable = true, descriptionKey = "crowdin.file.upload.update-strings", order = -2)
-    protected boolean updateStrings;
+    protected boolean updateStrings = true;
 
     @Option(names = {"-l", "--language"}, paramLabel = "...", descriptionKey = "crowdin.file.language", order = -2)
     protected String languageId;
diff --git a/src/main/resources/messages/messages.properties b/src/main/resources/messages/messages.properties
index ad6bc6550..60a1af9bb 100755
--- a/src/main/resources/messages/messages.properties
+++ b/src/main/resources/messages/messages.properties
@@ -755,9 +755,12 @@ message.warning.no_file_to_download=Couldn't find any file to download
 message.warning.no_file_to_download_skipuntranslated=Couldn't find any file to download. As you are using the 'Skip untranslated files' option, please make sure you have fully translated files
 message.warning.another_build_in_progress=Another build is currently in progress. Please wait until it's finished
 message.spinner.fetching_project_info=Fetching project info
-message.spinner.building_translation=Building translations
+message.spinner.building_translations=Building translations
+message.spinner.building_translation=Building translation
 message.spinner.building_reviewed_sources=Building reviewed sources
-message.spinner.downloading_translation=Downloading translations
+message.spinner.downloading_file=Downloading file
+message.spinner.downloading_translations=Downloading translations
+message.spinner.downloading_translation=Downloading translation
 message.spinner.downloading_reviewed_sources=Downloading reviewed sources
 message.spinner.extracting_archive=Extracting archive
 message.spinner.validating_project=Validating project
diff --git a/src/test/java/com/crowdin/cli/commands/actions/CliActionsTest.java b/src/test/java/com/crowdin/cli/commands/actions/CliActionsTest.java
index 8224e7de0..c3fa94c98 100644
--- a/src/test/java/com/crowdin/cli/commands/actions/CliActionsTest.java
+++ b/src/test/java/com/crowdin/cli/commands/actions/CliActionsTest.java
@@ -169,16 +169,16 @@ void testFileUploadTranslation() {
 
     @Test
     void testFileDownload() {
-        assertNotNull(actions.fileDownload(null, null));
+        assertNotNull(actions.fileDownload(null, null, null));
     }
 
     @Test
     void testFileDownloadTranslation() {
-        assertNotNull(actions.fileDownloadTranslation(null, null, null));
+        assertNotNull(actions.fileDownloadTranslation(null, null,null, null));
     }
 
     @Test
     void testFileDelete() {
-        assertNotNull(actions.fileDelete(null));
+        assertNotNull(actions.fileDelete(null, null));
     }
 }
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileDeleteActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileDeleteActionTest.java
index fd986456d..5c533f9d7 100644
--- a/src/test/java/com/crowdin/cli/commands/actions/FileDeleteActionTest.java
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileDeleteActionTest.java
@@ -45,7 +45,7 @@ public void testDelete() {
         when(client.downloadFullProject())
             .thenReturn(build);
 
-        NewAction<ProjectProperties, ProjectClient> action = new FileDeleteAction("first.po");
+        NewAction<ProjectProperties, ProjectClient> action = new FileDeleteAction("first.po", null);
         action.act(Outputter.getDefault(), pb, client);
 
         verify(client).downloadFullProject();
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileDownloadActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadActionTest.java
index 228acae3b..6769c7d06 100644
--- a/src/test/java/com/crowdin/cli/commands/actions/FileDownloadActionTest.java
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadActionTest.java
@@ -46,15 +46,15 @@ public void testDownload() {
         CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
             .addFile("/first.po", "gettext", 101L, null, null, null).build();
         build.setType(Type.FILES_BASED);
-        when(client.downloadFullProject())
+        when(client.downloadFullProject(any()))
             .thenReturn(build);
         when(client.downloadFile(eq(101L)))
             .thenReturn(urlMock);
 
-        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadAction("first.po", "dest");
+        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadAction("first.po", null, "dest");
         action.act(Outputter.getDefault(), pb, client);
 
-        verify(client).downloadFullProject();
+        verify(client).downloadFullProject(any());
         verify(client).downloadFile(eq(101L));
         verifyNoMoreInteractions(client);
     }
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileDownloadTranslationActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadTranslationActionTest.java
index acbef188d..340123c55 100644
--- a/src/test/java/com/crowdin/cli/commands/actions/FileDownloadTranslationActionTest.java
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadTranslationActionTest.java
@@ -55,7 +55,7 @@ public void testDownloadTranslation() {
         when(client.buildProjectFileTranslation(eq(101L), eq(request)))
             .thenReturn(urlMock);
 
-        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadTranslationAction("first.po", "ua", null);
+        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadTranslationAction("first.po", "ua", null, null);
         action.act(Outputter.getDefault(), pb, client);
 
 
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileUploadActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileUploadActionTest.java
index b75241e70..ae12fbbec 100644
--- a/src/test/java/com/crowdin/cli/commands/actions/FileUploadActionTest.java
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileUploadActionTest.java
@@ -50,7 +50,7 @@ public void testUpload_FileBasedProject() throws ResponseException {
         ProjectClient client = mock(ProjectClient.class);
         CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
         build.setType(Type.FILES_BASED);
-        when(client.downloadFullProject(any()))
+        when(client.downloadFullProject())
             .thenReturn(build);
         when(client.uploadStorage(eq("first.po"), any()))
             .thenReturn(1L);
@@ -58,7 +58,7 @@ public void testUpload_FileBasedProject() throws ResponseException {
         NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, null, false, null, null, false, false, null, false);
         action.act(Outputter.getDefault(), pb, client);
 
-        verify(client).downloadFullProject(any());
+        verify(client).downloadFullProject();
         verify(client).uploadStorage(eq("first.po"), any());
         AddFileRequest addFileRequest = new AddFileRequest() {{
             setName("first.po");
@@ -91,7 +91,7 @@ public void testUpload_StringBasedProject() throws ResponseException {
         }};
 
         when(branch.getId()).thenReturn(2L);
-        when(client.downloadFullProject(any())).thenReturn(build);
+        when(client.downloadFullProject()).thenReturn(build);
         when(client.uploadStorage(eq("first.po"), any())).thenReturn(1L);
         when(client.addBranch(any())).thenReturn(branch);
         when(client.addSourceStringsBased(any())).thenReturn(progress);
@@ -100,7 +100,7 @@ public void testUpload_StringBasedProject() throws ResponseException {
         NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, "branch", false, null, null, false, false, null, false);
         action.act(Outputter.getDefault(), pb, client);
 
-        verify(client).downloadFullProject(any());
+        verify(client).downloadFullProject();
         verify(client).uploadStorage(eq("first.po"), any());
         verify(client).addBranch(any());
         verify(client).getUploadStringsStatus(any());
@@ -126,7 +126,7 @@ public void testUploadUpdate_FileBasedProject() throws ResponseException {
         CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
             .addFile("first.po", "gettext", 101L, null, null).build();
         build.setType(Type.FILES_BASED);
-        when(client.downloadFullProject(any()))
+        when(client.downloadFullProject())
             .thenReturn(build);
         when(client.uploadStorage(eq("first.po"), any()))
             .thenReturn(1L);
@@ -134,7 +134,7 @@ public void testUploadUpdate_FileBasedProject() throws ResponseException {
         NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, null, true, null, null, false, false, null, false);
         action.act(Outputter.getDefault(), pb, client);
 
-        verify(client).downloadFullProject(any());
+        verify(client).downloadFullProject();
         verify(client).uploadStorage(eq("first.po"), any());
         UpdateFileRequest addFileRequest = new UpdateFileRequest() {{
             setStorageId(1L);
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileUploadTranslationActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileUploadTranslationActionTest.java
index adfd66200..a6a2374e6 100644
--- a/src/test/java/com/crowdin/cli/commands/actions/FileUploadTranslationActionTest.java
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileUploadTranslationActionTest.java
@@ -78,22 +78,18 @@ public void testUploadTranslation_StringBasedProject() throws ResponseException
             .setBasePath(project.getBasePath());
         PropertiesWithFiles pb = pbBuilder.build();
         ProjectClient client = mock(ProjectClient.class);
-        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
+            .addBranches(2L, "main").build();
         build.setType(Type.STRINGS_BASED);
-        Branch branch = mock(Branch.class);
-        when(branch.getId()).thenReturn(2L);
         when(client.downloadFullProject(any()))
             .thenReturn(build);
         when(client.uploadStorage(eq("first_uk.po"), any()))
             .thenReturn(1L);
-        when(client.addBranch(any()))
-            .thenReturn(branch);
 
         NewAction<ProjectProperties, ProjectClient> action = new FileUploadTranslationAction(fileToUpload, "main", null, "ua", false);
         action.act(Outputter.getDefault(), pb, client);
 
         verify(client).downloadFullProject(any());
-        verify(client).addBranch(any());
         verify(client).uploadStorage(eq("first_uk.po"), any());
         UploadTranslationsStringsRequest request = new UploadTranslationsStringsRequest() {{
             setBranchId(2L);
diff --git a/src/test/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommandTest.java b/src/test/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommandTest.java
index 052b50e29..c97a809da 100644
--- a/src/test/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommandTest.java
+++ b/src/test/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommandTest.java
@@ -10,7 +10,7 @@ class FileDeleteSubcommandTest extends PicocliTestUtils {
     @Test
     public void testFileDelete() {
         this.execute(CommandNames.FILE, CommandNames.FILE_DELETE, "file.txt");
-        verify(actionsMock).fileDelete(any());
+        verify(actionsMock).fileDelete(any(), any());
         this.check(true);
     }
 
diff --git a/src/test/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommandTest.java b/src/test/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommandTest.java
index 1030d8ed7..45f1905ad 100644
--- a/src/test/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommandTest.java
+++ b/src/test/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommandTest.java
@@ -10,14 +10,14 @@ class FileDownloadSubcommandTest extends PicocliTestUtils {
     @Test
     public void testFileDownload() {
         this.execute(CommandNames.FILE, CommandNames.FILE_DOWNLOAD, "file.txt");
-        verify(actionsMock).fileDownload(any(), any());
+        verify(actionsMock).fileDownload(any(), any(), any());
         this.check(true);
     }
 
     @Test
     public void testFileDownloadTranslations() {
         this.execute(CommandNames.FILE, CommandNames.FILE_DOWNLOAD, "file.txt", "--language", "uk");
-        verify(actionsMock).fileDownloadTranslation(any(), any(), any());
+        verify(actionsMock).fileDownloadTranslation(any(), any(), any(), any());
         this.check(true);
     }
 
diff --git a/src/test/java/com/crowdin/cli/commands/picocli/PicocliTestUtils.java b/src/test/java/com/crowdin/cli/commands/picocli/PicocliTestUtils.java
index b93f52d00..88238549c 100644
--- a/src/test/java/com/crowdin/cli/commands/picocli/PicocliTestUtils.java
+++ b/src/test/java/com/crowdin/cli/commands/picocli/PicocliTestUtils.java
@@ -124,11 +124,11 @@ void mockActions() {
                 .thenReturn(actionMock);
         when(actionsMock.fileUploadTranslation(any(), any(), any(), any(), anyBoolean()))
                 .thenReturn(actionMock);
-        when(actionsMock.fileDownload(any(), any()))
+        when(actionsMock.fileDownload(any(), any(), any()))
                 .thenReturn(actionMock);
-        when(actionsMock.fileDownloadTranslation(any(), any(), any()))
+        when(actionsMock.fileDownloadTranslation(any(), any(), any(), any()))
                 .thenReturn(actionMock);
-        when(actionsMock.fileDelete(any()))
+        when(actionsMock.fileDelete(any(), any()))
                 .thenReturn(actionMock);
         when(actionsMock.resolve(any()))
                 .thenReturn(actionMock);

From b9afcef9d7c5d6aac418fe32155c126df982596c Mon Sep 17 00:00:00 2001
From: Kateryna Oblakevych <malutina.catya14@gmail.com>
Date: Mon, 22 Jan 2024 17:05:22 +0200
Subject: [PATCH 08/11] more tests

---
 .../commands/actions/FileUploadAction.java    |  14 +-
 .../actions/FileDeleteActionTest.java         |  20 ++
 .../actions/FileDownloadActionTest.java       |  23 ++
 .../FileDownloadTranslationActionTest.java    |   5 +-
 .../actions/FileUploadActionTest.java         | 216 +++++++++++++++++-
 5 files changed, 270 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java
index 256d308b9..336adc299 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java
@@ -55,12 +55,14 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
         }
 
         String fileFullPath = file.getPath();
+        String fileDestName = file.getName();
         if (Objects.equals(Type.FILES_BASED, project.getType())) {
             String commonPath = SourcesUtils.getCommonPath(Collections.singletonList(this.file.getAbsolutePath()), properties.getBasePath());
             final String filePath = (nonNull(dest))
                 ? PropertiesBeanUtils.prepareDest(dest, StringUtils.removeStart(file.getAbsolutePath(), properties.getBasePath()), placeholderUtil)
                 : StringUtils.removeStart(file.getAbsolutePath(), properties.getBasePath() + commonPath);
             fileFullPath = (nonNull(branchName) ? branchName + Utils.PATH_SEPARATOR : "") + filePath;
+            fileDestName = fileFullPath.substring(fileFullPath.lastIndexOf(Utils.PATH_SEPARATOR) + 1);
             Map<String, FileInfo> paths = ProjectFilesUtils.buildFilePaths(project.getDirectories(), project.getBranches(), project.getFileInfos());
             FileInfo projectFile = paths.get(fileFullPath);
 
@@ -73,7 +75,7 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
                 final Long sourceId = projectFile.getId();
                 attachLabelIds.ifPresent(request::setAttachLabelIds);
 
-                Long storageId = getStorageId(client);
+                Long storageId = getStorageId(client, fileDestName);
                 request.setStorageId(storageId);
 
                 try {
@@ -112,7 +114,7 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
             throw new RuntimeException(RESOURCE_BUNDLE.getString("error.branch_required_string_project"));
         }
 
-        Long storageId = getStorageId(client);
+        Long storageId = getStorageId(client, fileDestName);
 
         Optional<List<String>> excludedLanguageNames = Optional.empty();
         if (nonNull(excludedLanguages) && !excludedLanguages.isEmpty()) {
@@ -121,7 +123,7 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
 
         if (Objects.equals(Type.FILES_BASED, project.getType())) {
             AddFileRequest request = new AddFileRequest();
-            request.setName(file.getName());
+            request.setName(fileDestName);
             request.setStorageId(storageId);
 
             Optional<Long> directoryId = getOrCreateDirectoryId(out, client, project, properties, branch.orElse(null));
@@ -183,7 +185,7 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
     private List<String> filterExcludedLanguages(List<String> excludedLanguages, CrowdinProjectFull project) {
         List<String> projectLanguageNames = project.getProjectLanguages(false)
             .stream()
-            .map(Language::getName)
+            .map(Language::getId)
             .collect(Collectors.toList());
 
         return excludedLanguages
@@ -221,9 +223,9 @@ private Optional<Long> getOrCreateDirectoryId(Outputter out, ProjectClient clien
         return directoryId;
     }
 
-    private Long getStorageId(ProjectClient client) {
+    private Long getStorageId(ProjectClient client, String fileName) {
         try (InputStream fileStream = Files.newInputStream(file.toPath())) {
-            return client.uploadStorage(file.getName(), fileStream);
+            return client.uploadStorage(fileName, fileStream);
         } catch (FileNotFoundException e) {
             throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.local_file_not_found"), file.getAbsolutePath()));
         } catch (EmptyFileException e){
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileDeleteActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileDeleteActionTest.java
index 5c533f9d7..ece27bc0c 100644
--- a/src/test/java/com/crowdin/cli/commands/actions/FileDeleteActionTest.java
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileDeleteActionTest.java
@@ -52,4 +52,24 @@ public void testDelete() {
         verify(client).deleteSource(eq(101L));
         verifyNoMoreInteractions(client);
     }
+
+    @Test
+    public void testDelete_StringBasedProject() {
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
+            .addFile("/first.po", "gettext", 101L, null, null, null).build();
+        build.setType(Type.STRINGS_BASED);
+        when(client.downloadFullProject())
+            .thenReturn(build);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileDeleteAction("first.po", null);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verifyNoMoreInteractions(client);
+    }
 }
\ No newline at end of file
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileDownloadActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadActionTest.java
index 6769c7d06..06f5a283e 100644
--- a/src/test/java/com/crowdin/cli/commands/actions/FileDownloadActionTest.java
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadActionTest.java
@@ -18,7 +18,10 @@
 import org.junit.jupiter.api.Test;
 
 import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
 
@@ -57,5 +60,25 @@ public void testDownload() {
         verify(client).downloadFullProject(any());
         verify(client).downloadFile(eq(101L));
         verifyNoMoreInteractions(client);
+        assertTrue(Files.exists(Paths.get("dest" + Utils.PATH_SEPARATOR + "first.po")), "File should exist at the specified path");
+    }
+
+    @Test
+    public void testDownload_StringBasedProject() {
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.STRINGS_BASED);
+        when(client.downloadFullProject(any()))
+            .thenReturn(build);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadAction("first.po", "main", "dest");
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject(any());
+        verifyNoMoreInteractions(client);
     }
 }
\ No newline at end of file
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileDownloadTranslationActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadTranslationActionTest.java
index 340123c55..b42daae72 100644
--- a/src/test/java/com/crowdin/cli/commands/actions/FileDownloadTranslationActionTest.java
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadTranslationActionTest.java
@@ -19,7 +19,10 @@
 import org.junit.jupiter.api.Test;
 
 import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.*;
 
@@ -58,9 +61,9 @@ public void testDownloadTranslation() {
         NewAction<ProjectProperties, ProjectClient> action = new FileDownloadTranslationAction("first.po", "ua", null, null);
         action.act(Outputter.getDefault(), pb, client);
 
-
         verify(client).downloadFullProject();
         verify(client).buildProjectFileTranslation(eq(101L), eq(request));
         verifyNoMoreInteractions(client);
+        assertTrue(Files.exists(Paths.get("ua" + Utils.PATH_SEPARATOR + "first.po")), "File should exist at the specified path");
     }
 }
\ No newline at end of file
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileUploadActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileUploadActionTest.java
index ae12fbbec..d26c083ea 100644
--- a/src/test/java/com/crowdin/cli/commands/actions/FileUploadActionTest.java
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileUploadActionTest.java
@@ -12,8 +12,12 @@
 import com.crowdin.cli.properties.helper.FileHelperTest;
 import com.crowdin.cli.properties.helper.TempProject;
 import com.crowdin.cli.utils.Utils;
+import com.crowdin.client.labels.model.Label;
 import com.crowdin.client.projectsgroups.model.Type;
-import com.crowdin.client.sourcefiles.model.*;
+import com.crowdin.client.sourcefiles.model.AddFileRequest;
+import com.crowdin.client.sourcefiles.model.Branch;
+import com.crowdin.client.sourcefiles.model.Directory;
+import com.crowdin.client.sourcefiles.model.UpdateFileRequest;
 import com.crowdin.client.sourcestrings.model.UploadStringsProgress;
 import com.crowdin.client.sourcestrings.model.UploadStringsRequest;
 import org.junit.jupiter.api.AfterEach;
@@ -21,6 +25,8 @@
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
+import java.util.Arrays;
+import java.util.Collections;
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
@@ -142,4 +148,212 @@ public void testUploadUpdate_FileBasedProject() throws ResponseException {
         verify(client).updateSource(any(), eq(addFileRequest));
         verifyNoMoreInteractions(client);
     }
+
+    @Test
+    public void testUploadNoAutoUpdate_FileBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first.po");
+        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
+            .addFile("first.po", "gettext", 101L, null, null).build();
+        build.setType(Type.FILES_BASED);
+        when(client.downloadFullProject())
+            .thenReturn(build);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, null, false, null, null, false, false, null, false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testUploadWhenBranchMissed_FileBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first.po");
+        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        Branch branch = new Branch() {{
+            setId(3L);
+            setName("main");
+        }};
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.FILES_BASED);
+        when(client.downloadFullProject())
+            .thenReturn(build);
+        when(client.uploadStorage(eq("first.po"), any()))
+            .thenReturn(1L);
+        when(client.addBranch(any())).thenReturn(branch);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, "main", false, null, null, false, false, null, false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client).uploadStorage(eq("first.po"), any());
+        verify(client).addBranch(any());
+        AddFileRequest addFileRequest = new AddFileRequest() {{
+            setName("first.po");
+            setStorageId(1L);
+            setBranchId(3L);
+        }};
+        verify(client).addSource(eq(addFileRequest));
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testUploadLabel_FileBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first.po");
+        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        Label label = new Label() {{
+            setId(3L);
+            setTitle("main_label");
+        }};
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.FILES_BASED);
+        when(client.downloadFullProject())
+            .thenReturn(build);
+        when(client.uploadStorage(eq("first.po"), any()))
+            .thenReturn(1L);
+        when(client.listLabels()).thenReturn(Collections.emptyList());
+        when(client.addLabel(any())).thenReturn(label);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, null, false, Collections.singletonList("main_label"), null, false, false, null, false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client).uploadStorage(eq("first.po"), any());
+        verify(client).listLabels();
+        verify(client).addLabel(any());
+        AddFileRequest addFileRequest = new AddFileRequest() {{
+            setName("first.po");
+            setStorageId(1L);
+            setAttachLabelIds(Collections.singletonList(3L));
+        }};
+        verify(client).addSource(eq(addFileRequest));
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testUploadExcludedLangs_FileBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first.po");
+        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.FILES_BASED);
+        when(client.downloadFullProject())
+            .thenReturn(build);
+        when(client.uploadStorage(eq("first.po"), any()))
+            .thenReturn(1L);
+        when(client.listLabels()).thenReturn(Collections.emptyList());
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, null, false, null, null, false, false, Arrays.asList("ua", "fr"), false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client).uploadStorage(eq("first.po"), any());
+        AddFileRequest addFileRequest = new AddFileRequest() {{
+            setName("first.po");
+            setStorageId(1L);
+            setExcludedTargetLanguages(Collections.singletonList("ua"));
+        }};
+        verify(client).addSource(eq(addFileRequest));
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testUploadWithDest_FileBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first.po");
+        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.FILES_BASED);
+        Directory directory = new Directory(){{
+            setId(2L);
+        }};
+        when(client.downloadFullProject())
+            .thenReturn(build);
+        when(client.addDirectory(any()))
+            .thenReturn(directory);
+        when(client.uploadStorage(eq("save.po"), any()))
+            .thenReturn(1L);
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, null, false, null, "path/to/save.po", false, false, null, false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client, times(2)).addDirectory(any());
+        verify(client).uploadStorage(eq("save.po"), any());
+        AddFileRequest addFileRequest = new AddFileRequest() {{
+            setName("save.po");
+            setStorageId(1L);
+            setDirectoryId(2L);
+        }};
+        verify(client).addSource(eq(addFileRequest));
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testUploadCleanUpModeAndUpdateStrings_StringBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first.po");
+        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        Branch branch = mock(Branch.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.STRINGS_BASED);
+        UploadStringsProgress progress = new UploadStringsProgress() {{
+            setIdentifier("id");
+            setProgress(100);
+        }};
+        UploadStringsProgress progressFinished = new UploadStringsProgress() {{
+            setIdentifier("id");
+            setStatus("finished");
+            setProgress(100);
+        }};
+
+        when(branch.getId()).thenReturn(2L);
+        when(client.downloadFullProject()).thenReturn(build);
+        when(client.uploadStorage(eq("first.po"), any())).thenReturn(1L);
+        when(client.addBranch(any())).thenReturn(branch);
+        when(client.addSourceStringsBased(any())).thenReturn(progress);
+        when(client.getUploadStringsStatus(any())).thenReturn(progressFinished);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, "branch", false, null, null, true, true, null, false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client).uploadStorage(eq("first.po"), any());
+        verify(client).addBranch(any());
+        verify(client).getUploadStringsStatus(any());
+        UploadStringsRequest addFileRequest = new UploadStringsRequest() {{
+            setBranchId(2L);
+            setStorageId(1L);
+            setCleanupMode(true);
+            setUpdateStrings(true);
+        }};
+        verify(client).addSourceStringsBased(eq(addFileRequest));
+        verifyNoMoreInteractions(client);
+    }
 }
\ No newline at end of file

From fe590d98aa594150c21bd7e10d028412544dd8a1 Mon Sep 17 00:00:00 2001
From: Kateryna Oblakevych <malutina.catya14@gmail.com>
Date: Tue, 23 Jan 2024 04:25:15 +0200
Subject: [PATCH 09/11] fix download path

---
 .../commands/actions/FileDownloadAction.java  |  4 +-
 .../FileDownloadTranslationAction.java        |  2 +-
 .../actions/FileDownloadActionTest.java       |  2 +-
 .../FileDownloadTranslationActionTest.java    | 50 ++++++++++++++++++-
 4 files changed, 53 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java
index 81303b650..db2c370b4 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java
@@ -58,8 +58,8 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
             false,
             () -> {
                 URL url = client.downloadFile(foundFile.getId());
-                String destPath = nonNull(dest) ? Utils.sepAtEnd(dest) + foundFile.getName() : Utils.joinPaths(properties.getBasePath(), file);
-                saveToFile(Utils.normalizePath(destPath), url);
+                String destPath = nonNull(dest) ? Utils.sepAtEnd(dest) + foundFile.getName() : file;
+                saveToFile(Utils.normalizePath(Utils.joinPaths(properties.getBasePath(), destPath)), url);
                 return url;
             }
         );
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadTranslationAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadTranslationAction.java
index b6e6973db..f900f39b9 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadTranslationAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadTranslationAction.java
@@ -76,7 +76,7 @@ public void act(Outputter out, ProjectProperties properties, ProjectClient clien
         String destPath = nonNull(dest)
             ? placeholderUtil.replaceLanguageDependentPlaceholders(dest + Utils.PATH_SEPARATOR + sourceFileInfo.getName(), language)
             : languageId + sourcePath;
-        saveToFile(Utils.normalizePath(destPath), url, out);
+        saveToFile(Utils.normalizePath(Utils.joinPaths(properties.getBasePath(), destPath)), url, out);
         out.println(OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.downloaded_file"), destPath)));
         out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.experimental_command")));
     }
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileDownloadActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadActionTest.java
index 06f5a283e..460687134 100644
--- a/src/test/java/com/crowdin/cli/commands/actions/FileDownloadActionTest.java
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadActionTest.java
@@ -60,7 +60,7 @@ public void testDownload() {
         verify(client).downloadFullProject(any());
         verify(client).downloadFile(eq(101L));
         verifyNoMoreInteractions(client);
-        assertTrue(Files.exists(Paths.get("dest" + Utils.PATH_SEPARATOR + "first.po")), "File should exist at the specified path");
+        assertTrue(Files.exists(Paths.get(project.getBasePath() + "dest/first.po")), "File should exist at the specified path");
     }
 
     @Test
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileDownloadTranslationActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadTranslationActionTest.java
index b42daae72..efd20b39b 100644
--- a/src/test/java/com/crowdin/cli/commands/actions/FileDownloadTranslationActionTest.java
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadTranslationActionTest.java
@@ -64,6 +64,54 @@ public void testDownloadTranslation() {
         verify(client).downloadFullProject();
         verify(client).buildProjectFileTranslation(eq(101L), eq(request));
         verifyNoMoreInteractions(client);
-        assertTrue(Files.exists(Paths.get("ua" + Utils.PATH_SEPARATOR + "first.po")), "File should exist at the specified path");
+        assertTrue(Files.exists(Paths.get(project.getBasePath() + "ua/first.po")), "File should exist at the specified path");
+    }
+
+    @Test
+    public void testDownloadTranslationWithDest() {
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        URL urlMock = MockitoUtils.getMockUrl(getClass());
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
+            .addFile("/first.po", "gettext", 101L, null, null, null).build();
+        build.setType(Type.FILES_BASED);
+        BuildProjectFileTranslationRequest request = new BuildProjectFileTranslationRequest() {{
+            setTargetLanguageId("ua");
+        }};
+        when(client.downloadFullProject())
+            .thenReturn(build);
+        when(client.buildProjectFileTranslation(eq(101L), eq(request)))
+            .thenReturn(urlMock);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadTranslationAction("first.po", "ua", null, "path/to/save");
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client).buildProjectFileTranslation(eq(101L), eq(request));
+        verifyNoMoreInteractions(client);
+        assertTrue(Files.exists(Paths.get(project.getBasePath() + "path/to/save/first.po")), "File should exist at the specified path");
+    }
+
+    @Test
+    public void testDownloadTranslation_StringBasedProject() {
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        URL urlMock = MockitoUtils.getMockUrl(getClass());
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.STRINGS_BASED);
+        when(client.downloadFullProject())
+            .thenReturn(build);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadTranslationAction("first.po", "ua", null, "path/to/save");
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verifyNoMoreInteractions(client);
     }
 }
\ No newline at end of file

From 6d81664b3d14ead1efc0cc94bc7b25b11bbca8ed Mon Sep 17 00:00:00 2001
From: Kateryna Oblakevych <malutina.catya14@gmail.com>
Date: Tue, 23 Jan 2024 13:11:58 +0200
Subject: [PATCH 10/11] CRLF to LF

---
 .../cli/client/CrowdinClientLabel.java        |  76 +-
 .../commands/actions/FileDeleteAction.java    |  94 +--
 .../commands/actions/FileDownloadAction.java  | 156 ++--
 .../FileDownloadTranslationAction.java        | 204 ++---
 .../commands/actions/FileUploadAction.java    | 476 ++++++------
 .../actions/FileUploadTranslationAction.java  | 194 ++---
 .../commands/functionality/BranchUtils.java   |  78 +-
 .../picocli/FileDeleteSubcommand.java         |  54 +-
 .../picocli/FileDownloadSubcommand.java       |  74 +-
 .../cli/commands/picocli/FileSubcommand.java  |  40 +-
 .../picocli/FileUploadSubcommand.java         | 116 +--
 .../actions/FileDeleteActionTest.java         | 148 ++--
 .../actions/FileDownloadActionTest.java       | 166 ++--
 .../FileDownloadTranslationActionTest.java    | 232 +++---
 .../actions/FileUploadActionTest.java         | 716 +++++++++---------
 .../FileUploadTranslationActionTest.java      | 200 ++---
 .../picocli/FileDeleteSubcommandTest.java     |  40 +-
 .../picocli/FileDownloadSubcommandTest.java   |  54 +-
 .../picocli/FileUploadSubcommandTest.java     |  56 +-
 website/mantemplates/crowdin-file-delete.adoc |  32 +-
 .../mantemplates/crowdin-file-download.adoc   |  38 +-
 website/mantemplates/crowdin-file-upload.adoc |  38 +-
 website/mantemplates/crowdin-file.adoc        |  32 +-
 23 files changed, 1657 insertions(+), 1657 deletions(-)

diff --git a/src/main/java/com/crowdin/cli/client/CrowdinClientLabel.java b/src/main/java/com/crowdin/cli/client/CrowdinClientLabel.java
index 26404f734..19aed5acb 100644
--- a/src/main/java/com/crowdin/cli/client/CrowdinClientLabel.java
+++ b/src/main/java/com/crowdin/cli/client/CrowdinClientLabel.java
@@ -1,38 +1,38 @@
-package com.crowdin.cli.client;
-
-import com.crowdin.client.Client;
-import com.crowdin.client.labels.model.AddLabelRequest;
-import com.crowdin.client.labels.model.Label;
-import lombok.AllArgsConstructor;
-
-import java.util.List;
-
-import static java.lang.Long.parseLong;
-
-@AllArgsConstructor
-public class CrowdinClientLabel extends CrowdinClientCore implements ClientLabel {
-
-    private final Client client;
-    private final String projectId;
-
-    @Override
-    public List<Label> listLabels() {
-        return executeRequestFullList((limit, offset) -> this.client.getLabelsApi()
-            .listLabels(parseLong(this.projectId), limit, offset, null));
-    }
-
-    @Override
-    public Label addLabel(AddLabelRequest request) {
-        return executeRequest(() -> this.client.getLabelsApi()
-            .addLabel(parseLong(this.projectId), request)
-            .getData());
-    }
-
-    @Override
-    public void deleteLabel(Long id) {
-        executeRequest(() -> {
-            this.client.getLabelsApi().deleteLabel(parseLong(this.projectId), id);
-            return null;
-        });
-    }
-}
+package com.crowdin.cli.client;
+
+import com.crowdin.client.Client;
+import com.crowdin.client.labels.model.AddLabelRequest;
+import com.crowdin.client.labels.model.Label;
+import lombok.AllArgsConstructor;
+
+import java.util.List;
+
+import static java.lang.Long.parseLong;
+
+@AllArgsConstructor
+public class CrowdinClientLabel extends CrowdinClientCore implements ClientLabel {
+
+    private final Client client;
+    private final String projectId;
+
+    @Override
+    public List<Label> listLabels() {
+        return executeRequestFullList((limit, offset) -> this.client.getLabelsApi()
+            .listLabels(parseLong(this.projectId), limit, offset, null));
+    }
+
+    @Override
+    public Label addLabel(AddLabelRequest request) {
+        return executeRequest(() -> this.client.getLabelsApi()
+            .addLabel(parseLong(this.projectId), request)
+            .getData());
+    }
+
+    @Override
+    public void deleteLabel(Long id) {
+        executeRequest(() -> {
+            this.client.getLabelsApi().deleteLabel(parseLong(this.projectId), id);
+            return null;
+        });
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileDeleteAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileDeleteAction.java
index 7a8b46c3f..83babd4de 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/FileDeleteAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileDeleteAction.java
@@ -1,47 +1,47 @@
-package com.crowdin.cli.commands.actions;
-
-import com.crowdin.cli.client.CrowdinProjectFull;
-import com.crowdin.cli.client.ProjectClient;
-import com.crowdin.cli.commands.NewAction;
-import com.crowdin.cli.commands.Outputter;
-import com.crowdin.cli.properties.ProjectProperties;
-import com.crowdin.cli.utils.Utils;
-import com.crowdin.cli.utils.console.ConsoleSpinner;
-import com.crowdin.cli.utils.console.ExecutionStatus;
-import com.crowdin.client.projectsgroups.model.Type;
-import com.crowdin.client.sourcefiles.model.FileInfo;
-import lombok.AllArgsConstructor;
-
-import java.util.List;
-import java.util.Objects;
-
-import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
-import static com.crowdin.cli.utils.console.ExecutionStatus.SKIPPED;
-import static java.util.Objects.nonNull;
-
-@AllArgsConstructor
-class FileDeleteAction implements NewAction<ProjectProperties, ProjectClient> {
-
-    private final String file;
-    private final String branch;
-
-    @Override
-    public void act(Outputter out, ProjectProperties properties, ProjectClient client) {
-        CrowdinProjectFull project = ConsoleSpinner
-            .execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
-                true, true, client::downloadFullProject);
-        if (Objects.equals(project.getType(), Type.STRINGS_BASED)) {
-            out.println(SKIPPED.withIcon(RESOURCE_BUNDLE.getString("message.no_file_string_project")));
-            return;
-        }
-        String branchPrefix = nonNull(branch) ? branch + Utils.PATH_SEPARATOR : "";
-        String filePath = Utils.toUnixPath(Utils.sepAtStart(branchPrefix + file));
-        List<FileInfo> projectFiles = project.getFileInfos();
-        FileInfo foundFile = projectFiles.stream()
-            .filter(f -> Objects.equals(filePath, f.getPath()))
-            .findFirst()
-            .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file_not_found"), filePath)));
-        client.deleteSource(foundFile.getId());
-        out.println(ExecutionStatus.OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.file_deleted"), filePath)));
-    }
-}
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.cli.utils.console.ConsoleSpinner;
+import com.crowdin.cli.utils.console.ExecutionStatus;
+import com.crowdin.client.projectsgroups.model.Type;
+import com.crowdin.client.sourcefiles.model.FileInfo;
+import lombok.AllArgsConstructor;
+
+import java.util.List;
+import java.util.Objects;
+
+import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
+import static com.crowdin.cli.utils.console.ExecutionStatus.SKIPPED;
+import static java.util.Objects.nonNull;
+
+@AllArgsConstructor
+class FileDeleteAction implements NewAction<ProjectProperties, ProjectClient> {
+
+    private final String file;
+    private final String branch;
+
+    @Override
+    public void act(Outputter out, ProjectProperties properties, ProjectClient client) {
+        CrowdinProjectFull project = ConsoleSpinner
+            .execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
+                true, true, client::downloadFullProject);
+        if (Objects.equals(project.getType(), Type.STRINGS_BASED)) {
+            out.println(SKIPPED.withIcon(RESOURCE_BUNDLE.getString("message.no_file_string_project")));
+            return;
+        }
+        String branchPrefix = nonNull(branch) ? branch + Utils.PATH_SEPARATOR : "";
+        String filePath = Utils.toUnixPath(Utils.sepAtStart(branchPrefix + file));
+        List<FileInfo> projectFiles = project.getFileInfos();
+        FileInfo foundFile = projectFiles.stream()
+            .filter(f -> Objects.equals(filePath, f.getPath()))
+            .findFirst()
+            .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file_not_found"), filePath)));
+        client.deleteSource(foundFile.getId());
+        out.println(ExecutionStatus.OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.file_deleted"), filePath)));
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java
index db2c370b4..86b2a6c18 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadAction.java
@@ -1,78 +1,78 @@
-package com.crowdin.cli.commands.actions;
-
-import com.crowdin.cli.client.CrowdinProjectFull;
-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.FsFiles;
-import com.crowdin.cli.properties.ProjectProperties;
-import com.crowdin.cli.utils.Utils;
-import com.crowdin.cli.utils.console.ConsoleSpinner;
-import com.crowdin.client.projectsgroups.model.Type;
-import com.crowdin.client.sourcefiles.model.FileInfo;
-import lombok.AllArgsConstructor;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Objects;
-
-import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
-import static com.crowdin.cli.utils.console.ExecutionStatus.OK;
-import static com.crowdin.cli.utils.console.ExecutionStatus.WARNING;
-import static java.util.Objects.nonNull;
-
-@AllArgsConstructor
-class FileDownloadAction implements NewAction<ProjectProperties, ProjectClient> {
-
-    private final String file;
-    private final String branch;
-    private final String dest;
-
-    @Override
-    public void act(Outputter out, ProjectProperties properties, ProjectClient client) {
-        CrowdinProjectFull project = ConsoleSpinner
-            .execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
-                false, false, () -> client.downloadFullProject(branch));
-        if (Objects.equals(project.getType(), Type.STRINGS_BASED)) {
-            out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.no_file_string_project")));
-            return;
-        }
-        if (!project.isManagerAccess()) {
-            out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.no_manager_access")));
-            return;
-        }
-
-        String branchPrefix = nonNull(branch) ? branch + Utils.PATH_SEPARATOR : "";
-        String filePath = Utils.toUnixPath(Utils.sepAtStart(branchPrefix + file));
-        FileInfo foundFile = project.getFileInfos().stream()
-            .filter(f -> Objects.equals(filePath, f.getPath()))
-            .findFirst()
-            .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file_not_found"), filePath)));
-        ConsoleSpinner.execute(
-            out,
-            "message.spinner.downloading_file",
-            "error.downloading_file",
-            false,
-            false,
-            () -> {
-                URL url = client.downloadFile(foundFile.getId());
-                String destPath = nonNull(dest) ? Utils.sepAtEnd(dest) + foundFile.getName() : file;
-                saveToFile(Utils.normalizePath(Utils.joinPaths(properties.getBasePath(), destPath)), url);
-                return url;
-            }
-        );
-        out.println(OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.downloaded_file"), filePath)));
-        out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.experimental_command")));
-    }
-
-    private void saveToFile(String destPath, URL url) {
-        FilesInterface files = new FsFiles();
-        try (InputStream data = url.openStream()) {
-            files.writeToFile(destPath, data);
-        } catch (IOException e) {
-            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.write_file"), destPath), e);
-        }
-    }
-}
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.client.CrowdinProjectFull;
+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.FsFiles;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.cli.utils.console.ConsoleSpinner;
+import com.crowdin.client.projectsgroups.model.Type;
+import com.crowdin.client.sourcefiles.model.FileInfo;
+import lombok.AllArgsConstructor;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Objects;
+
+import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
+import static com.crowdin.cli.utils.console.ExecutionStatus.OK;
+import static com.crowdin.cli.utils.console.ExecutionStatus.WARNING;
+import static java.util.Objects.nonNull;
+
+@AllArgsConstructor
+class FileDownloadAction implements NewAction<ProjectProperties, ProjectClient> {
+
+    private final String file;
+    private final String branch;
+    private final String dest;
+
+    @Override
+    public void act(Outputter out, ProjectProperties properties, ProjectClient client) {
+        CrowdinProjectFull project = ConsoleSpinner
+            .execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
+                false, false, () -> client.downloadFullProject(branch));
+        if (Objects.equals(project.getType(), Type.STRINGS_BASED)) {
+            out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.no_file_string_project")));
+            return;
+        }
+        if (!project.isManagerAccess()) {
+            out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.no_manager_access")));
+            return;
+        }
+
+        String branchPrefix = nonNull(branch) ? branch + Utils.PATH_SEPARATOR : "";
+        String filePath = Utils.toUnixPath(Utils.sepAtStart(branchPrefix + file));
+        FileInfo foundFile = project.getFileInfos().stream()
+            .filter(f -> Objects.equals(filePath, f.getPath()))
+            .findFirst()
+            .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file_not_found"), filePath)));
+        ConsoleSpinner.execute(
+            out,
+            "message.spinner.downloading_file",
+            "error.downloading_file",
+            false,
+            false,
+            () -> {
+                URL url = client.downloadFile(foundFile.getId());
+                String destPath = nonNull(dest) ? Utils.sepAtEnd(dest) + foundFile.getName() : file;
+                saveToFile(Utils.normalizePath(Utils.joinPaths(properties.getBasePath(), destPath)), url);
+                return url;
+            }
+        );
+        out.println(OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.downloaded_file"), filePath)));
+        out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.experimental_command")));
+    }
+
+    private void saveToFile(String destPath, URL url) {
+        FilesInterface files = new FsFiles();
+        try (InputStream data = url.openStream()) {
+            files.writeToFile(destPath, data);
+        } catch (IOException e) {
+            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.write_file"), destPath), e);
+        }
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadTranslationAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadTranslationAction.java
index f900f39b9..dc2e3ff5a 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/FileDownloadTranslationAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileDownloadTranslationAction.java
@@ -1,102 +1,102 @@
-package com.crowdin.cli.commands.actions;
-
-import com.crowdin.cli.client.CrowdinProjectFull;
-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.FsFiles;
-import com.crowdin.cli.properties.ProjectProperties;
-import com.crowdin.cli.utils.PlaceholderUtil;
-import com.crowdin.cli.utils.Utils;
-import com.crowdin.cli.utils.console.ConsoleSpinner;
-import com.crowdin.client.languages.model.Language;
-import com.crowdin.client.projectsgroups.model.Type;
-import com.crowdin.client.sourcefiles.model.FileInfo;
-import com.crowdin.client.translations.model.BuildProjectFileTranslationRequest;
-import lombok.AllArgsConstructor;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Objects;
-
-import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
-import static com.crowdin.cli.utils.console.ExecutionStatus.OK;
-import static com.crowdin.cli.utils.console.ExecutionStatus.WARNING;
-import static java.util.Objects.nonNull;
-
-@AllArgsConstructor
-public class FileDownloadTranslationAction implements NewAction<ProjectProperties, ProjectClient> {
-
-    private final String file;
-    private final String languageId;
-    private final String branch;
-    private final String dest;
-
-    @Override
-    public void act(Outputter out, ProjectProperties properties, ProjectClient client) {
-        CrowdinProjectFull project = ConsoleSpinner
-            .execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
-                false, false, client::downloadFullProject);
-        if (Objects.equals(project.getType(), Type.STRINGS_BASED)) {
-            out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.no_file_string_project")));
-            return;
-        }
-        if (!project.isManagerAccess()) {
-            out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.no_manager_access")));
-            return;
-        }
-
-        Language language = project.findLanguageById(languageId, true)
-            .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.language_not_exist"), languageId)));
-
-        String branchPrefix = nonNull(branch) ? branch + Utils.PATH_SEPARATOR : "";
-        String sourcePath = Utils.toUnixPath(Utils.sepAtStart(branchPrefix + file));
-        FileInfo sourceFileInfo = project.getFileInfos().stream()
-            .filter(fi -> Objects.equals(sourcePath, fi.getPath()))
-            .findFirst()
-            .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file_not_found"), sourcePath)));
-        PlaceholderUtil placeholderUtil = new PlaceholderUtil(
-            project.getSupportedLanguages(),
-            project.getProjectLanguages(true),
-            properties.getBasePath()
-        );
-        BuildProjectFileTranslationRequest request = new BuildProjectFileTranslationRequest();
-        request.setTargetLanguageId(language.getId());
-
-        URL url = ConsoleSpinner.execute(
-            out,
-            "message.spinner.building_translation",
-            "error.building_translation",
-            false,
-            false,
-            () -> client.buildProjectFileTranslation(sourceFileInfo.getId(), request)
-        );
-        String destPath = nonNull(dest)
-            ? placeholderUtil.replaceLanguageDependentPlaceholders(dest + Utils.PATH_SEPARATOR + sourceFileInfo.getName(), language)
-            : languageId + sourcePath;
-        saveToFile(Utils.normalizePath(Utils.joinPaths(properties.getBasePath(), destPath)), url, out);
-        out.println(OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.downloaded_file"), destPath)));
-        out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.experimental_command")));
-    }
-
-    private void saveToFile(String destPath, URL url, Outputter out) {
-        ConsoleSpinner.execute(
-            out,
-            "message.spinner.downloading_translation",
-            "error.write_file",
-            false,
-            false,
-            () -> {
-                FilesInterface files = new FsFiles();
-                try (InputStream data = url.openStream()) {
-                    files.writeToFile(destPath, data);
-                } catch (IOException e) {
-                    throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.write_file"), destPath), e);
-                }
-                return url;
-            }
-        );
-    }
-}
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.client.CrowdinProjectFull;
+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.FsFiles;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.utils.PlaceholderUtil;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.cli.utils.console.ConsoleSpinner;
+import com.crowdin.client.languages.model.Language;
+import com.crowdin.client.projectsgroups.model.Type;
+import com.crowdin.client.sourcefiles.model.FileInfo;
+import com.crowdin.client.translations.model.BuildProjectFileTranslationRequest;
+import lombok.AllArgsConstructor;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import java.util.Objects;
+
+import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
+import static com.crowdin.cli.utils.console.ExecutionStatus.OK;
+import static com.crowdin.cli.utils.console.ExecutionStatus.WARNING;
+import static java.util.Objects.nonNull;
+
+@AllArgsConstructor
+public class FileDownloadTranslationAction implements NewAction<ProjectProperties, ProjectClient> {
+
+    private final String file;
+    private final String languageId;
+    private final String branch;
+    private final String dest;
+
+    @Override
+    public void act(Outputter out, ProjectProperties properties, ProjectClient client) {
+        CrowdinProjectFull project = ConsoleSpinner
+            .execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
+                false, false, client::downloadFullProject);
+        if (Objects.equals(project.getType(), Type.STRINGS_BASED)) {
+            out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.no_file_string_project")));
+            return;
+        }
+        if (!project.isManagerAccess()) {
+            out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.no_manager_access")));
+            return;
+        }
+
+        Language language = project.findLanguageById(languageId, true)
+            .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.language_not_exist"), languageId)));
+
+        String branchPrefix = nonNull(branch) ? branch + Utils.PATH_SEPARATOR : "";
+        String sourcePath = Utils.toUnixPath(Utils.sepAtStart(branchPrefix + file));
+        FileInfo sourceFileInfo = project.getFileInfos().stream()
+            .filter(fi -> Objects.equals(sourcePath, fi.getPath()))
+            .findFirst()
+            .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file_not_found"), sourcePath)));
+        PlaceholderUtil placeholderUtil = new PlaceholderUtil(
+            project.getSupportedLanguages(),
+            project.getProjectLanguages(true),
+            properties.getBasePath()
+        );
+        BuildProjectFileTranslationRequest request = new BuildProjectFileTranslationRequest();
+        request.setTargetLanguageId(language.getId());
+
+        URL url = ConsoleSpinner.execute(
+            out,
+            "message.spinner.building_translation",
+            "error.building_translation",
+            false,
+            false,
+            () -> client.buildProjectFileTranslation(sourceFileInfo.getId(), request)
+        );
+        String destPath = nonNull(dest)
+            ? placeholderUtil.replaceLanguageDependentPlaceholders(dest + Utils.PATH_SEPARATOR + sourceFileInfo.getName(), language)
+            : languageId + sourcePath;
+        saveToFile(Utils.normalizePath(Utils.joinPaths(properties.getBasePath(), destPath)), url, out);
+        out.println(OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.downloaded_file"), destPath)));
+        out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.experimental_command")));
+    }
+
+    private void saveToFile(String destPath, URL url, Outputter out) {
+        ConsoleSpinner.execute(
+            out,
+            "message.spinner.downloading_translation",
+            "error.write_file",
+            false,
+            false,
+            () -> {
+                FilesInterface files = new FsFiles();
+                try (InputStream data = url.openStream()) {
+                    files.writeToFile(destPath, data);
+                } catch (IOException e) {
+                    throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.write_file"), destPath), e);
+                }
+                return url;
+            }
+        );
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java
index 336adc299..fb9a2f9c3 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileUploadAction.java
@@ -1,238 +1,238 @@
-package com.crowdin.cli.commands.actions;
-
-import com.crowdin.cli.client.*;
-import com.crowdin.cli.commands.NewAction;
-import com.crowdin.cli.commands.Outputter;
-import com.crowdin.cli.commands.functionality.*;
-import com.crowdin.cli.properties.ProjectProperties;
-import com.crowdin.cli.utils.PlaceholderUtil;
-import com.crowdin.cli.utils.Utils;
-import com.crowdin.cli.utils.console.ConsoleSpinner;
-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.languages.model.Language;
-import com.crowdin.client.projectsgroups.model.Type;
-import com.crowdin.client.sourcefiles.model.*;
-import com.crowdin.client.sourcestrings.model.UploadStringsProgress;
-import com.crowdin.client.sourcestrings.model.UploadStringsRequest;
-import lombok.AllArgsConstructor;
-import org.apache.commons.lang3.StringUtils;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
-import static com.crowdin.cli.utils.console.ExecutionStatus.*;
-import static java.util.Objects.nonNull;
-
-@AllArgsConstructor
-class FileUploadAction implements NewAction<ProjectProperties, ProjectClient> {
-
-    private final File file;
-    private final String branchName;
-    private final boolean autoUpdate;
-    private final List<String> labels;
-    private final String dest;
-    private final boolean cleanupMode;
-    private final boolean updateStrings;
-    private final List<String> excludedLanguages;
-    private final boolean plainView;
-
-    @Override
-    public void act(Outputter out, ProjectProperties properties, ProjectClient client) {
-        CrowdinProjectFull project = ConsoleSpinner.execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
-            this.plainView, this.plainView, client::downloadFullProject);
-        PlaceholderUtil placeholderUtil = new PlaceholderUtil(project.getSupportedLanguages(), project.getProjectLanguages(false), properties.getBasePath());
-
-        Optional<List<Long>> attachLabelIds = Optional.empty();
-        if (nonNull(labels) && !labels.isEmpty()) {
-            attachLabelIds = Optional.of(labels.stream().map(l -> getOrCreateLabel(l, client)).collect(Collectors.toList()));
-        }
-
-        String fileFullPath = file.getPath();
-        String fileDestName = file.getName();
-        if (Objects.equals(Type.FILES_BASED, project.getType())) {
-            String commonPath = SourcesUtils.getCommonPath(Collections.singletonList(this.file.getAbsolutePath()), properties.getBasePath());
-            final String filePath = (nonNull(dest))
-                ? PropertiesBeanUtils.prepareDest(dest, StringUtils.removeStart(file.getAbsolutePath(), properties.getBasePath()), placeholderUtil)
-                : StringUtils.removeStart(file.getAbsolutePath(), properties.getBasePath() + commonPath);
-            fileFullPath = (nonNull(branchName) ? branchName + Utils.PATH_SEPARATOR : "") + filePath;
-            fileDestName = fileFullPath.substring(fileFullPath.lastIndexOf(Utils.PATH_SEPARATOR) + 1);
-            Map<String, FileInfo> paths = ProjectFilesUtils.buildFilePaths(project.getDirectories(), project.getBranches(), project.getFileInfos());
-            FileInfo projectFile = paths.get(fileFullPath);
-
-            if (nonNull(projectFile)) {
-                if (!autoUpdate) {
-                    out.println(SKIPPED.withIcon(String.format(RESOURCE_BUNDLE.getString("error.file_already_exists"), fileFullPath)));
-                    return;
-                }
-                final UpdateFileRequest request = new UpdateFileRequest();
-                final Long sourceId = projectFile.getId();
-                attachLabelIds.ifPresent(request::setAttachLabelIds);
-
-                Long storageId = getStorageId(client, fileDestName);
-                request.setStorageId(storageId);
-
-                try {
-                    client.updateSource(sourceId, request);
-                    if (nonNull(excludedLanguages) && !excludedLanguages.isEmpty()) {
-                        List<String> projectFileExcludedTargetLanguages = ((com.crowdin.client.sourcefiles.model.File) projectFile).getExcludedTargetLanguages();
-                        if (!Objects.equals(excludedLanguages, projectFileExcludedTargetLanguages)) {
-                            List<PatchRequest> editRequest = RequestBuilder.updateExcludedTargetLanguages(excludedLanguages);
-                            client.editSource(sourceId, editRequest);
-                        }
-                    }
-                    if (!plainView) {
-                        out.println(
-                            OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.uploading_file"), fileFullPath)));
-                    } 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) {
-                    throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.uploading_file"), fileFullPath), e);
-                }
-                return;
-            }
-        }
-
-        Optional<Branch> branch = Optional.empty();
-        if (StringUtils.isNotEmpty(branchName)) {
-            branch = Optional.ofNullable(BranchUtils.getOrCreateBranch(out, branchName, client, project, plainView));
-        } else if (Objects.equals(Type.STRINGS_BASED, project.getType())) {
-            throw new RuntimeException(RESOURCE_BUNDLE.getString("error.branch_required_string_project"));
-        }
-
-        Long storageId = getStorageId(client, fileDestName);
-
-        Optional<List<String>> excludedLanguageNames = Optional.empty();
-        if (nonNull(excludedLanguages) && !excludedLanguages.isEmpty()) {
-            excludedLanguageNames = Optional.of(filterExcludedLanguages(excludedLanguages, project));
-        }
-
-        if (Objects.equals(Type.FILES_BASED, project.getType())) {
-            AddFileRequest request = new AddFileRequest();
-            request.setName(fileDestName);
-            request.setStorageId(storageId);
-
-            Optional<Long> directoryId = getOrCreateDirectoryId(out, client, project, properties, branch.orElse(null));
-            directoryId.ifPresent(request::setDirectoryId);
-
-            attachLabelIds.ifPresent(request::setAttachLabelIds);
-            branch.ifPresent(b -> request.setBranchId(b.getId()));
-            excludedLanguageNames.ifPresent(request::setExcludedTargetLanguages);
-            try {
-                client.addSource(request);
-            } catch (ExistsResponseException e) {
-                throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file_already_exists"), fileFullPath));
-            } catch (Exception e) {
-                throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.uploading_file"), fileFullPath), e);
-            }
-
-        }
-        if (Objects.equals(Type.STRINGS_BASED, project.getType())) {
-            UploadStringsRequest request = new UploadStringsRequest();
-            request.setBranchId(branch.orElseThrow(() -> new RuntimeException(RESOURCE_BUNDLE.getString("error.branch_required_string_project"))).getId());
-            request.setCleanupMode(cleanupMode);
-            attachLabelIds.ifPresent(request::setLabelIds);
-            request.setUpdateStrings(updateStrings);
-            request.setStorageId(storageId);
-            ConsoleSpinner.execute(
-                out,
-                "message.spinner.uploading_strings",
-                "message.spinner.upload_strings_failed",
-                this.plainView,
-                this.plainView,
-                () -> {
-                    UploadStringsProgress uploadStrings = client.addSourceStringsBased(request);
-                    String uploadId = uploadStrings.getIdentifier();
-
-                    while (!"finished".equalsIgnoreCase(uploadStrings.getStatus())) {
-                        ConsoleSpinner.update(
-                            String.format(RESOURCE_BUNDLE.getString("message.spinner.uploading_strings_percents"),
-                                uploadStrings.getProgress()));
-                        Thread.sleep(1000);
-
-                        uploadStrings = client.getUploadStringsStatus(uploadId);
-
-                        if ("failed".equalsIgnoreCase(uploadStrings.getStatus())) {
-                            throw new RuntimeException(RESOURCE_BUNDLE.getString("message.spinner.upload_strings_failed"));
-                        }
-                    }
-                    ConsoleSpinner.update(String.format(RESOURCE_BUNDLE.getString("message.spinner.uploading_strings_percents"), 100));
-                    return uploadStrings;
-                });
-        }
-        if (!plainView) {
-            out.println(OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.uploading_file"), fileFullPath)));
-        } else {
-            out.println(fileFullPath);
-        }
-        out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.experimental_command")));
-    }
-
-    private List<String> filterExcludedLanguages(List<String> excludedLanguages, CrowdinProjectFull project) {
-        List<String> projectLanguageNames = project.getProjectLanguages(false)
-            .stream()
-            .map(Language::getId)
-            .collect(Collectors.toList());
-
-        return excludedLanguages
-            .stream()
-            .filter(projectLanguageNames::contains)
-            .collect(Collectors.toList());
-    }
-
-    private Long getOrCreateLabel(String labelName, ProjectClient client) {
-        Map<String, Long> labelList = client.listLabels().stream()
-            .collect(Collectors.toMap(Label::getTitle, Label::getId));
-        if (labelList.containsKey(labelName)) return labelList.get(labelName);
-        else {
-            AddLabelRequest request = new AddLabelRequest();
-            request.setTitle(labelName);
-            Label createdLabel = client.addLabel(request);
-            return createdLabel.getId();
-        }
-    }
-
-    private Optional<Long> getOrCreateDirectoryId(Outputter out, ProjectClient client, CrowdinProjectFull project, ProjectProperties properties, Branch branch) {
-        Optional<Long> directoryId;
-        Map<String, Long> directoryPaths = ProjectFilesUtils.buildDirectoryPaths(project.getDirectories(), project.getBranches())
-            .entrySet().stream().collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey));
-        String commonPath = SourcesUtils.getCommonPath(Collections.singletonList(this.file.getAbsolutePath()), properties.getBasePath());
-        PlaceholderUtil placeholderUtil = new PlaceholderUtil(project.getSupportedLanguages(), project.getProjectLanguages(false), properties.getBasePath());
-        String filePath = (nonNull(dest))
-            ? PropertiesBeanUtils.prepareDest(dest, StringUtils.removeStart(this.file.getAbsolutePath(), properties.getBasePath()), placeholderUtil)
-            : StringUtils.removeStart(this.file.getAbsolutePath(), properties.getBasePath() + commonPath);
-        try {
-            directoryId = Optional.ofNullable(ProjectUtils.createPath(out, client, directoryPaths, filePath, branch, this.plainView));
-        } catch (Exception e) {
-            throw new RuntimeException(RESOURCE_BUNDLE.getString("error.creating_directories"), e);
-        }
-        return directoryId;
-    }
-
-    private Long getStorageId(ProjectClient client, String fileName) {
-        try (InputStream fileStream = Files.newInputStream(file.toPath())) {
-            return client.uploadStorage(fileName, fileStream);
-        } catch (FileNotFoundException e) {
-            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.local_file_not_found"), file.getAbsolutePath()));
-        } catch (EmptyFileException e){
-            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("message.uploading_file_skipped"), file.getAbsolutePath()));
-        } catch (Exception e) {
-            throw new RuntimeException(
-                String.format(RESOURCE_BUNDLE.getString("error.upload_to_storage"), file.getAbsolutePath()), e);
-        }
-    }
-}
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.client.*;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.commands.functionality.*;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.utils.PlaceholderUtil;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.cli.utils.console.ConsoleSpinner;
+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.languages.model.Language;
+import com.crowdin.client.projectsgroups.model.Type;
+import com.crowdin.client.sourcefiles.model.*;
+import com.crowdin.client.sourcestrings.model.UploadStringsProgress;
+import com.crowdin.client.sourcestrings.model.UploadStringsRequest;
+import lombok.AllArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.util.*;
+import java.util.stream.Collectors;
+
+import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
+import static com.crowdin.cli.utils.console.ExecutionStatus.*;
+import static java.util.Objects.nonNull;
+
+@AllArgsConstructor
+class FileUploadAction implements NewAction<ProjectProperties, ProjectClient> {
+
+    private final File file;
+    private final String branchName;
+    private final boolean autoUpdate;
+    private final List<String> labels;
+    private final String dest;
+    private final boolean cleanupMode;
+    private final boolean updateStrings;
+    private final List<String> excludedLanguages;
+    private final boolean plainView;
+
+    @Override
+    public void act(Outputter out, ProjectProperties properties, ProjectClient client) {
+        CrowdinProjectFull project = ConsoleSpinner.execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
+            this.plainView, this.plainView, client::downloadFullProject);
+        PlaceholderUtil placeholderUtil = new PlaceholderUtil(project.getSupportedLanguages(), project.getProjectLanguages(false), properties.getBasePath());
+
+        Optional<List<Long>> attachLabelIds = Optional.empty();
+        if (nonNull(labels) && !labels.isEmpty()) {
+            attachLabelIds = Optional.of(labels.stream().map(l -> getOrCreateLabel(l, client)).collect(Collectors.toList()));
+        }
+
+        String fileFullPath = file.getPath();
+        String fileDestName = file.getName();
+        if (Objects.equals(Type.FILES_BASED, project.getType())) {
+            String commonPath = SourcesUtils.getCommonPath(Collections.singletonList(this.file.getAbsolutePath()), properties.getBasePath());
+            final String filePath = (nonNull(dest))
+                ? PropertiesBeanUtils.prepareDest(dest, StringUtils.removeStart(file.getAbsolutePath(), properties.getBasePath()), placeholderUtil)
+                : StringUtils.removeStart(file.getAbsolutePath(), properties.getBasePath() + commonPath);
+            fileFullPath = (nonNull(branchName) ? branchName + Utils.PATH_SEPARATOR : "") + filePath;
+            fileDestName = fileFullPath.substring(fileFullPath.lastIndexOf(Utils.PATH_SEPARATOR) + 1);
+            Map<String, FileInfo> paths = ProjectFilesUtils.buildFilePaths(project.getDirectories(), project.getBranches(), project.getFileInfos());
+            FileInfo projectFile = paths.get(fileFullPath);
+
+            if (nonNull(projectFile)) {
+                if (!autoUpdate) {
+                    out.println(SKIPPED.withIcon(String.format(RESOURCE_BUNDLE.getString("error.file_already_exists"), fileFullPath)));
+                    return;
+                }
+                final UpdateFileRequest request = new UpdateFileRequest();
+                final Long sourceId = projectFile.getId();
+                attachLabelIds.ifPresent(request::setAttachLabelIds);
+
+                Long storageId = getStorageId(client, fileDestName);
+                request.setStorageId(storageId);
+
+                try {
+                    client.updateSource(sourceId, request);
+                    if (nonNull(excludedLanguages) && !excludedLanguages.isEmpty()) {
+                        List<String> projectFileExcludedTargetLanguages = ((com.crowdin.client.sourcefiles.model.File) projectFile).getExcludedTargetLanguages();
+                        if (!Objects.equals(excludedLanguages, projectFileExcludedTargetLanguages)) {
+                            List<PatchRequest> editRequest = RequestBuilder.updateExcludedTargetLanguages(excludedLanguages);
+                            client.editSource(sourceId, editRequest);
+                        }
+                    }
+                    if (!plainView) {
+                        out.println(
+                            OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.uploading_file"), fileFullPath)));
+                    } 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) {
+                    throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.uploading_file"), fileFullPath), e);
+                }
+                return;
+            }
+        }
+
+        Optional<Branch> branch = Optional.empty();
+        if (StringUtils.isNotEmpty(branchName)) {
+            branch = Optional.ofNullable(BranchUtils.getOrCreateBranch(out, branchName, client, project, plainView));
+        } else if (Objects.equals(Type.STRINGS_BASED, project.getType())) {
+            throw new RuntimeException(RESOURCE_BUNDLE.getString("error.branch_required_string_project"));
+        }
+
+        Long storageId = getStorageId(client, fileDestName);
+
+        Optional<List<String>> excludedLanguageNames = Optional.empty();
+        if (nonNull(excludedLanguages) && !excludedLanguages.isEmpty()) {
+            excludedLanguageNames = Optional.of(filterExcludedLanguages(excludedLanguages, project));
+        }
+
+        if (Objects.equals(Type.FILES_BASED, project.getType())) {
+            AddFileRequest request = new AddFileRequest();
+            request.setName(fileDestName);
+            request.setStorageId(storageId);
+
+            Optional<Long> directoryId = getOrCreateDirectoryId(out, client, project, properties, branch.orElse(null));
+            directoryId.ifPresent(request::setDirectoryId);
+
+            attachLabelIds.ifPresent(request::setAttachLabelIds);
+            branch.ifPresent(b -> request.setBranchId(b.getId()));
+            excludedLanguageNames.ifPresent(request::setExcludedTargetLanguages);
+            try {
+                client.addSource(request);
+            } catch (ExistsResponseException e) {
+                throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file_already_exists"), fileFullPath));
+            } catch (Exception e) {
+                throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.uploading_file"), fileFullPath), e);
+            }
+
+        }
+        if (Objects.equals(Type.STRINGS_BASED, project.getType())) {
+            UploadStringsRequest request = new UploadStringsRequest();
+            request.setBranchId(branch.orElseThrow(() -> new RuntimeException(RESOURCE_BUNDLE.getString("error.branch_required_string_project"))).getId());
+            request.setCleanupMode(cleanupMode);
+            attachLabelIds.ifPresent(request::setLabelIds);
+            request.setUpdateStrings(updateStrings);
+            request.setStorageId(storageId);
+            ConsoleSpinner.execute(
+                out,
+                "message.spinner.uploading_strings",
+                "message.spinner.upload_strings_failed",
+                this.plainView,
+                this.plainView,
+                () -> {
+                    UploadStringsProgress uploadStrings = client.addSourceStringsBased(request);
+                    String uploadId = uploadStrings.getIdentifier();
+
+                    while (!"finished".equalsIgnoreCase(uploadStrings.getStatus())) {
+                        ConsoleSpinner.update(
+                            String.format(RESOURCE_BUNDLE.getString("message.spinner.uploading_strings_percents"),
+                                uploadStrings.getProgress()));
+                        Thread.sleep(1000);
+
+                        uploadStrings = client.getUploadStringsStatus(uploadId);
+
+                        if ("failed".equalsIgnoreCase(uploadStrings.getStatus())) {
+                            throw new RuntimeException(RESOURCE_BUNDLE.getString("message.spinner.upload_strings_failed"));
+                        }
+                    }
+                    ConsoleSpinner.update(String.format(RESOURCE_BUNDLE.getString("message.spinner.uploading_strings_percents"), 100));
+                    return uploadStrings;
+                });
+        }
+        if (!plainView) {
+            out.println(OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.uploading_file"), fileFullPath)));
+        } else {
+            out.println(fileFullPath);
+        }
+        out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.experimental_command")));
+    }
+
+    private List<String> filterExcludedLanguages(List<String> excludedLanguages, CrowdinProjectFull project) {
+        List<String> projectLanguageNames = project.getProjectLanguages(false)
+            .stream()
+            .map(Language::getId)
+            .collect(Collectors.toList());
+
+        return excludedLanguages
+            .stream()
+            .filter(projectLanguageNames::contains)
+            .collect(Collectors.toList());
+    }
+
+    private Long getOrCreateLabel(String labelName, ProjectClient client) {
+        Map<String, Long> labelList = client.listLabels().stream()
+            .collect(Collectors.toMap(Label::getTitle, Label::getId));
+        if (labelList.containsKey(labelName)) return labelList.get(labelName);
+        else {
+            AddLabelRequest request = new AddLabelRequest();
+            request.setTitle(labelName);
+            Label createdLabel = client.addLabel(request);
+            return createdLabel.getId();
+        }
+    }
+
+    private Optional<Long> getOrCreateDirectoryId(Outputter out, ProjectClient client, CrowdinProjectFull project, ProjectProperties properties, Branch branch) {
+        Optional<Long> directoryId;
+        Map<String, Long> directoryPaths = ProjectFilesUtils.buildDirectoryPaths(project.getDirectories(), project.getBranches())
+            .entrySet().stream().collect(Collectors.toMap(Map.Entry::getValue, Map.Entry::getKey));
+        String commonPath = SourcesUtils.getCommonPath(Collections.singletonList(this.file.getAbsolutePath()), properties.getBasePath());
+        PlaceholderUtil placeholderUtil = new PlaceholderUtil(project.getSupportedLanguages(), project.getProjectLanguages(false), properties.getBasePath());
+        String filePath = (nonNull(dest))
+            ? PropertiesBeanUtils.prepareDest(dest, StringUtils.removeStart(this.file.getAbsolutePath(), properties.getBasePath()), placeholderUtil)
+            : StringUtils.removeStart(this.file.getAbsolutePath(), properties.getBasePath() + commonPath);
+        try {
+            directoryId = Optional.ofNullable(ProjectUtils.createPath(out, client, directoryPaths, filePath, branch, this.plainView));
+        } catch (Exception e) {
+            throw new RuntimeException(RESOURCE_BUNDLE.getString("error.creating_directories"), e);
+        }
+        return directoryId;
+    }
+
+    private Long getStorageId(ProjectClient client, String fileName) {
+        try (InputStream fileStream = Files.newInputStream(file.toPath())) {
+            return client.uploadStorage(fileName, fileStream);
+        } catch (FileNotFoundException e) {
+            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.local_file_not_found"), file.getAbsolutePath()));
+        } catch (EmptyFileException e){
+            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("message.uploading_file_skipped"), file.getAbsolutePath()));
+        } catch (Exception e) {
+            throw new RuntimeException(
+                String.format(RESOURCE_BUNDLE.getString("error.upload_to_storage"), file.getAbsolutePath()), e);
+        }
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/actions/FileUploadTranslationAction.java b/src/main/java/com/crowdin/cli/commands/actions/FileUploadTranslationAction.java
index 068ec11b5..5dd5b7e43 100644
--- a/src/main/java/com/crowdin/cli/commands/actions/FileUploadTranslationAction.java
+++ b/src/main/java/com/crowdin/cli/commands/actions/FileUploadTranslationAction.java
@@ -1,97 +1,97 @@
-package com.crowdin.cli.commands.actions;
-
-import com.crowdin.cli.client.CrowdinProjectFull;
-import com.crowdin.cli.client.EmptyFileException;
-import com.crowdin.cli.client.ProjectClient;
-import com.crowdin.cli.commands.NewAction;
-import com.crowdin.cli.commands.Outputter;
-import com.crowdin.cli.commands.functionality.BranchUtils;
-import com.crowdin.cli.properties.ProjectProperties;
-import com.crowdin.cli.utils.Utils;
-import com.crowdin.cli.utils.console.ConsoleSpinner;
-import com.crowdin.client.projectsgroups.model.Type;
-import com.crowdin.client.sourcefiles.model.Branch;
-import com.crowdin.client.sourcefiles.model.FileInfo;
-import com.crowdin.client.translations.model.UploadTranslationsRequest;
-import com.crowdin.client.translations.model.UploadTranslationsStringsRequest;
-import lombok.AllArgsConstructor;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.util.Objects;
-
-import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
-import static com.crowdin.cli.utils.console.ExecutionStatus.OK;
-import static com.crowdin.cli.utils.console.ExecutionStatus.WARNING;
-
-@AllArgsConstructor
-public class FileUploadTranslationAction implements NewAction<ProjectProperties, ProjectClient> {
-
-    private final File file;
-    private final String branchName;
-    private final String dest;
-    private final String languageId;
-    private final boolean plainView;
-
-    @Override
-    public void act(Outputter out, ProjectProperties properties, ProjectClient client) {
-        CrowdinProjectFull project = ConsoleSpinner.execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
-            this.plainView, this.plainView, () -> client.downloadFullProject(branchName));
-
-        if (!project.findLanguageById(languageId, true).isPresent()) {
-            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.language_not_exist"), languageId));
-        }
-
-        if (Objects.equals(Type.FILES_BASED, project.getType())) {
-            if (Objects.isNull(dest))
-                throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file.dest_required"), languageId));
-            String sourcePath = Utils.toUnixPath(Utils.sepAtStart(dest));
-            FileInfo sourceFileInfo = project.getFileInfos().stream()
-                .filter(fi -> Objects.equals(sourcePath, fi.getPath()))
-                .findFirst()
-                .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file_not_found"), sourcePath)));
-
-            UploadTranslationsRequest request = new UploadTranslationsRequest();
-            Long storageId = getStorageId(client);
-            request.setFileId(sourceFileInfo.getId());
-            request.setStorageId(storageId);
-            try {
-                client.uploadTranslations(languageId, request);
-            } catch (Exception e) {
-                throw new RuntimeException(String.format(
-                    RESOURCE_BUNDLE.getString("error.upload_translation"), file.getPath()), e);
-            }
-        } else if (Objects.equals(Type.STRINGS_BASED, project.getType())) {
-            UploadTranslationsStringsRequest request = new UploadTranslationsStringsRequest();
-            Branch branch = project.findBranchByName(branchName)
-                .orElseThrow(() -> new RuntimeException(RESOURCE_BUNDLE.getString("error.branch_required_string_project")));
-            Long storageId = getStorageId(client);
-            request.setBranchId(branch.getId());
-            request.setStorageId(storageId);
-            client.uploadTranslationStringsBased(languageId, request);
-        }
-
-        if (!plainView) {
-            out.println(OK.withIcon(String.format(
-                RESOURCE_BUNDLE.getString("message.translation_uploaded"), file.getPath())));
-        } else {
-            out.println(file.getPath());
-        }
-        out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.experimental_command")));
-    }
-
-    private Long getStorageId(ProjectClient client) {
-        try (InputStream fileStream = Files.newInputStream(file.toPath())) {
-            return client.uploadStorage(file.getName(), fileStream);
-        } catch (FileNotFoundException e) {
-            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.local_file_not_found"), file.getAbsolutePath()));
-        } catch (EmptyFileException e){
-            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("message.uploading_file_skipped"), file.getAbsolutePath()));
-        } catch (Exception e) {
-            throw new RuntimeException(
-                String.format(RESOURCE_BUNDLE.getString("error.upload_to_storage"), file.getAbsolutePath()), e);
-        }
-    }
-}
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.EmptyFileException;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.commands.functionality.BranchUtils;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.cli.utils.console.ConsoleSpinner;
+import com.crowdin.client.projectsgroups.model.Type;
+import com.crowdin.client.sourcefiles.model.Branch;
+import com.crowdin.client.sourcefiles.model.FileInfo;
+import com.crowdin.client.translations.model.UploadTranslationsRequest;
+import com.crowdin.client.translations.model.UploadTranslationsStringsRequest;
+import lombok.AllArgsConstructor;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.util.Objects;
+
+import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
+import static com.crowdin.cli.utils.console.ExecutionStatus.OK;
+import static com.crowdin.cli.utils.console.ExecutionStatus.WARNING;
+
+@AllArgsConstructor
+public class FileUploadTranslationAction implements NewAction<ProjectProperties, ProjectClient> {
+
+    private final File file;
+    private final String branchName;
+    private final String dest;
+    private final String languageId;
+    private final boolean plainView;
+
+    @Override
+    public void act(Outputter out, ProjectProperties properties, ProjectClient client) {
+        CrowdinProjectFull project = ConsoleSpinner.execute(out, "message.spinner.fetching_project_info", "error.collect_project_info",
+            this.plainView, this.plainView, () -> client.downloadFullProject(branchName));
+
+        if (!project.findLanguageById(languageId, true).isPresent()) {
+            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.language_not_exist"), languageId));
+        }
+
+        if (Objects.equals(Type.FILES_BASED, project.getType())) {
+            if (Objects.isNull(dest))
+                throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file.dest_required"), languageId));
+            String sourcePath = Utils.toUnixPath(Utils.sepAtStart(dest));
+            FileInfo sourceFileInfo = project.getFileInfos().stream()
+                .filter(fi -> Objects.equals(sourcePath, fi.getPath()))
+                .findFirst()
+                .orElseThrow(() -> new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.file_not_found"), sourcePath)));
+
+            UploadTranslationsRequest request = new UploadTranslationsRequest();
+            Long storageId = getStorageId(client);
+            request.setFileId(sourceFileInfo.getId());
+            request.setStorageId(storageId);
+            try {
+                client.uploadTranslations(languageId, request);
+            } catch (Exception e) {
+                throw new RuntimeException(String.format(
+                    RESOURCE_BUNDLE.getString("error.upload_translation"), file.getPath()), e);
+            }
+        } else if (Objects.equals(Type.STRINGS_BASED, project.getType())) {
+            UploadTranslationsStringsRequest request = new UploadTranslationsStringsRequest();
+            Branch branch = project.findBranchByName(branchName)
+                .orElseThrow(() -> new RuntimeException(RESOURCE_BUNDLE.getString("error.branch_required_string_project")));
+            Long storageId = getStorageId(client);
+            request.setBranchId(branch.getId());
+            request.setStorageId(storageId);
+            client.uploadTranslationStringsBased(languageId, request);
+        }
+
+        if (!plainView) {
+            out.println(OK.withIcon(String.format(
+                RESOURCE_BUNDLE.getString("message.translation_uploaded"), file.getPath())));
+        } else {
+            out.println(file.getPath());
+        }
+        out.println(WARNING.withIcon(RESOURCE_BUNDLE.getString("message.experimental_command")));
+    }
+
+    private Long getStorageId(ProjectClient client) {
+        try (InputStream fileStream = Files.newInputStream(file.toPath())) {
+            return client.uploadStorage(file.getName(), fileStream);
+        } catch (FileNotFoundException e) {
+            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("error.local_file_not_found"), file.getAbsolutePath()));
+        } catch (EmptyFileException e){
+            throw new RuntimeException(String.format(RESOURCE_BUNDLE.getString("message.uploading_file_skipped"), file.getAbsolutePath()));
+        } catch (Exception e) {
+            throw new RuntimeException(
+                String.format(RESOURCE_BUNDLE.getString("error.upload_to_storage"), file.getAbsolutePath()), e);
+        }
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/functionality/BranchUtils.java b/src/main/java/com/crowdin/cli/commands/functionality/BranchUtils.java
index 2911622f3..98a368bd6 100644
--- a/src/main/java/com/crowdin/cli/commands/functionality/BranchUtils.java
+++ b/src/main/java/com/crowdin/cli/commands/functionality/BranchUtils.java
@@ -1,39 +1,39 @@
-package com.crowdin.cli.commands.functionality;
-
-import com.crowdin.cli.client.CrowdinProjectFull;
-import com.crowdin.cli.client.ProjectClient;
-import com.crowdin.cli.commands.Outputter;
-import com.crowdin.cli.utils.console.ExecutionStatus;
-import com.crowdin.client.sourcefiles.model.AddBranchRequest;
-import com.crowdin.client.sourcefiles.model.Branch;
-import org.apache.commons.lang3.StringUtils;
-
-import java.util.Optional;
-
-import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
-import static com.crowdin.cli.utils.console.ExecutionStatus.SKIPPED;
-
-public class BranchUtils {
-
-    public static Branch getOrCreateBranch(Outputter out, String branchName, ProjectClient client, CrowdinProjectFull project, boolean plainView) {
-        if (StringUtils.isEmpty(branchName)) {
-            return null;
-        }
-        Optional<Branch> branchOpt = project.findBranchByName(branchName);
-        if (branchOpt.isPresent()) {
-            if (!plainView) {
-                out.println(SKIPPED.withIcon(String.format(RESOURCE_BUNDLE.getString("message.branch_already_exists"), branchName)));
-            }
-            return branchOpt.get();
-        } else {
-            AddBranchRequest request = new AddBranchRequest();
-            request.setName(branchName);
-            Branch newBranch = client.addBranch(request);
-            if (!plainView) {
-                out.println(ExecutionStatus.OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.branch"), branchName)));
-            }
-            project.addBranchToLocalList(newBranch);
-            return newBranch;
-        }
-    }
-}
+package com.crowdin.cli.commands.functionality;
+
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.utils.console.ExecutionStatus;
+import com.crowdin.client.sourcefiles.model.AddBranchRequest;
+import com.crowdin.client.sourcefiles.model.Branch;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Optional;
+
+import static com.crowdin.cli.BaseCli.RESOURCE_BUNDLE;
+import static com.crowdin.cli.utils.console.ExecutionStatus.SKIPPED;
+
+public class BranchUtils {
+
+    public static Branch getOrCreateBranch(Outputter out, String branchName, ProjectClient client, CrowdinProjectFull project, boolean plainView) {
+        if (StringUtils.isEmpty(branchName)) {
+            return null;
+        }
+        Optional<Branch> branchOpt = project.findBranchByName(branchName);
+        if (branchOpt.isPresent()) {
+            if (!plainView) {
+                out.println(SKIPPED.withIcon(String.format(RESOURCE_BUNDLE.getString("message.branch_already_exists"), branchName)));
+            }
+            return branchOpt.get();
+        } else {
+            AddBranchRequest request = new AddBranchRequest();
+            request.setName(branchName);
+            Branch newBranch = client.addBranch(request);
+            if (!plainView) {
+                out.println(ExecutionStatus.OK.withIcon(String.format(RESOURCE_BUNDLE.getString("message.branch"), branchName)));
+            }
+            project.addBranchToLocalList(newBranch);
+            return newBranch;
+        }
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommand.java
index 74d7fb883..dcfed54c4 100644
--- a/src/main/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommand.java
+++ b/src/main/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommand.java
@@ -1,27 +1,27 @@
-package com.crowdin.cli.commands.picocli;
-
-import com.crowdin.cli.client.ProjectClient;
-import com.crowdin.cli.commands.Actions;
-import com.crowdin.cli.commands.NewAction;
-import com.crowdin.cli.properties.ProjectProperties;
-import picocli.CommandLine;
-import picocli.CommandLine.Command;
-import picocli.CommandLine.Parameters;
-
-@Command(
-    name = CommandNames.FILE_DELETE,
-    sortOptions = false
-)
-class FileDeleteSubcommand extends ActCommandProject {
-
-    @Parameters(descriptionKey = "crowdin.file.delete.file")
-    protected String file;
-
-    @CommandLine.Option(names = {"-b", "--branch"}, paramLabel = "...", order = -2)
-    protected String branch;
-
-    @Override
-    protected NewAction<ProjectProperties, ProjectClient> getAction(Actions actions) {
-        return actions.fileDelete(file, branch);
-    }
-}
+package com.crowdin.cli.commands.picocli;
+
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.Actions;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.properties.ProjectProperties;
+import picocli.CommandLine;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Parameters;
+
+@Command(
+    name = CommandNames.FILE_DELETE,
+    sortOptions = false
+)
+class FileDeleteSubcommand extends ActCommandProject {
+
+    @Parameters(descriptionKey = "crowdin.file.delete.file")
+    protected String file;
+
+    @CommandLine.Option(names = {"-b", "--branch"}, paramLabel = "...", order = -2)
+    protected String branch;
+
+    @Override
+    protected NewAction<ProjectProperties, ProjectClient> getAction(Actions actions) {
+        return actions.fileDelete(file, branch);
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommand.java
index c97917b82..911f57ba1 100644
--- a/src/main/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommand.java
+++ b/src/main/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommand.java
@@ -1,37 +1,37 @@
-package com.crowdin.cli.commands.picocli;
-
-import com.crowdin.cli.client.ProjectClient;
-import com.crowdin.cli.commands.Actions;
-import com.crowdin.cli.commands.NewAction;
-import com.crowdin.cli.properties.ProjectProperties;
-import picocli.CommandLine.Command;
-import picocli.CommandLine.Option;
-import picocli.CommandLine.Parameters;
-
-import java.util.Objects;
-
-@Command(
-    name = CommandNames.FILE_DOWNLOAD,
-    sortOptions = false
-)
-class FileDownloadSubcommand extends ActCommandProject {
-
-    @Parameters(descriptionKey = "crowdin.file.download.file")
-    protected String file;
-
-    @Option(names = {"-l", "--language"}, paramLabel = "...", descriptionKey = "crowdin.file.language", order = -2)
-    protected String languageId;
-
-    @Option(names = {"-b", "--branch"}, paramLabel = "...", order = -2)
-    protected String branch;
-
-    @Option(names = {"-d", "--dest"}, paramLabel = "...", descriptionKey = "crowdin.file.download.dest", order = -2)
-    private String destination;
-
-    @Override
-    protected NewAction<ProjectProperties, ProjectClient> getAction(Actions actions) {
-        if (Objects.nonNull(languageId))
-            return actions.fileDownloadTranslation(file, languageId, branch, destination);
-        return actions.fileDownload(file, branch, destination);
-    }
-}
+package com.crowdin.cli.commands.picocli;
+
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.Actions;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.properties.ProjectProperties;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
+import picocli.CommandLine.Parameters;
+
+import java.util.Objects;
+
+@Command(
+    name = CommandNames.FILE_DOWNLOAD,
+    sortOptions = false
+)
+class FileDownloadSubcommand extends ActCommandProject {
+
+    @Parameters(descriptionKey = "crowdin.file.download.file")
+    protected String file;
+
+    @Option(names = {"-l", "--language"}, paramLabel = "...", descriptionKey = "crowdin.file.language", order = -2)
+    protected String languageId;
+
+    @Option(names = {"-b", "--branch"}, paramLabel = "...", order = -2)
+    protected String branch;
+
+    @Option(names = {"-d", "--dest"}, paramLabel = "...", descriptionKey = "crowdin.file.download.dest", order = -2)
+    private String destination;
+
+    @Override
+    protected NewAction<ProjectProperties, ProjectClient> getAction(Actions actions) {
+        if (Objects.nonNull(languageId))
+            return actions.fileDownloadTranslation(file, languageId, branch, destination);
+        return actions.fileDownload(file, branch, destination);
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/FileSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/FileSubcommand.java
index 6a08dde55..23defc37b 100644
--- a/src/main/java/com/crowdin/cli/commands/picocli/FileSubcommand.java
+++ b/src/main/java/com/crowdin/cli/commands/picocli/FileSubcommand.java
@@ -1,20 +1,20 @@
-package com.crowdin.cli.commands.picocli;
-
-import picocli.CommandLine;
-import picocli.CommandLine.Command;
-
-@Command(
-    name = CommandNames.FILE,
-    subcommands = {
-        FileUploadSubcommand.class,
-        FileDownloadSubcommand.class,
-        FileDeleteSubcommand.class
-    }
-)
-class FileSubcommand extends HelpCommand {
-
-    @Override
-    protected CommandLine getCommand(CommandLine rootCommand) {
-        return rootCommand.getSubcommands().get(CommandNames.FILE);
-    }
-}
+package com.crowdin.cli.commands.picocli;
+
+import picocli.CommandLine;
+import picocli.CommandLine.Command;
+
+@Command(
+    name = CommandNames.FILE,
+    subcommands = {
+        FileUploadSubcommand.class,
+        FileDownloadSubcommand.class,
+        FileDeleteSubcommand.class
+    }
+)
+class FileSubcommand extends HelpCommand {
+
+    @Override
+    protected CommandLine getCommand(CommandLine rootCommand) {
+        return rootCommand.getSubcommands().get(CommandNames.FILE);
+    }
+}
diff --git a/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java
index 9a2f8d57e..18918372e 100644
--- a/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java
+++ b/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java
@@ -1,58 +1,58 @@
-package com.crowdin.cli.commands.picocli;
-
-import com.crowdin.cli.client.ProjectClient;
-import com.crowdin.cli.commands.Actions;
-import com.crowdin.cli.commands.NewAction;
-import com.crowdin.cli.properties.ProjectProperties;
-import picocli.CommandLine;
-import picocli.CommandLine.Option;
-import picocli.CommandLine.Parameters;
-
-import java.io.File;
-import java.util.List;
-import java.util.Objects;
-
-@CommandLine.Command(
-    name = CommandNames.FILE_UPLOAD,
-    sortOptions = false
-)
-class FileUploadSubcommand extends ActCommandProject {
-
-    @Parameters(descriptionKey = "crowdin.file.upload.file")
-    protected File file;
-
-    @Option(names = {"-b", "--branch"}, paramLabel = "...", order = -2)
-    protected String branch;
-
-    @Option(names = {"--no-auto-update"}, descriptionKey = "crowdin.file.upload.auto-update", negatable = true, order = -2)
-    protected boolean autoUpdate = true;
-
-    @Option(names = {"--label"}, descriptionKey = "params.label", paramLabel = "...", order = -2)
-    protected List<String> labels;
-
-    @Option(names = {"-d", "--dest"}, paramLabel = "...", descriptionKey = "crowdin.file.upload.dest", order = -2)
-    private String destination;
-
-    @Option(names = {"--excluded-language"}, descriptionKey = "params.excluded-languages", paramLabel = "...", order = -2)
-    protected List<String> excludedLanguages;
-
-    @Option(names = {"--no-cleanup-mode"}, negatable = true, descriptionKey = "crowdin.file.upload.cleanup-mode", order = -2)
-    protected boolean cleanupMode = true;
-
-    @Option(names = {"--no-update-strings"}, negatable = true, descriptionKey = "crowdin.file.upload.update-strings", order = -2)
-    protected boolean updateStrings = true;
-
-    @Option(names = {"-l", "--language"}, paramLabel = "...", descriptionKey = "crowdin.file.language", order = -2)
-    protected String languageId;
-
-    @Option(names = {"--plain"}, descriptionKey = "crowdin.list.usage.plain")
-    protected boolean plainView;
-
-    @Override
-    protected NewAction<ProjectProperties, ProjectClient> getAction(Actions actions) {
-        if (Objects.nonNull(languageId)) {
-            return actions.fileUploadTranslation(file, branch, destination, languageId, plainView);
-        }
-        return actions.fileUpload(file, branch, autoUpdate, labels, destination, excludedLanguages, plainView, cleanupMode, updateStrings);
-    }
-}
+package com.crowdin.cli.commands.picocli;
+
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.Actions;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.properties.ProjectProperties;
+import picocli.CommandLine;
+import picocli.CommandLine.Option;
+import picocli.CommandLine.Parameters;
+
+import java.io.File;
+import java.util.List;
+import java.util.Objects;
+
+@CommandLine.Command(
+    name = CommandNames.FILE_UPLOAD,
+    sortOptions = false
+)
+class FileUploadSubcommand extends ActCommandProject {
+
+    @Parameters(descriptionKey = "crowdin.file.upload.file")
+    protected File file;
+
+    @Option(names = {"-b", "--branch"}, paramLabel = "...", order = -2)
+    protected String branch;
+
+    @Option(names = {"--no-auto-update"}, descriptionKey = "crowdin.file.upload.auto-update", negatable = true, order = -2)
+    protected boolean autoUpdate = true;
+
+    @Option(names = {"--label"}, descriptionKey = "params.label", paramLabel = "...", order = -2)
+    protected List<String> labels;
+
+    @Option(names = {"-d", "--dest"}, paramLabel = "...", descriptionKey = "crowdin.file.upload.dest", order = -2)
+    private String destination;
+
+    @Option(names = {"--excluded-language"}, descriptionKey = "params.excluded-languages", paramLabel = "...", order = -2)
+    protected List<String> excludedLanguages;
+
+    @Option(names = {"--no-cleanup-mode"}, negatable = true, descriptionKey = "crowdin.file.upload.cleanup-mode", order = -2)
+    protected boolean cleanupMode = true;
+
+    @Option(names = {"--no-update-strings"}, negatable = true, descriptionKey = "crowdin.file.upload.update-strings", order = -2)
+    protected boolean updateStrings = true;
+
+    @Option(names = {"-l", "--language"}, paramLabel = "...", descriptionKey = "crowdin.file.language", order = -2)
+    protected String languageId;
+
+    @Option(names = {"--plain"}, descriptionKey = "crowdin.list.usage.plain")
+    protected boolean plainView;
+
+    @Override
+    protected NewAction<ProjectProperties, ProjectClient> getAction(Actions actions) {
+        if (Objects.nonNull(languageId)) {
+            return actions.fileUploadTranslation(file, branch, destination, languageId, plainView);
+        }
+        return actions.fileUpload(file, branch, autoUpdate, labels, destination, excludedLanguages, plainView, cleanupMode, updateStrings);
+    }
+}
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileDeleteActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileDeleteActionTest.java
index ece27bc0c..0c1de110a 100644
--- a/src/test/java/com/crowdin/cli/commands/actions/FileDeleteActionTest.java
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileDeleteActionTest.java
@@ -1,75 +1,75 @@
-package com.crowdin.cli.commands.actions;
-
-import com.crowdin.cli.client.CrowdinProjectFull;
-import com.crowdin.cli.client.ProjectBuilder;
-import com.crowdin.cli.client.ProjectClient;
-import com.crowdin.cli.commands.NewAction;
-import com.crowdin.cli.commands.Outputter;
-import com.crowdin.cli.properties.NewPropertiesWithFilesUtilBuilder;
-import com.crowdin.cli.properties.ProjectProperties;
-import com.crowdin.cli.properties.PropertiesWithFiles;
-import com.crowdin.cli.properties.helper.FileHelperTest;
-import com.crowdin.cli.properties.helper.TempProject;
-import com.crowdin.cli.utils.Utils;
-import com.crowdin.client.projectsgroups.model.Type;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.*;
-
-class FileDeleteActionTest {
-    private TempProject project;
-
-    @BeforeEach
-    public void createProj() {
-        project = new TempProject(FileHelperTest.class);
-    }
-
-    @AfterEach
-    public void deleteProj() {
-        project.delete();
-    }
-
-    @Test
-    public void testDelete() {
-        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
-            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
-            .setBasePath(project.getBasePath());
-        PropertiesWithFiles pb = pbBuilder.build();
-        ProjectClient client = mock(ProjectClient.class);
-        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
-            .addFile("/first.po", "gettext", 101L, null, null, null).build();
-        build.setType(Type.FILES_BASED);
-        when(client.downloadFullProject())
-            .thenReturn(build);
-
-        NewAction<ProjectProperties, ProjectClient> action = new FileDeleteAction("first.po", null);
-        action.act(Outputter.getDefault(), pb, client);
-
-        verify(client).downloadFullProject();
-        verify(client).deleteSource(eq(101L));
-        verifyNoMoreInteractions(client);
-    }
-
-    @Test
-    public void testDelete_StringBasedProject() {
-        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
-            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
-            .setBasePath(project.getBasePath());
-        PropertiesWithFiles pb = pbBuilder.build();
-        ProjectClient client = mock(ProjectClient.class);
-        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
-            .addFile("/first.po", "gettext", 101L, null, null, null).build();
-        build.setType(Type.STRINGS_BASED);
-        when(client.downloadFullProject())
-            .thenReturn(build);
-
-        NewAction<ProjectProperties, ProjectClient> action = new FileDeleteAction("first.po", null);
-        action.act(Outputter.getDefault(), pb, client);
-
-        verify(client).downloadFullProject();
-        verifyNoMoreInteractions(client);
-    }
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.ProjectBuilder;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.properties.NewPropertiesWithFilesUtilBuilder;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.properties.PropertiesWithFiles;
+import com.crowdin.cli.properties.helper.FileHelperTest;
+import com.crowdin.cli.properties.helper.TempProject;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.client.projectsgroups.model.Type;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+
+class FileDeleteActionTest {
+    private TempProject project;
+
+    @BeforeEach
+    public void createProj() {
+        project = new TempProject(FileHelperTest.class);
+    }
+
+    @AfterEach
+    public void deleteProj() {
+        project.delete();
+    }
+
+    @Test
+    public void testDelete() {
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
+            .addFile("/first.po", "gettext", 101L, null, null, null).build();
+        build.setType(Type.FILES_BASED);
+        when(client.downloadFullProject())
+            .thenReturn(build);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileDeleteAction("first.po", null);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client).deleteSource(eq(101L));
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testDelete_StringBasedProject() {
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
+            .addFile("/first.po", "gettext", 101L, null, null, null).build();
+        build.setType(Type.STRINGS_BASED);
+        when(client.downloadFullProject())
+            .thenReturn(build);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileDeleteAction("first.po", null);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verifyNoMoreInteractions(client);
+    }
 }
\ No newline at end of file
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileDownloadActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadActionTest.java
index 460687134..723a1c4f0 100644
--- a/src/test/java/com/crowdin/cli/commands/actions/FileDownloadActionTest.java
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadActionTest.java
@@ -1,84 +1,84 @@
-package com.crowdin.cli.commands.actions;
-
-import com.crowdin.cli.MockitoUtils;
-import com.crowdin.cli.client.CrowdinProjectFull;
-import com.crowdin.cli.client.ProjectBuilder;
-import com.crowdin.cli.client.ProjectClient;
-import com.crowdin.cli.commands.NewAction;
-import com.crowdin.cli.commands.Outputter;
-import com.crowdin.cli.properties.NewPropertiesWithFilesUtilBuilder;
-import com.crowdin.cli.properties.ProjectProperties;
-import com.crowdin.cli.properties.PropertiesWithFiles;
-import com.crowdin.cli.properties.helper.FileHelperTest;
-import com.crowdin.cli.properties.helper.TempProject;
-import com.crowdin.cli.utils.Utils;
-import com.crowdin.client.projectsgroups.model.Type;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.*;
-
-class FileDownloadActionTest {
-    private TempProject project;
-
-    @BeforeEach
-    public void createProj() {
-        project = new TempProject(FileHelperTest.class);
-    }
-
-    @AfterEach
-    public void deleteProj() {
-        project.delete();
-    }
-
-    @Test
-    public void testDownload() {
-        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
-            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
-            .setBasePath(project.getBasePath());
-        PropertiesWithFiles pb = pbBuilder.build();
-        ProjectClient client = mock(ProjectClient.class);
-        URL urlMock = MockitoUtils.getMockUrl(getClass());
-        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
-            .addFile("/first.po", "gettext", 101L, null, null, null).build();
-        build.setType(Type.FILES_BASED);
-        when(client.downloadFullProject(any()))
-            .thenReturn(build);
-        when(client.downloadFile(eq(101L)))
-            .thenReturn(urlMock);
-
-        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadAction("first.po", null, "dest");
-        action.act(Outputter.getDefault(), pb, client);
-
-        verify(client).downloadFullProject(any());
-        verify(client).downloadFile(eq(101L));
-        verifyNoMoreInteractions(client);
-        assertTrue(Files.exists(Paths.get(project.getBasePath() + "dest/first.po")), "File should exist at the specified path");
-    }
-
-    @Test
-    public void testDownload_StringBasedProject() {
-        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
-            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
-            .setBasePath(project.getBasePath());
-        PropertiesWithFiles pb = pbBuilder.build();
-        ProjectClient client = mock(ProjectClient.class);
-        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
-        build.setType(Type.STRINGS_BASED);
-        when(client.downloadFullProject(any()))
-            .thenReturn(build);
-
-        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadAction("first.po", "main", "dest");
-        action.act(Outputter.getDefault(), pb, client);
-
-        verify(client).downloadFullProject(any());
-        verifyNoMoreInteractions(client);
-    }
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.MockitoUtils;
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.ProjectBuilder;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.properties.NewPropertiesWithFilesUtilBuilder;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.properties.PropertiesWithFiles;
+import com.crowdin.cli.properties.helper.FileHelperTest;
+import com.crowdin.cli.properties.helper.TempProject;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.client.projectsgroups.model.Type;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+
+class FileDownloadActionTest {
+    private TempProject project;
+
+    @BeforeEach
+    public void createProj() {
+        project = new TempProject(FileHelperTest.class);
+    }
+
+    @AfterEach
+    public void deleteProj() {
+        project.delete();
+    }
+
+    @Test
+    public void testDownload() {
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        URL urlMock = MockitoUtils.getMockUrl(getClass());
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
+            .addFile("/first.po", "gettext", 101L, null, null, null).build();
+        build.setType(Type.FILES_BASED);
+        when(client.downloadFullProject(any()))
+            .thenReturn(build);
+        when(client.downloadFile(eq(101L)))
+            .thenReturn(urlMock);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadAction("first.po", null, "dest");
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject(any());
+        verify(client).downloadFile(eq(101L));
+        verifyNoMoreInteractions(client);
+        assertTrue(Files.exists(Paths.get(project.getBasePath() + "dest/first.po")), "File should exist at the specified path");
+    }
+
+    @Test
+    public void testDownload_StringBasedProject() {
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.STRINGS_BASED);
+        when(client.downloadFullProject(any()))
+            .thenReturn(build);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadAction("first.po", "main", "dest");
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject(any());
+        verifyNoMoreInteractions(client);
+    }
 }
\ No newline at end of file
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileDownloadTranslationActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadTranslationActionTest.java
index efd20b39b..05345d492 100644
--- a/src/test/java/com/crowdin/cli/commands/actions/FileDownloadTranslationActionTest.java
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileDownloadTranslationActionTest.java
@@ -1,117 +1,117 @@
-package com.crowdin.cli.commands.actions;
-
-import com.crowdin.cli.MockitoUtils;
-import com.crowdin.cli.client.CrowdinProjectFull;
-import com.crowdin.cli.client.ProjectBuilder;
-import com.crowdin.cli.client.ProjectClient;
-import com.crowdin.cli.commands.NewAction;
-import com.crowdin.cli.commands.Outputter;
-import com.crowdin.cli.properties.NewPropertiesWithFilesUtilBuilder;
-import com.crowdin.cli.properties.ProjectProperties;
-import com.crowdin.cli.properties.PropertiesWithFiles;
-import com.crowdin.cli.properties.helper.FileHelperTest;
-import com.crowdin.cli.properties.helper.TempProject;
-import com.crowdin.cli.utils.Utils;
-import com.crowdin.client.projectsgroups.model.Type;
-import com.crowdin.client.translations.model.BuildProjectFileTranslationRequest;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.net.URL;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-
-import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.*;
-
-class FileDownloadTranslationActionTest {
-    private TempProject project;
-
-    @BeforeEach
-    public void createProj() {
-        project = new TempProject(FileHelperTest.class);
-    }
-
-    @AfterEach
-    public void deleteProj() {
-        project.delete();
-    }
-
-    @Test
-    public void testDownloadTranslation() {
-        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
-            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
-            .setBasePath(project.getBasePath());
-        PropertiesWithFiles pb = pbBuilder.build();
-        ProjectClient client = mock(ProjectClient.class);
-        URL urlMock = MockitoUtils.getMockUrl(getClass());
-        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
-            .addFile("/first.po", "gettext", 101L, null, null, null).build();
-        build.setType(Type.FILES_BASED);
-        BuildProjectFileTranslationRequest request = new BuildProjectFileTranslationRequest() {{
-            setTargetLanguageId("ua");
-        }};
-        when(client.downloadFullProject())
-            .thenReturn(build);
-        when(client.buildProjectFileTranslation(eq(101L), eq(request)))
-            .thenReturn(urlMock);
-
-        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadTranslationAction("first.po", "ua", null, null);
-        action.act(Outputter.getDefault(), pb, client);
-
-        verify(client).downloadFullProject();
-        verify(client).buildProjectFileTranslation(eq(101L), eq(request));
-        verifyNoMoreInteractions(client);
-        assertTrue(Files.exists(Paths.get(project.getBasePath() + "ua/first.po")), "File should exist at the specified path");
-    }
-
-    @Test
-    public void testDownloadTranslationWithDest() {
-        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
-            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
-            .setBasePath(project.getBasePath());
-        PropertiesWithFiles pb = pbBuilder.build();
-        ProjectClient client = mock(ProjectClient.class);
-        URL urlMock = MockitoUtils.getMockUrl(getClass());
-        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
-            .addFile("/first.po", "gettext", 101L, null, null, null).build();
-        build.setType(Type.FILES_BASED);
-        BuildProjectFileTranslationRequest request = new BuildProjectFileTranslationRequest() {{
-            setTargetLanguageId("ua");
-        }};
-        when(client.downloadFullProject())
-            .thenReturn(build);
-        when(client.buildProjectFileTranslation(eq(101L), eq(request)))
-            .thenReturn(urlMock);
-
-        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadTranslationAction("first.po", "ua", null, "path/to/save");
-        action.act(Outputter.getDefault(), pb, client);
-
-        verify(client).downloadFullProject();
-        verify(client).buildProjectFileTranslation(eq(101L), eq(request));
-        verifyNoMoreInteractions(client);
-        assertTrue(Files.exists(Paths.get(project.getBasePath() + "path/to/save/first.po")), "File should exist at the specified path");
-    }
-
-    @Test
-    public void testDownloadTranslation_StringBasedProject() {
-        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
-            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
-            .setBasePath(project.getBasePath());
-        PropertiesWithFiles pb = pbBuilder.build();
-        ProjectClient client = mock(ProjectClient.class);
-        URL urlMock = MockitoUtils.getMockUrl(getClass());
-        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
-        build.setType(Type.STRINGS_BASED);
-        when(client.downloadFullProject())
-            .thenReturn(build);
-
-        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadTranslationAction("first.po", "ua", null, "path/to/save");
-        action.act(Outputter.getDefault(), pb, client);
-
-        verify(client).downloadFullProject();
-        verifyNoMoreInteractions(client);
-    }
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.MockitoUtils;
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.ProjectBuilder;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.properties.NewPropertiesWithFilesUtilBuilder;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.properties.PropertiesWithFiles;
+import com.crowdin.cli.properties.helper.FileHelperTest;
+import com.crowdin.cli.properties.helper.TempProject;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.client.projectsgroups.model.Type;
+import com.crowdin.client.translations.model.BuildProjectFileTranslationRequest;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+
+class FileDownloadTranslationActionTest {
+    private TempProject project;
+
+    @BeforeEach
+    public void createProj() {
+        project = new TempProject(FileHelperTest.class);
+    }
+
+    @AfterEach
+    public void deleteProj() {
+        project.delete();
+    }
+
+    @Test
+    public void testDownloadTranslation() {
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        URL urlMock = MockitoUtils.getMockUrl(getClass());
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
+            .addFile("/first.po", "gettext", 101L, null, null, null).build();
+        build.setType(Type.FILES_BASED);
+        BuildProjectFileTranslationRequest request = new BuildProjectFileTranslationRequest() {{
+            setTargetLanguageId("ua");
+        }};
+        when(client.downloadFullProject())
+            .thenReturn(build);
+        when(client.buildProjectFileTranslation(eq(101L), eq(request)))
+            .thenReturn(urlMock);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadTranslationAction("first.po", "ua", null, null);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client).buildProjectFileTranslation(eq(101L), eq(request));
+        verifyNoMoreInteractions(client);
+        assertTrue(Files.exists(Paths.get(project.getBasePath() + "ua/first.po")), "File should exist at the specified path");
+    }
+
+    @Test
+    public void testDownloadTranslationWithDest() {
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        URL urlMock = MockitoUtils.getMockUrl(getClass());
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
+            .addFile("/first.po", "gettext", 101L, null, null, null).build();
+        build.setType(Type.FILES_BASED);
+        BuildProjectFileTranslationRequest request = new BuildProjectFileTranslationRequest() {{
+            setTargetLanguageId("ua");
+        }};
+        when(client.downloadFullProject())
+            .thenReturn(build);
+        when(client.buildProjectFileTranslation(eq(101L), eq(request)))
+            .thenReturn(urlMock);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadTranslationAction("first.po", "ua", null, "path/to/save");
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client).buildProjectFileTranslation(eq(101L), eq(request));
+        verifyNoMoreInteractions(client);
+        assertTrue(Files.exists(Paths.get(project.getBasePath() + "path/to/save/first.po")), "File should exist at the specified path");
+    }
+
+    @Test
+    public void testDownloadTranslation_StringBasedProject() {
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        URL urlMock = MockitoUtils.getMockUrl(getClass());
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.STRINGS_BASED);
+        when(client.downloadFullProject())
+            .thenReturn(build);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileDownloadTranslationAction("first.po", "ua", null, "path/to/save");
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verifyNoMoreInteractions(client);
+    }
 }
\ No newline at end of file
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileUploadActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileUploadActionTest.java
index d26c083ea..ff3022963 100644
--- a/src/test/java/com/crowdin/cli/commands/actions/FileUploadActionTest.java
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileUploadActionTest.java
@@ -1,359 +1,359 @@
-package com.crowdin.cli.commands.actions;
-
-import com.crowdin.cli.client.CrowdinProjectFull;
-import com.crowdin.cli.client.ProjectBuilder;
-import com.crowdin.cli.client.ProjectClient;
-import com.crowdin.cli.client.ResponseException;
-import com.crowdin.cli.commands.NewAction;
-import com.crowdin.cli.commands.Outputter;
-import com.crowdin.cli.properties.NewPropertiesWithFilesUtilBuilder;
-import com.crowdin.cli.properties.ProjectProperties;
-import com.crowdin.cli.properties.PropertiesWithFiles;
-import com.crowdin.cli.properties.helper.FileHelperTest;
-import com.crowdin.cli.properties.helper.TempProject;
-import com.crowdin.cli.utils.Utils;
-import com.crowdin.client.labels.model.Label;
-import com.crowdin.client.projectsgroups.model.Type;
-import com.crowdin.client.sourcefiles.model.AddFileRequest;
-import com.crowdin.client.sourcefiles.model.Branch;
-import com.crowdin.client.sourcefiles.model.Directory;
-import com.crowdin.client.sourcefiles.model.UpdateFileRequest;
-import com.crowdin.client.sourcestrings.model.UploadStringsProgress;
-import com.crowdin.client.sourcestrings.model.UploadStringsRequest;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.io.File;
-import java.util.Arrays;
-import java.util.Collections;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.*;
-
-class FileUploadActionTest {
-    private TempProject project;
-
-    @BeforeEach
-    public void createProj() {
-        project = new TempProject(FileHelperTest.class);
-    }
-
-    @AfterEach
-    public void deleteProj() {
-        project.delete();
-    }
-
-    @Test
-    public void testUpload_FileBasedProject() throws ResponseException {
-        File fileToUpload = new File(project.getBasePath() + "first.po");
-        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
-        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
-            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
-            .setBasePath(project.getBasePath());
-        PropertiesWithFiles pb = pbBuilder.build();
-        ProjectClient client = mock(ProjectClient.class);
-        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
-        build.setType(Type.FILES_BASED);
-        when(client.downloadFullProject())
-            .thenReturn(build);
-        when(client.uploadStorage(eq("first.po"), any()))
-            .thenReturn(1L);
-
-        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, null, false, null, null, false, false, null, false);
-        action.act(Outputter.getDefault(), pb, client);
-
-        verify(client).downloadFullProject();
-        verify(client).uploadStorage(eq("first.po"), any());
-        AddFileRequest addFileRequest = new AddFileRequest() {{
-            setName("first.po");
-            setStorageId(1L);
-        }};
-        verify(client).addSource(eq(addFileRequest));
-        verifyNoMoreInteractions(client);
-    }
-
-    @Test
-    public void testUpload_StringBasedProject() throws ResponseException {
-        File fileToUpload = new File(project.getBasePath() + "first.po");
-        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
-        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
-            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
-            .setBasePath(project.getBasePath());
-        PropertiesWithFiles pb = pbBuilder.build();
-        ProjectClient client = mock(ProjectClient.class);
-        Branch branch = mock(Branch.class);
-        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
-        build.setType(Type.STRINGS_BASED);
-        UploadStringsProgress progress = new UploadStringsProgress() {{
-            setIdentifier("id");
-            setProgress(100);
-        }};
-        UploadStringsProgress progressFinished = new UploadStringsProgress() {{
-            setIdentifier("id");
-            setStatus("finished");
-            setProgress(100);
-        }};
-
-        when(branch.getId()).thenReturn(2L);
-        when(client.downloadFullProject()).thenReturn(build);
-        when(client.uploadStorage(eq("first.po"), any())).thenReturn(1L);
-        when(client.addBranch(any())).thenReturn(branch);
-        when(client.addSourceStringsBased(any())).thenReturn(progress);
-        when(client.getUploadStringsStatus(any())).thenReturn(progressFinished);
-
-        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, "branch", false, null, null, false, false, null, false);
-        action.act(Outputter.getDefault(), pb, client);
-
-        verify(client).downloadFullProject();
-        verify(client).uploadStorage(eq("first.po"), any());
-        verify(client).addBranch(any());
-        verify(client).getUploadStringsStatus(any());
-        UploadStringsRequest addFileRequest = new UploadStringsRequest() {{
-            setBranchId(2L);
-            setStorageId(1L);
-            setCleanupMode(false);
-            setUpdateStrings(false);
-        }};
-        verify(client).addSourceStringsBased(eq(addFileRequest));
-        verifyNoMoreInteractions(client);
-    }
-
-    @Test
-    public void testUploadUpdate_FileBasedProject() throws ResponseException {
-        File fileToUpload = new File(project.getBasePath() + "first.po");
-        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
-        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
-            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
-            .setBasePath(project.getBasePath());
-        PropertiesWithFiles pb = pbBuilder.build();
-        ProjectClient client = mock(ProjectClient.class);
-        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
-            .addFile("first.po", "gettext", 101L, null, null).build();
-        build.setType(Type.FILES_BASED);
-        when(client.downloadFullProject())
-            .thenReturn(build);
-        when(client.uploadStorage(eq("first.po"), any()))
-            .thenReturn(1L);
-
-        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, null, true, null, null, false, false, null, false);
-        action.act(Outputter.getDefault(), pb, client);
-
-        verify(client).downloadFullProject();
-        verify(client).uploadStorage(eq("first.po"), any());
-        UpdateFileRequest addFileRequest = new UpdateFileRequest() {{
-            setStorageId(1L);
-        }};
-        verify(client).updateSource(any(), eq(addFileRequest));
-        verifyNoMoreInteractions(client);
-    }
-
-    @Test
-    public void testUploadNoAutoUpdate_FileBasedProject() throws ResponseException {
-        File fileToUpload = new File(project.getBasePath() + "first.po");
-        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
-        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
-            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
-            .setBasePath(project.getBasePath());
-        PropertiesWithFiles pb = pbBuilder.build();
-        ProjectClient client = mock(ProjectClient.class);
-        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
-            .addFile("first.po", "gettext", 101L, null, null).build();
-        build.setType(Type.FILES_BASED);
-        when(client.downloadFullProject())
-            .thenReturn(build);
-
-        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, null, false, null, null, false, false, null, false);
-        action.act(Outputter.getDefault(), pb, client);
-
-        verify(client).downloadFullProject();
-        verifyNoMoreInteractions(client);
-    }
-
-    @Test
-    public void testUploadWhenBranchMissed_FileBasedProject() throws ResponseException {
-        File fileToUpload = new File(project.getBasePath() + "first.po");
-        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
-        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
-            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
-            .setBasePath(project.getBasePath());
-        PropertiesWithFiles pb = pbBuilder.build();
-        ProjectClient client = mock(ProjectClient.class);
-        Branch branch = new Branch() {{
-            setId(3L);
-            setName("main");
-        }};
-        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
-        build.setType(Type.FILES_BASED);
-        when(client.downloadFullProject())
-            .thenReturn(build);
-        when(client.uploadStorage(eq("first.po"), any()))
-            .thenReturn(1L);
-        when(client.addBranch(any())).thenReturn(branch);
-
-        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, "main", false, null, null, false, false, null, false);
-        action.act(Outputter.getDefault(), pb, client);
-
-        verify(client).downloadFullProject();
-        verify(client).uploadStorage(eq("first.po"), any());
-        verify(client).addBranch(any());
-        AddFileRequest addFileRequest = new AddFileRequest() {{
-            setName("first.po");
-            setStorageId(1L);
-            setBranchId(3L);
-        }};
-        verify(client).addSource(eq(addFileRequest));
-        verifyNoMoreInteractions(client);
-    }
-
-    @Test
-    public void testUploadLabel_FileBasedProject() throws ResponseException {
-        File fileToUpload = new File(project.getBasePath() + "first.po");
-        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
-        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
-            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
-            .setBasePath(project.getBasePath());
-        PropertiesWithFiles pb = pbBuilder.build();
-        ProjectClient client = mock(ProjectClient.class);
-        Label label = new Label() {{
-            setId(3L);
-            setTitle("main_label");
-        }};
-        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
-        build.setType(Type.FILES_BASED);
-        when(client.downloadFullProject())
-            .thenReturn(build);
-        when(client.uploadStorage(eq("first.po"), any()))
-            .thenReturn(1L);
-        when(client.listLabels()).thenReturn(Collections.emptyList());
-        when(client.addLabel(any())).thenReturn(label);
-
-        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, null, false, Collections.singletonList("main_label"), null, false, false, null, false);
-        action.act(Outputter.getDefault(), pb, client);
-
-        verify(client).downloadFullProject();
-        verify(client).uploadStorage(eq("first.po"), any());
-        verify(client).listLabels();
-        verify(client).addLabel(any());
-        AddFileRequest addFileRequest = new AddFileRequest() {{
-            setName("first.po");
-            setStorageId(1L);
-            setAttachLabelIds(Collections.singletonList(3L));
-        }};
-        verify(client).addSource(eq(addFileRequest));
-        verifyNoMoreInteractions(client);
-    }
-
-    @Test
-    public void testUploadExcludedLangs_FileBasedProject() throws ResponseException {
-        File fileToUpload = new File(project.getBasePath() + "first.po");
-        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
-        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
-            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
-            .setBasePath(project.getBasePath());
-        PropertiesWithFiles pb = pbBuilder.build();
-        ProjectClient client = mock(ProjectClient.class);
-        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
-        build.setType(Type.FILES_BASED);
-        when(client.downloadFullProject())
-            .thenReturn(build);
-        when(client.uploadStorage(eq("first.po"), any()))
-            .thenReturn(1L);
-        when(client.listLabels()).thenReturn(Collections.emptyList());
-
-        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, null, false, null, null, false, false, Arrays.asList("ua", "fr"), false);
-        action.act(Outputter.getDefault(), pb, client);
-
-        verify(client).downloadFullProject();
-        verify(client).uploadStorage(eq("first.po"), any());
-        AddFileRequest addFileRequest = new AddFileRequest() {{
-            setName("first.po");
-            setStorageId(1L);
-            setExcludedTargetLanguages(Collections.singletonList("ua"));
-        }};
-        verify(client).addSource(eq(addFileRequest));
-        verifyNoMoreInteractions(client);
-    }
-
-    @Test
-    public void testUploadWithDest_FileBasedProject() throws ResponseException {
-        File fileToUpload = new File(project.getBasePath() + "first.po");
-        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
-        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
-            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
-            .setBasePath(project.getBasePath());
-        PropertiesWithFiles pb = pbBuilder.build();
-        ProjectClient client = mock(ProjectClient.class);
-        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
-        build.setType(Type.FILES_BASED);
-        Directory directory = new Directory(){{
-            setId(2L);
-        }};
-        when(client.downloadFullProject())
-            .thenReturn(build);
-        when(client.addDirectory(any()))
-            .thenReturn(directory);
-        when(client.uploadStorage(eq("save.po"), any()))
-            .thenReturn(1L);
-        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, null, false, null, "path/to/save.po", false, false, null, false);
-        action.act(Outputter.getDefault(), pb, client);
-
-        verify(client).downloadFullProject();
-        verify(client, times(2)).addDirectory(any());
-        verify(client).uploadStorage(eq("save.po"), any());
-        AddFileRequest addFileRequest = new AddFileRequest() {{
-            setName("save.po");
-            setStorageId(1L);
-            setDirectoryId(2L);
-        }};
-        verify(client).addSource(eq(addFileRequest));
-        verifyNoMoreInteractions(client);
-    }
-
-    @Test
-    public void testUploadCleanUpModeAndUpdateStrings_StringBasedProject() throws ResponseException {
-        File fileToUpload = new File(project.getBasePath() + "first.po");
-        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
-        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
-            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
-            .setBasePath(project.getBasePath());
-        PropertiesWithFiles pb = pbBuilder.build();
-        ProjectClient client = mock(ProjectClient.class);
-        Branch branch = mock(Branch.class);
-        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
-        build.setType(Type.STRINGS_BASED);
-        UploadStringsProgress progress = new UploadStringsProgress() {{
-            setIdentifier("id");
-            setProgress(100);
-        }};
-        UploadStringsProgress progressFinished = new UploadStringsProgress() {{
-            setIdentifier("id");
-            setStatus("finished");
-            setProgress(100);
-        }};
-
-        when(branch.getId()).thenReturn(2L);
-        when(client.downloadFullProject()).thenReturn(build);
-        when(client.uploadStorage(eq("first.po"), any())).thenReturn(1L);
-        when(client.addBranch(any())).thenReturn(branch);
-        when(client.addSourceStringsBased(any())).thenReturn(progress);
-        when(client.getUploadStringsStatus(any())).thenReturn(progressFinished);
-
-        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, "branch", false, null, null, true, true, null, false);
-        action.act(Outputter.getDefault(), pb, client);
-
-        verify(client).downloadFullProject();
-        verify(client).uploadStorage(eq("first.po"), any());
-        verify(client).addBranch(any());
-        verify(client).getUploadStringsStatus(any());
-        UploadStringsRequest addFileRequest = new UploadStringsRequest() {{
-            setBranchId(2L);
-            setStorageId(1L);
-            setCleanupMode(true);
-            setUpdateStrings(true);
-        }};
-        verify(client).addSourceStringsBased(eq(addFileRequest));
-        verifyNoMoreInteractions(client);
-    }
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.ProjectBuilder;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.client.ResponseException;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.properties.NewPropertiesWithFilesUtilBuilder;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.properties.PropertiesWithFiles;
+import com.crowdin.cli.properties.helper.FileHelperTest;
+import com.crowdin.cli.properties.helper.TempProject;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.client.labels.model.Label;
+import com.crowdin.client.projectsgroups.model.Type;
+import com.crowdin.client.sourcefiles.model.AddFileRequest;
+import com.crowdin.client.sourcefiles.model.Branch;
+import com.crowdin.client.sourcefiles.model.Directory;
+import com.crowdin.client.sourcefiles.model.UpdateFileRequest;
+import com.crowdin.client.sourcestrings.model.UploadStringsProgress;
+import com.crowdin.client.sourcestrings.model.UploadStringsRequest;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+import java.util.Arrays;
+import java.util.Collections;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+
+class FileUploadActionTest {
+    private TempProject project;
+
+    @BeforeEach
+    public void createProj() {
+        project = new TempProject(FileHelperTest.class);
+    }
+
+    @AfterEach
+    public void deleteProj() {
+        project.delete();
+    }
+
+    @Test
+    public void testUpload_FileBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first.po");
+        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.FILES_BASED);
+        when(client.downloadFullProject())
+            .thenReturn(build);
+        when(client.uploadStorage(eq("first.po"), any()))
+            .thenReturn(1L);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, null, false, null, null, false, false, null, false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client).uploadStorage(eq("first.po"), any());
+        AddFileRequest addFileRequest = new AddFileRequest() {{
+            setName("first.po");
+            setStorageId(1L);
+        }};
+        verify(client).addSource(eq(addFileRequest));
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testUpload_StringBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first.po");
+        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        Branch branch = mock(Branch.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.STRINGS_BASED);
+        UploadStringsProgress progress = new UploadStringsProgress() {{
+            setIdentifier("id");
+            setProgress(100);
+        }};
+        UploadStringsProgress progressFinished = new UploadStringsProgress() {{
+            setIdentifier("id");
+            setStatus("finished");
+            setProgress(100);
+        }};
+
+        when(branch.getId()).thenReturn(2L);
+        when(client.downloadFullProject()).thenReturn(build);
+        when(client.uploadStorage(eq("first.po"), any())).thenReturn(1L);
+        when(client.addBranch(any())).thenReturn(branch);
+        when(client.addSourceStringsBased(any())).thenReturn(progress);
+        when(client.getUploadStringsStatus(any())).thenReturn(progressFinished);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, "branch", false, null, null, false, false, null, false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client).uploadStorage(eq("first.po"), any());
+        verify(client).addBranch(any());
+        verify(client).getUploadStringsStatus(any());
+        UploadStringsRequest addFileRequest = new UploadStringsRequest() {{
+            setBranchId(2L);
+            setStorageId(1L);
+            setCleanupMode(false);
+            setUpdateStrings(false);
+        }};
+        verify(client).addSourceStringsBased(eq(addFileRequest));
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testUploadUpdate_FileBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first.po");
+        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
+            .addFile("first.po", "gettext", 101L, null, null).build();
+        build.setType(Type.FILES_BASED);
+        when(client.downloadFullProject())
+            .thenReturn(build);
+        when(client.uploadStorage(eq("first.po"), any()))
+            .thenReturn(1L);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, null, true, null, null, false, false, null, false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client).uploadStorage(eq("first.po"), any());
+        UpdateFileRequest addFileRequest = new UpdateFileRequest() {{
+            setStorageId(1L);
+        }};
+        verify(client).updateSource(any(), eq(addFileRequest));
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testUploadNoAutoUpdate_FileBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first.po");
+        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
+            .addFile("first.po", "gettext", 101L, null, null).build();
+        build.setType(Type.FILES_BASED);
+        when(client.downloadFullProject())
+            .thenReturn(build);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, null, false, null, null, false, false, null, false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testUploadWhenBranchMissed_FileBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first.po");
+        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        Branch branch = new Branch() {{
+            setId(3L);
+            setName("main");
+        }};
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.FILES_BASED);
+        when(client.downloadFullProject())
+            .thenReturn(build);
+        when(client.uploadStorage(eq("first.po"), any()))
+            .thenReturn(1L);
+        when(client.addBranch(any())).thenReturn(branch);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, "main", false, null, null, false, false, null, false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client).uploadStorage(eq("first.po"), any());
+        verify(client).addBranch(any());
+        AddFileRequest addFileRequest = new AddFileRequest() {{
+            setName("first.po");
+            setStorageId(1L);
+            setBranchId(3L);
+        }};
+        verify(client).addSource(eq(addFileRequest));
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testUploadLabel_FileBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first.po");
+        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        Label label = new Label() {{
+            setId(3L);
+            setTitle("main_label");
+        }};
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.FILES_BASED);
+        when(client.downloadFullProject())
+            .thenReturn(build);
+        when(client.uploadStorage(eq("first.po"), any()))
+            .thenReturn(1L);
+        when(client.listLabels()).thenReturn(Collections.emptyList());
+        when(client.addLabel(any())).thenReturn(label);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, null, false, Collections.singletonList("main_label"), null, false, false, null, false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client).uploadStorage(eq("first.po"), any());
+        verify(client).listLabels();
+        verify(client).addLabel(any());
+        AddFileRequest addFileRequest = new AddFileRequest() {{
+            setName("first.po");
+            setStorageId(1L);
+            setAttachLabelIds(Collections.singletonList(3L));
+        }};
+        verify(client).addSource(eq(addFileRequest));
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testUploadExcludedLangs_FileBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first.po");
+        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.FILES_BASED);
+        when(client.downloadFullProject())
+            .thenReturn(build);
+        when(client.uploadStorage(eq("first.po"), any()))
+            .thenReturn(1L);
+        when(client.listLabels()).thenReturn(Collections.emptyList());
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, null, false, null, null, false, false, Arrays.asList("ua", "fr"), false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client).uploadStorage(eq("first.po"), any());
+        AddFileRequest addFileRequest = new AddFileRequest() {{
+            setName("first.po");
+            setStorageId(1L);
+            setExcludedTargetLanguages(Collections.singletonList("ua"));
+        }};
+        verify(client).addSource(eq(addFileRequest));
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testUploadWithDest_FileBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first.po");
+        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.FILES_BASED);
+        Directory directory = new Directory(){{
+            setId(2L);
+        }};
+        when(client.downloadFullProject())
+            .thenReturn(build);
+        when(client.addDirectory(any()))
+            .thenReturn(directory);
+        when(client.uploadStorage(eq("save.po"), any()))
+            .thenReturn(1L);
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, null, false, null, "path/to/save.po", false, false, null, false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client, times(2)).addDirectory(any());
+        verify(client).uploadStorage(eq("save.po"), any());
+        AddFileRequest addFileRequest = new AddFileRequest() {{
+            setName("save.po");
+            setStorageId(1L);
+            setDirectoryId(2L);
+        }};
+        verify(client).addSource(eq(addFileRequest));
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testUploadCleanUpModeAndUpdateStrings_StringBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first.po");
+        project.addFile(Utils.normalizePath("first.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        Branch branch = mock(Branch.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId())).build();
+        build.setType(Type.STRINGS_BASED);
+        UploadStringsProgress progress = new UploadStringsProgress() {{
+            setIdentifier("id");
+            setProgress(100);
+        }};
+        UploadStringsProgress progressFinished = new UploadStringsProgress() {{
+            setIdentifier("id");
+            setStatus("finished");
+            setProgress(100);
+        }};
+
+        when(branch.getId()).thenReturn(2L);
+        when(client.downloadFullProject()).thenReturn(build);
+        when(client.uploadStorage(eq("first.po"), any())).thenReturn(1L);
+        when(client.addBranch(any())).thenReturn(branch);
+        when(client.addSourceStringsBased(any())).thenReturn(progress);
+        when(client.getUploadStringsStatus(any())).thenReturn(progressFinished);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadAction(fileToUpload, "branch", false, null, null, true, true, null, false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject();
+        verify(client).uploadStorage(eq("first.po"), any());
+        verify(client).addBranch(any());
+        verify(client).getUploadStringsStatus(any());
+        UploadStringsRequest addFileRequest = new UploadStringsRequest() {{
+            setBranchId(2L);
+            setStorageId(1L);
+            setCleanupMode(true);
+            setUpdateStrings(true);
+        }};
+        verify(client).addSourceStringsBased(eq(addFileRequest));
+        verifyNoMoreInteractions(client);
+    }
 }
\ No newline at end of file
diff --git a/src/test/java/com/crowdin/cli/commands/actions/FileUploadTranslationActionTest.java b/src/test/java/com/crowdin/cli/commands/actions/FileUploadTranslationActionTest.java
index a6a2374e6..085154351 100644
--- a/src/test/java/com/crowdin/cli/commands/actions/FileUploadTranslationActionTest.java
+++ b/src/test/java/com/crowdin/cli/commands/actions/FileUploadTranslationActionTest.java
@@ -1,101 +1,101 @@
-package com.crowdin.cli.commands.actions;
-
-import com.crowdin.cli.client.CrowdinProjectFull;
-import com.crowdin.cli.client.ProjectBuilder;
-import com.crowdin.cli.client.ProjectClient;
-import com.crowdin.cli.client.ResponseException;
-import com.crowdin.cli.commands.NewAction;
-import com.crowdin.cli.commands.Outputter;
-import com.crowdin.cli.properties.NewPropertiesWithFilesUtilBuilder;
-import com.crowdin.cli.properties.ProjectProperties;
-import com.crowdin.cli.properties.PropertiesWithFiles;
-import com.crowdin.cli.properties.helper.FileHelperTest;
-import com.crowdin.cli.properties.helper.TempProject;
-import com.crowdin.cli.utils.Utils;
-import com.crowdin.client.projectsgroups.model.Type;
-import com.crowdin.client.sourcefiles.model.Branch;
-import com.crowdin.client.translations.model.UploadTranslationsRequest;
-import com.crowdin.client.translations.model.UploadTranslationsStringsRequest;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.io.File;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.*;
-
-class FileUploadTranslationActionTest {
-    private TempProject project;
-
-    @BeforeEach
-    public void createProj() {
-        project = new TempProject(FileHelperTest.class);
-    }
-
-    @AfterEach
-    public void deleteProj() {
-        project.delete();
-    }
-
-    @Test
-    public void testUploadTranslation_FileBasedProject() throws ResponseException {
-        File fileToUpload = new File(project.getBasePath() + "first_uk.po");
-        project.addFile(Utils.normalizePath("first_uk.po"), "Hello, World!");
-        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
-            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
-            .setBasePath(project.getBasePath());
-        PropertiesWithFiles pb = pbBuilder.build();
-        ProjectClient client = mock(ProjectClient.class);
-        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
-            .addFile("/first.po", "gettext", 101L, null, null, null).build();
-        build.setType(Type.FILES_BASED);
-        when(client.downloadFullProject(any()))
-            .thenReturn(build);
-        when(client.uploadStorage(eq("first_uk.po"), any()))
-            .thenReturn(1L);
-
-        NewAction<ProjectProperties, ProjectClient> action = new FileUploadTranslationAction(fileToUpload, null, "/first.po", "ua", false);
-        action.act(Outputter.getDefault(), pb, client);
-
-        verify(client).downloadFullProject(any());
-        verify(client).uploadStorage(eq("first_uk.po"), any());
-        UploadTranslationsRequest request = new UploadTranslationsRequest() {{
-            setFileId(101L);
-            setStorageId(1L);
-        }};
-        verify(client).uploadTranslations(eq("ua"), eq(request));
-        verifyNoMoreInteractions(client);
-    }
-
-    @Test
-    public void testUploadTranslation_StringBasedProject() throws ResponseException {
-        File fileToUpload = new File(project.getBasePath() + "first_uk.po");
-        project.addFile(Utils.normalizePath("first_uk.po"), "Hello, World!");
-        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
-            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
-            .setBasePath(project.getBasePath());
-        PropertiesWithFiles pb = pbBuilder.build();
-        ProjectClient client = mock(ProjectClient.class);
-        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
-            .addBranches(2L, "main").build();
-        build.setType(Type.STRINGS_BASED);
-        when(client.downloadFullProject(any()))
-            .thenReturn(build);
-        when(client.uploadStorage(eq("first_uk.po"), any()))
-            .thenReturn(1L);
-
-        NewAction<ProjectProperties, ProjectClient> action = new FileUploadTranslationAction(fileToUpload, "main", null, "ua", false);
-        action.act(Outputter.getDefault(), pb, client);
-
-        verify(client).downloadFullProject(any());
-        verify(client).uploadStorage(eq("first_uk.po"), any());
-        UploadTranslationsStringsRequest request = new UploadTranslationsStringsRequest() {{
-            setBranchId(2L);
-            setStorageId(1L);
-        }};
-        verify(client).uploadTranslationStringsBased(eq("ua"), eq(request));
-        verifyNoMoreInteractions(client);
-    }
+package com.crowdin.cli.commands.actions;
+
+import com.crowdin.cli.client.CrowdinProjectFull;
+import com.crowdin.cli.client.ProjectBuilder;
+import com.crowdin.cli.client.ProjectClient;
+import com.crowdin.cli.client.ResponseException;
+import com.crowdin.cli.commands.NewAction;
+import com.crowdin.cli.commands.Outputter;
+import com.crowdin.cli.properties.NewPropertiesWithFilesUtilBuilder;
+import com.crowdin.cli.properties.ProjectProperties;
+import com.crowdin.cli.properties.PropertiesWithFiles;
+import com.crowdin.cli.properties.helper.FileHelperTest;
+import com.crowdin.cli.properties.helper.TempProject;
+import com.crowdin.cli.utils.Utils;
+import com.crowdin.client.projectsgroups.model.Type;
+import com.crowdin.client.sourcefiles.model.Branch;
+import com.crowdin.client.translations.model.UploadTranslationsRequest;
+import com.crowdin.client.translations.model.UploadTranslationsStringsRequest;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.io.File;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.*;
+
+class FileUploadTranslationActionTest {
+    private TempProject project;
+
+    @BeforeEach
+    public void createProj() {
+        project = new TempProject(FileHelperTest.class);
+    }
+
+    @AfterEach
+    public void deleteProj() {
+        project.delete();
+    }
+
+    @Test
+    public void testUploadTranslation_FileBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first_uk.po");
+        project.addFile(Utils.normalizePath("first_uk.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
+            .addFile("/first.po", "gettext", 101L, null, null, null).build();
+        build.setType(Type.FILES_BASED);
+        when(client.downloadFullProject(any()))
+            .thenReturn(build);
+        when(client.uploadStorage(eq("first_uk.po"), any()))
+            .thenReturn(1L);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadTranslationAction(fileToUpload, null, "/first.po", "ua", false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject(any());
+        verify(client).uploadStorage(eq("first_uk.po"), any());
+        UploadTranslationsRequest request = new UploadTranslationsRequest() {{
+            setFileId(101L);
+            setStorageId(1L);
+        }};
+        verify(client).uploadTranslations(eq("ua"), eq(request));
+        verifyNoMoreInteractions(client);
+    }
+
+    @Test
+    public void testUploadTranslation_StringBasedProject() throws ResponseException {
+        File fileToUpload = new File(project.getBasePath() + "first_uk.po");
+        project.addFile(Utils.normalizePath("first_uk.po"), "Hello, World!");
+        NewPropertiesWithFilesUtilBuilder pbBuilder = NewPropertiesWithFilesUtilBuilder
+            .minimalBuiltPropertiesBean("*", Utils.PATH_SEPARATOR + "%original_file_name%-CR-%locale%")
+            .setBasePath(project.getBasePath());
+        PropertiesWithFiles pb = pbBuilder.build();
+        ProjectClient client = mock(ProjectClient.class);
+        CrowdinProjectFull build = ProjectBuilder.emptyProject(Long.parseLong(pb.getProjectId()))
+            .addBranches(2L, "main").build();
+        build.setType(Type.STRINGS_BASED);
+        when(client.downloadFullProject(any()))
+            .thenReturn(build);
+        when(client.uploadStorage(eq("first_uk.po"), any()))
+            .thenReturn(1L);
+
+        NewAction<ProjectProperties, ProjectClient> action = new FileUploadTranslationAction(fileToUpload, "main", null, "ua", false);
+        action.act(Outputter.getDefault(), pb, client);
+
+        verify(client).downloadFullProject(any());
+        verify(client).uploadStorage(eq("first_uk.po"), any());
+        UploadTranslationsStringsRequest request = new UploadTranslationsStringsRequest() {{
+            setBranchId(2L);
+            setStorageId(1L);
+        }};
+        verify(client).uploadTranslationStringsBased(eq("ua"), eq(request));
+        verifyNoMoreInteractions(client);
+    }
 }
\ No newline at end of file
diff --git a/src/test/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommandTest.java b/src/test/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommandTest.java
index c97a809da..b9cdca86e 100644
--- a/src/test/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommandTest.java
+++ b/src/test/java/com/crowdin/cli/commands/picocli/FileDeleteSubcommandTest.java
@@ -1,21 +1,21 @@
-package com.crowdin.cli.commands.picocli;
-
-import org.junit.jupiter.api.Test;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.verify;
-
-class FileDeleteSubcommandTest extends PicocliTestUtils {
-
-    @Test
-    public void testFileDelete() {
-        this.execute(CommandNames.FILE, CommandNames.FILE_DELETE, "file.txt");
-        verify(actionsMock).fileDelete(any(), any());
-        this.check(true);
-    }
-
-    @Test
-    public void testFileDeleteInvalidOptions() {
-        this.executeInvalidParams(CommandNames.FILE, CommandNames.FILE_DELETE);
-    }
+package com.crowdin.cli.commands.picocli;
+
+import org.junit.jupiter.api.Test;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+
+class FileDeleteSubcommandTest extends PicocliTestUtils {
+
+    @Test
+    public void testFileDelete() {
+        this.execute(CommandNames.FILE, CommandNames.FILE_DELETE, "file.txt");
+        verify(actionsMock).fileDelete(any(), any());
+        this.check(true);
+    }
+
+    @Test
+    public void testFileDeleteInvalidOptions() {
+        this.executeInvalidParams(CommandNames.FILE, CommandNames.FILE_DELETE);
+    }
 }
\ No newline at end of file
diff --git a/src/test/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommandTest.java b/src/test/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommandTest.java
index 45f1905ad..368c11413 100644
--- a/src/test/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommandTest.java
+++ b/src/test/java/com/crowdin/cli/commands/picocli/FileDownloadSubcommandTest.java
@@ -1,28 +1,28 @@
-package com.crowdin.cli.commands.picocli;
-
-import org.junit.jupiter.api.Test;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.verify;
-
-class FileDownloadSubcommandTest extends PicocliTestUtils {
-
-    @Test
-    public void testFileDownload() {
-        this.execute(CommandNames.FILE, CommandNames.FILE_DOWNLOAD, "file.txt");
-        verify(actionsMock).fileDownload(any(), any(), any());
-        this.check(true);
-    }
-
-    @Test
-    public void testFileDownloadTranslations() {
-        this.execute(CommandNames.FILE, CommandNames.FILE_DOWNLOAD, "file.txt", "--language", "uk");
-        verify(actionsMock).fileDownloadTranslation(any(), any(), any(), any());
-        this.check(true);
-    }
-
-    @Test
-    public void testFileDownloadInvalidOptions() {
-        this.executeInvalidParams(CommandNames.FILE, CommandNames.FILE_DOWNLOAD);
-    }
+package com.crowdin.cli.commands.picocli;
+
+import org.junit.jupiter.api.Test;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.verify;
+
+class FileDownloadSubcommandTest extends PicocliTestUtils {
+
+    @Test
+    public void testFileDownload() {
+        this.execute(CommandNames.FILE, CommandNames.FILE_DOWNLOAD, "file.txt");
+        verify(actionsMock).fileDownload(any(), any(), any());
+        this.check(true);
+    }
+
+    @Test
+    public void testFileDownloadTranslations() {
+        this.execute(CommandNames.FILE, CommandNames.FILE_DOWNLOAD, "file.txt", "--language", "uk");
+        verify(actionsMock).fileDownloadTranslation(any(), any(), any(), any());
+        this.check(true);
+    }
+
+    @Test
+    public void testFileDownloadInvalidOptions() {
+        this.executeInvalidParams(CommandNames.FILE, CommandNames.FILE_DOWNLOAD);
+    }
 }
\ No newline at end of file
diff --git a/src/test/java/com/crowdin/cli/commands/picocli/FileUploadSubcommandTest.java b/src/test/java/com/crowdin/cli/commands/picocli/FileUploadSubcommandTest.java
index 7ec885bea..64bfbeebf 100644
--- a/src/test/java/com/crowdin/cli/commands/picocli/FileUploadSubcommandTest.java
+++ b/src/test/java/com/crowdin/cli/commands/picocli/FileUploadSubcommandTest.java
@@ -1,29 +1,29 @@
-package com.crowdin.cli.commands.picocli;
-
-import org.junit.jupiter.api.Test;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyBoolean;
-import static org.mockito.Mockito.verify;
-
-class FileUploadSubcommandTest extends PicocliTestUtils {
-
-    @Test
-    public void testFileUpload() {
-        this.execute(CommandNames.FILE, CommandNames.FILE_UPLOAD, "file.txt");
-        verify(actionsMock).fileUpload(any(), any(), anyBoolean(), any(), any(), any(), anyBoolean(), anyBoolean(), anyBoolean());
-        this.check(true);
-    }
-
-    @Test
-    public void testFileUploadTranslations() {
-        this.execute(CommandNames.FILE, CommandNames.FILE_UPLOAD, "file.txt", "--language", "uk");
-        verify(actionsMock).fileUploadTranslation(any(), any(), any(), any(), anyBoolean());
-        this.check(true);
-    }
-
-    @Test
-    public void testFileUploadInvalidOptions() {
-        this.executeInvalidParams(CommandNames.FILE, CommandNames.FILE_UPLOAD);
-    }
+package com.crowdin.cli.commands.picocli;
+
+import org.junit.jupiter.api.Test;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.Mockito.verify;
+
+class FileUploadSubcommandTest extends PicocliTestUtils {
+
+    @Test
+    public void testFileUpload() {
+        this.execute(CommandNames.FILE, CommandNames.FILE_UPLOAD, "file.txt");
+        verify(actionsMock).fileUpload(any(), any(), anyBoolean(), any(), any(), any(), anyBoolean(), anyBoolean(), anyBoolean());
+        this.check(true);
+    }
+
+    @Test
+    public void testFileUploadTranslations() {
+        this.execute(CommandNames.FILE, CommandNames.FILE_UPLOAD, "file.txt", "--language", "uk");
+        verify(actionsMock).fileUploadTranslation(any(), any(), any(), any(), anyBoolean());
+        this.check(true);
+    }
+
+    @Test
+    public void testFileUploadInvalidOptions() {
+        this.executeInvalidParams(CommandNames.FILE, CommandNames.FILE_UPLOAD);
+    }
 }
\ No newline at end of file
diff --git a/website/mantemplates/crowdin-file-delete.adoc b/website/mantemplates/crowdin-file-delete.adoc
index 640019536..599a4fbcd 100644
--- a/website/mantemplates/crowdin-file-delete.adoc
+++ b/website/mantemplates/crowdin-file-delete.adoc
@@ -1,16 +1,16 @@
-:includedir: ../generated-picocli-docs
-:command: crowdin-file-delete
-
-== crowdin file delete
-
-include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-description]
-
-include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-synopsis]
-
-include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-arguments]
-
-include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-commands]
-
-include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-options]
-
-include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-footer]
+:includedir: ../generated-picocli-docs
+:command: crowdin-file-delete
+
+== crowdin file delete
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-description]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-synopsis]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-arguments]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-commands]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-options]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-footer]
diff --git a/website/mantemplates/crowdin-file-download.adoc b/website/mantemplates/crowdin-file-download.adoc
index 410a483ba..815d5d842 100644
--- a/website/mantemplates/crowdin-file-download.adoc
+++ b/website/mantemplates/crowdin-file-download.adoc
@@ -1,19 +1,19 @@
-:includedir: ../generated-picocli-docs
-:command: crowdin-file-download
-
-== crowdin file download
-
-include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-description]
-
-include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-synopsis]
-
-include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-arguments]
-
-include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-commands]
-
-include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-options]
-
-include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-footer]
-
-=== Notes
-This command is experimental. Experimental features are not covered by semver and might change in the future. If you have any feedback, feel free to raise a discussion: https://github.com/crowdin/crowdin-cli/discussions
+:includedir: ../generated-picocli-docs
+:command: crowdin-file-download
+
+== crowdin file download
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-description]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-synopsis]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-arguments]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-commands]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-options]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-footer]
+
+=== Notes
+This command is experimental. Experimental features are not covered by semver and might change in the future. If you have any feedback, feel free to raise a discussion: https://github.com/crowdin/crowdin-cli/discussions
diff --git a/website/mantemplates/crowdin-file-upload.adoc b/website/mantemplates/crowdin-file-upload.adoc
index 15b6d7851..b9a664944 100644
--- a/website/mantemplates/crowdin-file-upload.adoc
+++ b/website/mantemplates/crowdin-file-upload.adoc
@@ -1,19 +1,19 @@
-:includedir: ../generated-picocli-docs
-:command: crowdin-file-upload
-
-== crowdin file upload
-
-include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-description]
-
-include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-synopsis]
-
-include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-arguments]
-
-include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-commands]
-
-include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-options]
-
-include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-footer]
-
-=== Notes
-This command is experimental. Experimental features are not covered by semver and might change in the future. If you have any feedback, feel free to raise a discussion: https://github.com/crowdin/crowdin-cli/discussions
+:includedir: ../generated-picocli-docs
+:command: crowdin-file-upload
+
+== crowdin file upload
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-description]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-synopsis]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-arguments]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-commands]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-options]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-footer]
+
+=== Notes
+This command is experimental. Experimental features are not covered by semver and might change in the future. If you have any feedback, feel free to raise a discussion: https://github.com/crowdin/crowdin-cli/discussions
diff --git a/website/mantemplates/crowdin-file.adoc b/website/mantemplates/crowdin-file.adoc
index 6b6207302..32c52ddd5 100644
--- a/website/mantemplates/crowdin-file.adoc
+++ b/website/mantemplates/crowdin-file.adoc
@@ -1,16 +1,16 @@
-:includedir: ../generated-picocli-docs
-:command: crowdin-file
-
-== crowdin file
-
-include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-description]
-
-include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-synopsis]
-
-include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-arguments]
-
-include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-commands]
-
-include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-options]
-
-include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-footer]
+:includedir: ../generated-picocli-docs
+:command: crowdin-file
+
+== crowdin file
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-description]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-synopsis]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-arguments]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-commands]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-options]
+
+include::{includedir}/{command}.adoc[tag=picocli-generated-man-section-footer]

From debd154baa6527218c1525584cfff20b2efda92c Mon Sep 17 00:00:00 2001
From: Kateryna Oblakevych <malutina.catya14@gmail.com>
Date: Tue, 23 Jan 2024 16:49:40 +0200
Subject: [PATCH 11/11] default param values

---
 .../cli/commands/picocli/FileUploadSubcommand.java        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java b/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java
index 18918372e..471c74f92 100644
--- a/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java
+++ b/src/main/java/com/crowdin/cli/commands/picocli/FileUploadSubcommand.java
@@ -36,11 +36,11 @@ class FileUploadSubcommand extends ActCommandProject {
     @Option(names = {"--excluded-language"}, descriptionKey = "params.excluded-languages", paramLabel = "...", order = -2)
     protected List<String> excludedLanguages;
 
-    @Option(names = {"--no-cleanup-mode"}, negatable = true, descriptionKey = "crowdin.file.upload.cleanup-mode", order = -2)
-    protected boolean cleanupMode = true;
+    @Option(names = {"--cleanup-mode"}, negatable = true, descriptionKey = "crowdin.file.upload.cleanup-mode", order = -2)
+    protected boolean cleanupMode = false;
 
-    @Option(names = {"--no-update-strings"}, negatable = true, descriptionKey = "crowdin.file.upload.update-strings", order = -2)
-    protected boolean updateStrings = true;
+    @Option(names = {"--update-strings"}, negatable = true, descriptionKey = "crowdin.file.upload.update-strings", order = -2)
+    protected boolean updateStrings = false;
 
     @Option(names = {"-l", "--language"}, paramLabel = "...", descriptionKey = "crowdin.file.language", order = -2)
     protected String languageId;