From 511eef1e55a4be162fa02322ed67a82b6d2f6143 Mon Sep 17 00:00:00 2001
From: Victor Giers <giers@MacBook-Pro.local>
Date: Thu, 27 Nov 2025 11:21:11 +0100
Subject: [PATCH] auto-git:  [change] main.js

---
 main.js | 77 +++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 59 insertions(+), 18 deletions(-)

diff --git a/main.js b/main.js
index 39b08f7..2a63fde 100755
--- a/main.js
+++ b/main.js
@@ -293,20 +293,6 @@ function buildCommitMessageFromStatus(status, prefix = '[auto]') {
   return prefix + '\n' + changes.map(l => ` ${l}`).join('\n');
 }
 
-
-
-function ensureInGitignore(folderPath, name) {
-  const gitignorePath = path.join(folderPath, '.gitignore');
-  let lines = [];
-  if (fs.existsSync(gitignorePath)) {
-    lines = fs.readFileSync(gitignorePath, 'utf-8').split(/\r?\n/);
-  }
-  // Schon drin?
-  if (lines.some(line => line.trim() === name)) return;
-  // Anfügen
-  fs.appendFileSync(gitignorePath, '\n' + name + '\n');
-}
-
 const IGNORED_NAMES = [
   // Betriebssystem-spezifische Dateien
   '.DS_Store',         // macOS
@@ -669,6 +655,26 @@ const IGNORED_NAMES = [
 const monitoringQueues = new Map(); // Map: folderPath -> Array<Function>
 const monitoringActive = new Map(); // Map: folderPath -> Boolean (ob Task aktiv)
 
+const MONITOR_DEFAULT_IGNORES = [
+  '.git',
+  'node_modules',
+  'dist',
+  'build',
+  'out',
+  '.next',
+  '.nuxt',
+  '.turbo',
+  '.parcel-cache',
+  '.cache',
+  'coverage',
+  'logs',
+  'tmp',
+  'temp',
+  '*.log',
+  '*.tmp',
+  '*.swp'
+];
+
 function enqueueTask(folderPath, fn) {
   if (!monitoringQueues.has(folderPath)) monitoringQueues.set(folderPath, []);
   monitoringQueues.get(folderPath).push(fn);
@@ -693,7 +699,7 @@ async function processQueue(folderPath) {
 
 
 
-function ensureInGitignore(folderPath, name) {
+function ensureInGitignore(folderPath, name, igInstance) {
   const gitignorePath = path.join(folderPath, '.gitignore');
   let lines = [];
   if (fs.existsSync(gitignorePath)) {
@@ -701,6 +707,9 @@ function ensureInGitignore(folderPath, name) {
   }
   if (lines.some(line => line.trim() === name)) return false;
   fs.appendFileSync(gitignorePath, name + '\n');
+  if (igInstance) {
+    igInstance.add(name);
+  }
   return true;
 }
 
@@ -709,6 +718,7 @@ function startMonitoringWatcher(folderPath, win) {
 
   // 1. Load .gitignore (and add default rules for .git, node_modules, etc.)
   const ig = ignore();
+  ig.add(MONITOR_DEFAULT_IGNORES);
   const gitignorePath = path.join(folderPath, '.gitignore');
   if (fs.existsSync(gitignorePath)) {
     ig.add(fs.readFileSync(gitignorePath, 'utf-8'));
@@ -731,7 +741,7 @@ function startMonitoringWatcher(folderPath, win) {
   // 3. Create the watcher, now with deep ignore support!
   const watcher = chokidar.watch(folderPath, {
     ignored: ignoredFunc,
-    ignoreInitial: false,
+    ignoreInitial: true,
     persistent: true,
     depth: 99,
     awaitWriteFinish: { stabilityThreshold: 300, pollInterval: 100 }
@@ -739,11 +749,14 @@ function startMonitoringWatcher(folderPath, win) {
 
   let debounceTimer = null;
   let pendingNames = new Set();
+  let pendingPaths = new Set();
 
   function handleDebounced() {
     enqueueTask(folderPath, async () => {
       const namesArr = Array.from(pendingNames);
+      const pathsArr = Array.from(pendingPaths);
       pendingNames.clear();
+      pendingPaths.clear();
 
       // .gitignore sofort synchron aktualisieren (im Event-Handler)
       let gitignoreChanged = false;
@@ -751,16 +764,30 @@ function startMonitoringWatcher(folderPath, win) {
         for (const name of IGNORED_NAMES) {
           if (name.includes('*')) {
             if (micromatch.isMatch(fileOrDirName, name)) {
-              gitignoreChanged = ensureInGitignore(folderPath, name) || gitignoreChanged;
+              gitignoreChanged = ensureInGitignore(folderPath, name, ig) || gitignoreChanged;
             }
           } else {
             if (fileOrDirName === name.replace(/\/$/, '')) {
-              gitignoreChanged = ensureInGitignore(folderPath, name) || gitignoreChanged;
+              gitignoreChanged = ensureInGitignore(folderPath, name, ig) || gitignoreChanged;
             }
           }
         }
       }
 
+      if (gitignoreChanged) {
+        const toUnwatch = [];
+        for (const p of pathsArr) {
+          const rel = path.relative(folderPath, p);
+          if (ig.ignores(rel)) {
+            toUnwatch.push(p);
+          }
+        }
+        if (toUnwatch.length) {
+          watcher.unwatch(toUnwatch);
+          debug(`[MONITOR] Unwatched ${toUnwatch.length} path(s) after adding ignores for ${folderPath}`);
+        }
+      }
+
       // Danach wie gehabt:
       const git = simpleGit(folderPath);
       const status = await git.status();
@@ -782,11 +809,25 @@ function startMonitoringWatcher(folderPath, win) {
     watcher.on(ev, filePath => {
       const fileOrDirName = path.basename(filePath);
       pendingNames.add(fileOrDirName);
+      pendingPaths.add(filePath);
       if (debounceTimer) clearTimeout(debounceTimer);
       debounceTimer = setTimeout(handleDebounced, 500);
     });
   });
 
+  watcher.on('error', err => {
+    debug(`[MONITOR] Watcher error for ${folderPath}: ${err.message || err}`);
+    if (err && err.code === 'EMFILE') {
+      let folders = store.get('folders') || [];
+      folders = folders.map(f =>
+        f.path === folderPath ? { ...f, monitoring: false } : f
+      );
+      store.set('folders', folders);
+      stopMonitoringWatcher(folderPath);
+      win.webContents.send('monitoring-error', { path: folderPath, code: 'EMFILE' });
+    }
+  });
+
   // Initialer Commit (direkt in Queue, wie ein Event)
   enqueueTask(folderPath, async () => {
     debug(`[MONITOR] Starte initialen Commit-Check für ${folderPath}`);