feat: Option for not automatically merging PR

Close #47
Enveloppe · Nov 27, 2022 · 13abc47 · 13abc47
1 parent ecda138
commit 13abc47
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 7 deletions.
diff --git a/plugin/i18n/locales/en-us.ts b/plugin/i18n/locales/en-us.ts
@@ -30,6 +30,8 @@ export default {
 	githubToken: "Github Token",
 	githubBranchHeading: "Main branch",
 	githubBranchDesc: 'If you use a different main branch than "main", you can specify it here.',
+	automaticallyMergePR: "Automatically merge pull requests",
+
 	// ---
 	// # Upload configuration # //
 	uploadConfig: "Upload configuration",

diff --git a/plugin/i18n/locales/fr-fr.ts b/plugin/i18n/locales/fr-fr.ts
@@ -30,6 +30,7 @@ export default {
 	githubToken: "Token GitHub",
 	githubBranchHeading: "Branche principale",
 	githubBranchDesc: "Si vous utilisez une branche principale différente de main, vous pouvez la spécifier ici.",
+	automaticallyMergePR: "Fusionner automatiquement les pull requests",
 	// ---
 	// # Upload configuration # //
 

diff --git a/plugin/i18n/locales/ru.ts b/plugin/i18n/locales/ru.ts
@@ -30,6 +30,7 @@ export default {
 	githubToken: "Github Token",
 	githubBranchHeading: "Main branch",
 	githubBranchDesc: 'If you use a different main branch than "main", you can specify it here.',
+	automaticallyMergePR: "Automatically merge PR",
 	// ---
 	// # Upload configuration # //
 	uploadConfig: "Настройки загрузки",
@@ -52,6 +53,7 @@ export default {
 	rootFolderDesc: "Добавлять этут папку к путям заданным через свойство frontmatter.",
 	useFrontmatterTitle: "Set the title from the frontmatter",
 	useFrontmatterTitleDesc: "Use a frontmatter value to generate the filename. By default, \"title\" is used.",
+
 	// ---
 	// # Text conversion # //
 	textConversion: "Преобразования текста",

diff --git a/plugin/i18n/locales/zh-cn.ts b/plugin/i18n/locales/zh-cn.ts
@@ -31,6 +31,8 @@ export default {
 	githubToken: "Github Token",
 	githubBranchHeading: "Main branch",
 	githubBranchDesc: 'If you use a different main branch than "main", you can specify it here.',
+	automaticallyMergePR: "Automatically merge PR",
+
 	// ---
 	// # Upload configuration # //
 	uploadConfig: "上传设置",

diff --git a/plugin/publishing/branch.ts b/plugin/publishing/branch.ts
@@ -163,7 +163,6 @@ export class GithubBranch extends FilesManagement {
 			return !success.every((value) => value === false);
 		}
 		else {
-			console.log('updateRepository', repoFrontmatter);
 			return await this.updateRepositoryOnOne(branchName, repoFrontmatter);
 		}
 	}
@@ -175,12 +174,15 @@ export class GithubBranch extends FilesManagement {
 		 */
 		try {
 			const pullRequest = await this.pullRequestOnRepo(branchName, repoFrontmatter);
-			const PRSuccess = await this.mergePullRequestOnRepo(branchName, true, pullRequest, repoFrontmatter);
-			if (PRSuccess) {
-				await this.deleteBranchOnRepo(branchName, repoFrontmatter);
-				return true
+			if (this.settings.automaticallyMergePR) {
+				const PRSuccess = await this.mergePullRequestOnRepo(branchName, true, pullRequest, repoFrontmatter);
+				if (PRSuccess) {
+					await this.deleteBranchOnRepo(branchName, repoFrontmatter);
+					return true
+				}
+				return false
 			}
-			return false
+			return true
 		}
 		catch (e) {
 			console.log(e);

diff --git a/plugin/settings.ts b/plugin/settings.ts
@@ -95,6 +95,17 @@ export class GithubPublisherSettings extends PluginSettingTab {
 					})
 			)
 
+		new Setting(containerEl)
+			.setName(t('automaticallyMergePR') as string)
+			.addToggle((toggle) =>
+				toggle
+					.setValue(this.plugin.settings.automaticallyMergePR)
+					.onChange(async (value) => {
+						this.plugin.settings.automaticallyMergePR = value
+						await this.plugin.saveSettings()
+					})
+			)
+
 		/* ------------------------------ *
 		 * 			Upload config		  *
 		 * ------------------------------ */

diff --git a/plugin/settings/interface.ts b/plugin/settings/interface.ts
@@ -37,6 +37,7 @@ export interface GitHubPublisherSettings {
 	excludeDataviewValue: string[];
 	metadataFileFields: string[];
 	shareExternalModified: boolean;
+	automaticallyMergePR: boolean;
 }
 
 export enum folderSettings {
@@ -84,7 +85,8 @@ export const DEFAULT_SETTINGS: GitHubPublisherSettings = {
 	excludeDataviewValue: [],
 	metadataFileFields:[],
 	frontmatterTitleKey: 'title',
-	shareExternalModified: false
+	shareExternalModified: false,
+	automaticallyMergePR: true
 }
 
 export interface LinkedNotes {