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

Now staged and unstaged use the same status to update the data (instead of executing it twice)

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2022-04-06 20:19:29 +02:00
parent 7f9da646ff
commit b53b9b0b79
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/kotlin/app/git/StatusManager.kt
View File

@ -10,11 +10,15 @@ import app.git.diff.LineType
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext import kotlinx.coroutines.withContext
import org.eclipse.jgit.api.Git import org.eclipse.jgit.api.Git
import org.eclipse.jgit.api.Status
import org.eclipse.jgit.diff.DiffEntry import org.eclipse.jgit.diff.DiffEntry
import org.eclipse.jgit.diff.RawText import org.eclipse.jgit.diff.RawText
import org.eclipse.jgit.dircache.DirCacheEditor.PathEdit import org.eclipse.jgit.dircache.DirCacheEditor.PathEdit
import org.eclipse.jgit.dircache.DirCacheEntry import org.eclipse.jgit.dircache.DirCacheEntry
import org.eclipse.jgit.lib.* import org.eclipse.jgit.lib.Constants
import org.eclipse.jgit.lib.FileMode
import org.eclipse.jgit.lib.ObjectInserter
import org.eclipse.jgit.lib.Repository
import java.io.ByteArrayInputStream import java.io.ByteArrayInputStream
import java.io.IOException import java.io.IOException
import java.nio.ByteBuffer import java.nio.ByteBuffer
@ -217,21 +221,22 @@ class StatusManager @Inject constructor(
.call() .call()
} }
suspend fun getStaged(git: Git) = suspend fun getStatus(git: Git) =
withContext(Dispatchers.IO) { withContext(Dispatchers.IO) {
git
// TODO Test on an empty repository or with a non-default state like merging or rebasing
val statusResult = git
.status() .status()
.call() .call()
}
val added = statusResult.added.map { suspend fun getStaged(status: Status) =
withContext(Dispatchers.IO) {
val added = status.added.map {
StatusEntry(it, StatusType.ADDED) StatusEntry(it, StatusType.ADDED)
} }
val modified = statusResult.changed.map { val modified = status.changed.map {
StatusEntry(it, StatusType.MODIFIED) StatusEntry(it, StatusType.MODIFIED)
} }
val removed = statusResult.removed.map { val removed = status.removed.map {
StatusEntry(it, StatusType.REMOVED) StatusEntry(it, StatusType.REMOVED)
} }
@ -242,24 +247,20 @@ class StatusManager @Inject constructor(
) )
} }
suspend fun getUnstaged(git: Git) = withContext(Dispatchers.IO) { suspend fun getUnstaged(status: Status) = withContext(Dispatchers.IO) {
// TODO Test uninitialized modules after the refactor // TODO Test uninitialized modules after the refactor
// val uninitializedSubmodules = submodulesManager.uninitializedSubmodules(git) // val uninitializedSubmodules = submodulesManager.uninitializedSubmodules(git)
val statusResult = git val added = status.untracked.map {
.status()
.call()
val added = statusResult.untracked.map {
StatusEntry(it, StatusType.ADDED) StatusEntry(it, StatusType.ADDED)
} }
val modified = statusResult.modified.map { val modified = status.modified.map {
StatusEntry(it, StatusType.MODIFIED) StatusEntry(it, StatusType.MODIFIED)
} }
val removed = statusResult.missing.map { val removed = status.missing.map {
StatusEntry(it, StatusType.REMOVED) StatusEntry(it, StatusType.REMOVED)
} }
val conflicting = statusResult.conflicting.map { val conflicting = status.conflicting.map {
StatusEntry(it, StatusType.CONFLICTING) StatusEntry(it, StatusType.CONFLICTING)
} }
@ -272,10 +273,11 @@ class StatusManager @Inject constructor(
} }
suspend fun getStatusSummary(git: Git): StatusSummary { suspend fun getStatusSummary(git: Git): StatusSummary {
val staged = getStaged(git) val status = getStatus(git)
val staged = getStaged(status)
val allChanges = staged.toMutableList() val allChanges = staged.toMutableList()
val unstaged = getUnstaged(git) val unstaged = getUnstaged(status)
allChanges.addAll(unstaged) allChanges.addAll(unstaged)
val groupedChanges = allChanges.groupBy { val groupedChanges = allChanges.groupBy {

5
src/main/kotlin/app/viewmodels/StatusViewModel.kt
View File

@ -68,8 +68,9 @@ class StatusViewModel @Inject constructor(
try { try {
_stageStatus.value = StageStatus.Loading _stageStatus.value = StageStatus.Loading
val staged = statusManager.getStaged(git) val status = statusManager.getStatus(git)
val unstaged = statusManager.getUnstaged(git) val staged = statusManager.getStaged(status)
val unstaged = statusManager.getUnstaged(status)
_stageStatus.value = StageStatus.Loaded(staged, unstaged) _stageStatus.value = StageStatus.Loaded(staged, unstaged)
} catch (ex: Exception) { } catch (ex: Exception) {