Julian/Gitnuro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed repo refreshing when detecting changes in message files

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2022-06-09 03:11:31 +02:00
parent 8f2598d866
commit e32498d0c7
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/kotlin/app/git/FileChangesWatcher.kt
View File

@ -58,6 +58,15 @@ class FileChangesWatcher @Inject constructor() {
val hasGitDirectoryChanged = dir.startsWith("$pathStr$systemSeparator.git$systemSeparator") val hasGitDirectoryChanged = dir.startsWith("$pathStr$systemSeparator.git$systemSeparator")
if(events.count() == 1) {
val fileChanged = events.first().context().toString()
val fullPathOfFileChanged = "$pathStr$systemSeparator.git$systemSeparator$fileChanged"
// Ignore COMMIT_EDITMSG changes
if(isGitMessageFile(pathStr, fullPathOfFileChanged))
return@withContext
}
println("Has git dir changed: $hasGitDirectoryChanged") println("Has git dir changed: $hasGitDirectoryChanged")
_changesNotifier.emit(hasGitDirectoryChanged) _changesNotifier.emit(hasGitDirectoryChanged)
@ -86,4 +95,10 @@ class FileChangesWatcher @Inject constructor() {
key.reset() key.reset()
} }
} }
private fun isGitMessageFile(repoPath: String, fullPathOfFileChanged: String): Boolean {
val gitDir = "$repoPath$systemSeparator.git${systemSeparator}"
return fullPathOfFileChanged == "${gitDir}COMMIT_EDITMSG" ||
fullPathOfFileChanged == "${gitDir}MERGE_MSG"
}
} }