branch support

crowdin · Jul 21, 2023 · abbc6e5 · abbc6e5
1 parent 8b67da6
commit abbc6e5
Show file tree

Hide file tree

Showing 4 changed files with 58 additions and 14 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -30,6 +30,8 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: ./
+        with:
+          branch: main
         env:
           CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
           CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/translator.ts b/src/translator.ts
@@ -34,25 +34,44 @@ export class Translator {
         this.logger.log('info', 'Uploading sources...');
 
         const readmeFile = await this.getFile();
-
         const storageFile = await this.crowdin.uploadStorageApi.addStorage(
             this.config.file,
             fs.readFileSync(this.config.file)
         );
 
+        let branchId = undefined;
+
+        if (this.config.branch) {
+            let branch = await this.getBranch();
+
+            if (!branch) {
+                branch = (
+                    await this.crowdin.sourceFilesApi.createBranch(this.credentials.projectId, {
+                        name: this.config.branch
+                    })
+                ).data;
+
+                this.logger.log('info', `Branch ${branch.name} successfully created!`);
+            }
+
+            branchId = branch.id;
+        }
+
         if (readmeFile) {
             await this.crowdin.sourceFilesApi.updateOrRestoreFile(this.credentials.projectId, readmeFile.id, {
                 storageId: storageFile.data.id
             });
+
+            this.logger.log('info', 'Source file successfully updated!');
         } else {
             await this.crowdin.sourceFilesApi.createFile(this.credentials.projectId, {
                 storageId: storageFile.data.id,
                 name: this.config.file,
-                branchId: (await this.getBranch())?.id
+                branchId: branchId
             });
-        }
 
-        this.logger.log('info', 'Sources uploaded!');
+            this.logger.log('info', 'Source file successfully created!');
+        }
     }
 
     private async downloadTranslations(): Promise<string> {
@@ -67,11 +86,8 @@ export class Translator {
         }
 
         const result = await this.crowdin.translationsApi.buildProject(this.credentials.projectId, request);
-
         let status = result.data.status;
 
-        this.logger.log('info', `Status: ${status}`);
-
         while (status === 'inProgress') {
             const progress = await this.crowdin.translationsApi.checkBuildStatus(
                 this.credentials.projectId,
@@ -102,7 +118,7 @@ export class Translator {
     private async getFile(): Promise<SourceFilesModel.File | undefined> {
         const files = await this.crowdin.sourceFilesApi.listProjectFiles(this.credentials.projectId);
 
-        const sourceFile = files.data.find(file => file.data.path === `/${this.config.file}`);
+        const sourceFile = files.data.find(file => file.data.path === this.getFilePath());
 
         return sourceFile?.data;
     }
@@ -114,4 +130,12 @@ export class Translator {
 
         return crowdinBranch?.data;
     }
+
+    private getFilePath(): string {
+        if (this.config.branch) {
+            return `/${this.config.branch}/${this.config.file}`;
+        } else {
+            return `/${this.config.file}`;
+        }
+    }
 }