feat(settings): 模版绑值

Author: fulin

src/main/java/com/fulinlin/action/CreateCommitAction.java

@@ -32,7 +32,7 @@ public void actionPerformed(AnActionEvent actionEvent) {
         CommitDialog dialog = new CommitDialog(actionEvent.getProject(),settings);
         dialog.show();
         if (dialog.getExitCode() == DialogWrapper.OK_EXIT_CODE) {
-            commitPanel.setCommitMessage(dialog.getCommitMessage().toString());
+            commitPanel.setCommitMessage(dialog.getCommitMessage(settings).toString());
         }
     }
 

src/main/java/com/fulinlin/ui/CommitDialog.java

@@ -25,8 +25,8 @@ protected JComponent createCenterPanel() {
         return panel.getMainPanel();
     }
 
-    public CommitMessage getCommitMessage() {
-        return panel.getCommitMessage();
+    public CommitMessage getCommitMessage(GitCommitMessageHelperSettings settings) {
+        return panel.getCommitMessage(settings);
     }
 
 }

src/main/java/com/fulinlin/ui/CommitMessage.java

@@ -1,6 +1,10 @@
 package com.fulinlin.ui;
 
 import com.fulinlin.model.ChangeType;
+import com.fulinlin.model.CommitTemplate;
+import com.fulinlin.model.TypeAlias;
+import com.fulinlin.storage.GitCommitMessageHelperSettings;
+import com.fulinlin.utils.VelocityUtils;
 import org.apache.commons.lang.WordUtils;
 
 import static org.apache.commons.lang.StringUtils.isNotBlank;
@@ -12,44 +16,36 @@ public class CommitMessage {
     private static final int MAX_LINE_LENGTH = 72; // https://stackoverflow.com/a/2120040/5138796
     private final String content;
 
-   public CommitMessage(ChangeType changeType, String changeScope, String shortDescription, String longDescription, String closedIssues, String breakingChanges) {
-        this.content = buildContent(changeType, changeScope, shortDescription, longDescription, closedIssues, breakingChanges);
+    public CommitMessage(GitCommitMessageHelperSettings settings, TypeAlias typeAlias, String changeScope, String shortDescription, String longDescription, String closedIssues, String breakingChanges) {
+        this.content = buildContent(
+                settings,
+                typeAlias,
+                changeScope,
+                shortDescription,
+                longDescription,
+                breakingChanges,
+                closedIssues
+        );
     }
 
-    private String buildContent(ChangeType changeType, String changeScope, String shortDescription, String longDescription, String closedIssues, String breakingChanges) {
-        StringBuilder builder = new StringBuilder();
-        builder.append(changeType.label());
-        if (isNotBlank(changeScope)) {
-            builder
-                    .append('(')
-                    .append(changeScope)
-                    .append(')');
-        }
-        builder
-                .append(": ")
-                .append(shortDescription)
-                .append(System.lineSeparator())
-                .append(System.lineSeparator())
-                .append(WordUtils.wrap(longDescription, MAX_LINE_LENGTH));
-
-        if (isNotBlank(breakingChanges)) {
-            builder
-                    .append(System.lineSeparator())
-                    .append(System.lineSeparator())
-                    .append(WordUtils.wrap("BREAKING CHANGE: " + breakingChanges, MAX_LINE_LENGTH));
-        }
-
-        if (isNotBlank(closedIssues)) {
-            builder.append(System.lineSeparator());
-            for (String closedIssue : closedIssues.split(",")) {
-                builder
-                        .append(System.lineSeparator())
-                        .append("Closes ")
-                        .append(closedIssue);
-            }
-        }
-
-        return builder.toString();
+    private String buildContent(GitCommitMessageHelperSettings settings,
+                                TypeAlias typeAlias,
+                                String changeScope,
+                                String shortDescription,
+                                String longDescription,
+                                String breakingChanges,
+                                String closedIssues
+    ) {
+
+        CommitTemplate commitTemplate = new CommitTemplate();
+        commitTemplate.setType(typeAlias.toString());
+        commitTemplate.setScope(changeScope);
+        commitTemplate.setSubject(shortDescription);
+        commitTemplate.setBody(longDescription);
+        commitTemplate.setChanges(breakingChanges);
+        commitTemplate.setCloses(closedIssues);
+        String template = settings.getDateSettings().getTemplate();
+        return VelocityUtils.convert(template, commitTemplate);
     }
 
     @Override

src/main/java/com/fulinlin/ui/CommitPanel.java

@@ -37,9 +37,10 @@ JPanel getMainPanel() {
         return mainPanel;
     }
 
-    CommitMessage getCommitMessage() {
+    CommitMessage getCommitMessage(GitCommitMessageHelperSettings settings) {
         return new CommitMessage(
-                (ChangeType) changeType.getSelectedItem(),
+                settings,
+                (TypeAlias) changeType.getSelectedItem(),
                 (String) changeScope.getSelectedItem(),
                 shortDescription.getText().trim(),
                 longDescription.getText().trim(),

src/main/java/com/fulinlin/utils/VelocityUtils.java

@@ -33,7 +33,7 @@ public class VelocityUtils {
     public static String convert(String template, CommitTemplate commitTemplate) {
         StringWriter writer = new StringWriter();
         VelocityContext velocityContext = new VelocityContext();
-        velocityContext.put("type", commitTemplate.getBody());
+        velocityContext.put("type", commitTemplate.getType());
         velocityContext.put("scope", commitTemplate.getScope());
         velocityContext.put("subject", commitTemplate.getSubject());
         velocityContext.put("body", commitTemplate.getBody());