zen-gitsync 1.3.6 → 1.3.9

package/README.md

@@ -28,6 +28,14 @@ $ g
 ```bash
 $ g -y
 ```
+#### 设置默认提交信息：
+```bash
+$ g --set-default-message="提交"
+```
+#### 获取默认提交信息：
+```bash
+$ g get-config
+```
 #### 传入message直接提交：
 ```bash
 $ g -m <message>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zen-gitsync",
-  "version": "1.3.6",
+  "version": "1.3.9",
   "description": "一个 git 自动查看差异并提交的工具",
   "main": "index.js",
   "type": "module",
@@ -16,7 +16,9 @@
     "g:no-diff": "node ./src/gitCommit.js --no-diff",
     "g:log": "node ./src/gitCommit.js log",
     "g:log5": "node ./src/gitCommit.js log --n=5",
-    "g:h": "node ./src/gitCommit.js -h"
+    "g:h": "node ./src/gitCommit.js -h",
+    "g:get-config": "node ./src/gitCommit.js get-config",
+    "g:set-default-message": "node ./src/gitCommit.js --set-default-message=\"提交\""
   },
   "files": [
     "src/*",

package/src/config.js

@@ -1,3 +1,30 @@
-export default {
-  "defaultCommitMessage": "submit"
+import { promises as fs } from 'fs';
+import path from 'path';
+import os from 'os';
+
+const configPath = path.join(os.homedir(), '.git-commit-tool.json');
+
+// 默认配置
+const defaultConfig = {
+  defaultCommitMessage: "submit"
+};
+
+// 异步读取配置文件
+async function loadConfig() {
+  try {
+    const data = await fs.readFile(configPath, 'utf-8');
+    return { ...defaultConfig, ...JSON.parse(data) };
+  } catch (error) {
+    return defaultConfig;
+  }
+}
+
+// 异步保存配置
+async function saveConfig(config) {
+  await fs.writeFile(configPath, JSON.stringify(config, null, 2), 'utf-8');
 }
+
+export default {
+  loadConfig,
+  saveConfig
+};

package/src/gitCommit.js

@@ -7,8 +7,8 @@ import readline from 'readline'
 import ora from 'ora';
 import chalk from 'chalk';
 import boxen from 'boxen';
-import config from './config.js'
-
+import config from './config.js';
+const { loadConfig, saveConfig } = config;
 const {defaultCommitMessage} = config
 
 let timer = null
@@ -17,16 +17,18 @@ const showHelp = () => {
 Usage: g [options]
 
 Options:
-  -h, --help              Show this help message
-  -y                      Auto commit with default message
-  -m <message>            Commit message (use quotes if message contains spaces)
-  -m=<message>            Commit message (use this form without spaces around '=')
-  --path=<path>           Set custom working directory
-  --cwd=<path>            Set custom working directory
-  --interval=<seconds>    Set interval time for automatic commits (in seconds)
-  log                     Show git commit logs
-    --n=<number>          Number of commits to show with --log
-  --no-diff               Skip displaying git diff
+  -h, --help                   Show this help message
+  --set-default-message=<msg>  Set default commit message
+  get-config                   Show current configuration
+  -y                           Auto commit with default message
+  -m <message>                 Commit message (use quotes if message contains spaces)
+  -m=<message>                 Commit message (use this form without spaces around '=')
+  --path=<path>                Set custom working directory
+  --cwd=<path>                 Set custom working directory
+  --interval=<seconds>         Set interval time for automatic commits (in seconds)
+  log                          Show git commit logs
+    --n=<number>               Number of commits to show with --log
+  --no-diff                    Skip displaying git diff
 
 Example:
   g -m "Initial commit"      Commit with a custom message
@@ -49,7 +51,25 @@ Start a background process for automatic commits:
   console.log(helpMessage);
   process.exit();
 };
+// 添加配置管理函数
+async function handleConfigCommands() {
+  if (process.argv.includes('get-config')) {
+    const currentConfig = await loadConfig();
+    console.log('Current configuration:');
+    console.log(currentConfig);
+    process.exit();
+  }
 
+  const setMsgArg = process.argv.find(arg => arg.startsWith('--set-default-message='));
+  if (setMsgArg) {
+    const newMessage = setMsgArg.split('=')[1];
+    const currentConfig = await loadConfig();
+    currentConfig.defaultCommitMessage = newMessage;
+    await saveConfig(currentConfig);
+    console.log(chalk.green(`✓ 默认提交信息已设置为: "${newMessage}"`));
+    process.exit();
+  }
+}
 const judgePlatform = () => {
   // 判断是否是 Windows 系统
   if (os.platform() === 'win32') {
@@ -91,8 +111,11 @@ class GitCommit {
   constructor(options) {
     this.statusOutput = null
     this.exit = options.exit
-    this.commitMessage = defaultCommitMessage
-    this.init()
+    // 从配置加载默认提交信息
+    loadConfig().then(config => {
+      this.commitMessage = config.defaultCommitMessage;
+      this.init();
+    });
   }
 
   exec_exit() {
@@ -323,7 +346,7 @@ class GitCommit {
     let {encoding = 'utf-8', maxBuffer = 30 * 1024 * 1024, head = command, log = true} = options
     try {
       let cwd = getCwd()
-      const output = execSync(command, {encoding, maxBuffer, cwd})
+      const output = execSync(command, {env: { ...process.env, LANG: 'C.UTF-8' },encoding, maxBuffer, cwd})
       if (options.spinner) {
         options.spinner.stop();
       }
@@ -341,7 +364,7 @@ class GitCommit {
     return new Promise((resolve, reject) => {
       let {encoding = 'utf-8', maxBuffer = 30 * 1024 * 1024, head = command, log = true} = options
       let cwd = getCwd()
-      exec(command, {encoding, maxBuffer, cwd}, (error, stdout, stderr) => {
+      exec(command, {env: { ...process.env, LANG: 'C.UTF-8' },encoding, maxBuffer, cwd}, (error, stdout, stderr) => {
         if (options.spinner) {
           options.spinner.stop();
         }
@@ -365,7 +388,11 @@ class GitCommit {
     })
   }
 }
-
+// 在 judgeInterval 函数前添加配置命令处理
+async function main() {
+  await handleConfigCommands();
+  judgeInterval();
+}
 const judgeInterval = () => {
   // 判断是否有 --interval 参数
   const intervalArg = process.argv.find(arg => arg.startsWith('--interval'));
@@ -400,4 +427,4 @@ const judgeInterval = () => {
   }
 };
 
-judgeInterval()
+main()