giers10/auto-git-gui
1
0
Fork 0
Code Releases Activity

Add .gitignore default entries and skip initial commit check

Browse Source
This commit is contained in:
Victor Giers
2025-11-27 11:45:43 +01:00
parent f38af64e40
commit c508800f83
2 changed files with 51 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
main.js
View File

@@ -269,15 +269,39 @@ function watchRepo(folder, win) {
repoWatchers.set(folder, watcher); repoWatchers.set(folder, watcher);
}*/ }*/
function ensureGitignoreDefaults(folderPath) {
const gitignorePath = path.join(folderPath, '.gitignore');
const existing = new Set();
if (fs.existsSync(gitignorePath)) {
fs.readFileSync(gitignorePath, 'utf-8')
.split(/\r?\n/)
.map(l => l.trim())
.filter(Boolean)
.forEach(l => existing.add(l));
}
let changed = false;
for (const entry of MONITOR_DEFAULT_IGNORES) {
if (!existing.has(entry)) {
existing.add(entry);
changed = true;
}
}
if (changed || !fs.existsSync(gitignorePath)) {
fs.writeFileSync(gitignorePath, Array.from(existing).join('\n') + '\n', 'utf-8');
}
}
/** /**
* Initiiert ein Git-Repo in `folder`, falls noch nicht vorhanden, * Initiiert ein Git-Repo in `folder`, falls noch nicht vorhanden,
* erzeugt bei Bedarf einen leeren Initial-Commit. * legt ein .gitignore mit Standard-Einträgen an und erstellt einen Initial-Commit.
*/ */
async function initGitRepo(folder) { async function initGitRepo(folder) {
const git = simpleGit(folder); const git = simpleGit(folder);
const gitDir = path.join(folder, '.git'); const gitDir = path.join(folder, '.git');
if (!fs.existsSync(gitDir)) { if (!fs.existsSync(gitDir)) {
await git.init(); await git.init();
ensureGitignoreDefaults(folder);
await git.add(['.gitignore']);
await git.commit('initial commit', undefined, { '--allow-empty': null }); await git.commit('initial commit', undefined, { '--allow-empty': null });
} }
} }
@@ -751,8 +775,9 @@ function exceedsFileLimit(folderPath, igInstance, limit = 20000) {
return false; return false;
} }
function startMonitoringWatcher(folderPath, win) { function startMonitoringWatcher(folderPath, win, opts = {}) {
if (monitoringWatchers.has(folderPath)) return; if (monitoringWatchers.has(folderPath)) return;
const skipInitialCheck = !!opts.skipInitialCheck;
if (!fs.existsSync(path.join(folderPath, '.git'))) { if (!fs.existsSync(path.join(folderPath, '.git'))) {
debug(`[MONITOR] Überspringe Watcher für ${folderPath}: kein Git-Repo`); debug(`[MONITOR] Überspringe Watcher für ${folderPath}: kein Git-Repo`);
@@ -883,25 +908,29 @@ function startMonitoringWatcher(folderPath, win) {
}); });
// Initialer Commit (direkt in Queue, wie ein Event) // Initialer Commit (direkt in Queue, wie ein Event)
enqueueTask(folderPath, async () => { if (!skipInitialCheck) {
debug(`[MONITOR] Starte initialen Commit-Check für ${folderPath}`); enqueueTask(folderPath, async () => {
const git = simpleGit(folderPath); debug(`[MONITOR] Starte initialen Commit-Check für ${folderPath}`);
const status = await git.status(); const git = simpleGit(folderPath);
if ( const status = await git.status();
status.not_added.length > 0 || if (
status.created.length > 0 || status.not_added.length > 0 ||
status.modified.length > 0 || status.created.length > 0 ||
status.deleted.length > 0 || status.modified.length > 0 ||
status.renamed.length > 0 status.deleted.length > 0 ||
) { status.renamed.length > 0
const msg = buildCommitMessageFromStatus(status, 'auto-git: '); ) {
const did = await autoCommit(folderPath, msg, win); const msg = buildCommitMessageFromStatus(status, 'auto-git: ');
if (did) { const did = await autoCommit(folderPath, msg, win);
win.webContents.send('repo-updated', folderPath); if (did) {
debug(`[MONITOR] Initialer Auto-Commit für ${folderPath} durchgeführt:\n${msg}`); win.webContents.send('repo-updated', folderPath);
debug(`[MONITOR] Initialer Auto-Commit für ${folderPath} durchgeführt:\n${msg}`);
}
} }
} });
}); } else {
debug(`[MONITOR] Überspringe initialen Commit-Check für ${folderPath}`);
}
monitoringWatchers.set(folderPath, watcher); monitoringWatchers.set(folderPath, watcher);
debug(`[MONITOR] Watcher aktiv für ${folderPath}`); debug(`[MONITOR] Watcher aktiv für ${folderPath}`);
@@ -2201,7 +2230,7 @@ function buildTrayMenu() {
: f : f
); );
store.set('folders', folders); store.set('folders', folders);
startMonitoringWatcher(folderPath, win); startMonitoringWatcher(folderPath, win, { skipInitialCheck: true });
return { success: true }; return { success: true };
} catch (err) { } catch (err) {
return { success: false, error: err.message || String(err) }; return { success: false, error: err.message || String(err) };

1
renderer.js
View File

@@ -500,6 +500,7 @@ window.addEventListener('DOMContentLoaded', async () => {
initRepoBtn.disabled = isGit; initRepoBtn.disabled = isGit;
readmeBtn.disabled = !isGit; readmeBtn.disabled = !isGit;
pushBtn.disabled = !isGit; pushBtn.disabled = !isGit;
pushBtn.classList.toggle('hidden', !isGit);
if (!isGit) { if (!isGit) {
contentList.innerHTML = '<div class="p-6 text-gray-500">Not a Git repository. Click "Init Repo" to initialize.</div>'; contentList.innerHTML = '<div class="p-6 text-gray-500">Not a Git repository. Click "Init Repo" to initialize.</div>';
paginationEl.innerHTML = ''; paginationEl.innerHTML = '';