zen-gitsync 2.1.9 → 2.1.10

package/README.md

@@ -75,6 +75,12 @@ $ g --cwd=<path>
 start /min cmd /k "g -y --path=你要同步的文件夹 --interval"
 ```
 
+#### cmd 定时执行命令
+```shell
+start /min cmd /k "g --cmd=\"echo hello\" --cmd-interval=5"     # 每5秒执行一次echo hello
+start /min cmd /k "g --cmd=\"echo at-time\" --at=23:59" # 在23:59执行一次echo at-time
+```
+
 #### 不显示git diff内容
 ```shell
 $ g --no-diff

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zen-gitsync",
-  "version": "2.1.9",
+  "version": "2.1.10",
   "description": "一个 git 自动查看差异并提交的工具",
   "main": "index.js",
   "type": "module",
@@ -23,6 +23,8 @@
     "g:y": "g -y",
     "g:reset": "git reset --hard origin/main",
     "g:ui": "node ./src/gitCommit.js ui",
+    "g:test-cmd": "node ./src/gitCommit.js --cmd=\"echo zen-gitsync test\" --cmd-interval=5",
+    "g:test-cmd-at": "node ./src/gitCommit.js --cmd=\"echo at-time-test\" --at=21:09",
     "start:vue": "cd ./src/ui/client && npm run dev",
     "start:server": "node -e \"import('./src/ui/server/index.js').then(module => module.default())\""
   },

package/src/gitCommit.js

@@ -12,6 +12,7 @@ import config from './config.js';
 import dateFormat from 'date-fns/format';
 import logUpdate from 'log-update';
 import startUIServer from './ui/server/index.js';
+import { exec } from 'child_process';
 
 let countdownInterval = null;
 
@@ -138,7 +139,77 @@ async function main() {
 
   await handleConfigCommands();
 
-  judgeInterval();
+  // ========== 新增：自定义cmd定时/定点执行功能 ==========
+  const cmdArg = process.argv.find(arg => arg.startsWith('--cmd='));
+  if (cmdArg) {
+    const cmd = cmdArg.split('=')[1].replace(/^['"]|['"]$/g, '');
+    const atArg = process.argv.find(arg => arg.startsWith('--at='));
+    const intervalArg = process.argv.find(arg => arg.startsWith('--cmd-interval='));
+    if (atArg) {
+      // 定点执行
+      const atTime = atArg.split('=')[1].replace(/^['"]|['"]$/g, '');
+      const now = new Date();
+      let target;
+      if (/^\d{2}:\d{2}$/.test(atTime)) {
+        // 只给了时:分，今天的
+        const [h, m] = atTime.split(':');
+        target = new Date(now.getFullYear(), now.getMonth(), now.getDate(), h, m, 0);
+      } else {
+        target = new Date(atTime);
+      }
+      const delay = target - now;
+      if (delay > 0) {
+        console.log(`将在 ${target.toLocaleString()} 执行: ${cmd}`);
+        setTimeout(() => {
+          console.log(`\n[自定义命令执行] ${new Date().toLocaleString()}\n> ${cmd}`);
+          exec(cmd, (err, stdout, stderr) => {
+            if (err) {
+              console.error(`[自定义命令错误]`, err.message);
+            }
+            if (stdout) console.log(`[自定义命令输出]\n${stdout}`);
+            if (stderr) console.error(`[自定义命令错误输出]\n${stderr}`);
+          });
+        }, delay);
+      } else {
+        console.log('指定时间已过，不执行自定义命令');
+      }
+    } else if (intervalArg) {
+      // 定时循环执行
+      const interval = parseInt(intervalArg.split('=')[1], 10) * 1000;
+      console.log(`每隔 ${interval/1000} 秒执行: ${cmd}`);
+      setInterval(() => {
+        console.log(`\n[自定义命令执行] ${new Date().toLocaleString()}\n> ${cmd}`);
+        exec(cmd, (err, stdout, stderr) => {
+          if (err) {
+            console.error(`[自定义命令错误]`, err.message);
+          }
+          if (stdout) console.log(`[自定义命令输出]\n${stdout}`);
+          if (stderr) console.error(`[自定义命令错误输出]\n${stderr}`);
+        });
+      }, interval);
+    } else {
+      // 立即执行一次
+      console.log(`[自定义命令立即执行] > ${cmd}`);
+      exec(cmd, (err, stdout, stderr) => {
+        if (err) {
+          console.error(`[自定义命令错误]`, err.message);
+        }
+        if (stdout) console.log(`[自定义命令输出]\n${stdout}`);
+        if (stderr) console.error(`[自定义命令错误输出]\n${stderr}`);
+      });
+    }
+  }
+  // ========== 新增功能结束 ==========
+
+  // 判断是否需要执行git自动提交
+  const hasGitTask = process.argv.some(arg =>
+    arg.startsWith('--interval') ||
+    arg === '-y' ||
+    arg.startsWith('-m')
+  );
+  if (hasGitTask || !cmdArg) {
+    judgeInterval();
+  }
 }
 
 const showStartInfo = (interval) => {

package/src/utils/index.js

@@ -303,7 +303,15 @@ Options:
   addResetScript             Add "g:reset": "git reset --hard origin/<current-branch>" to package.json scripts
   ui                         Launch graphical user interface (v2.0.0)
 
+  --cmd="your-cmd"            Execute custom cmd command (immediately, at a time, or periodically)
+  --cmd-interval=<seconds>    Execute custom cmd every N seconds
+  --at="HH:MM"                Execute custom cmd at a specific time (today) or --at="YYYY-MM-DD HH:MM:SS"
+
 Example:
+  g --cmd="echo hello" --cmd-interval=5      # 每5秒执行一次echo hello
+  g --cmd="echo at-time" --at=23:59          # 在23:59执行一次echo at-time
+  g --cmd="echo now"                         # 立即执行一次echo now
+  g --cmd="echo hi" --cmd-interval=10 --interval=60  # cmd和git自动提交并行
   g -m "Initial commit"      Commit with a custom message
   g -m=Fix-bug              Commit with a custom message (no spaces around '=')
   g -y                      Auto commit with the default message