luisgulo/Gitnuro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed excessive refreshes when running operations from gitnuro

Browse source 
Also fixed diff load looping when using LFS, which produces files in .git dir to change
This commit is contained in:
Abdelilah El Aissaoui 2023-08-19 14:44:25 +02:00
parent 35412288e5
commit c104c681f4
3 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
rs/src/lib.rs
View file

@ -33,8 +33,6 @@ fn watch_directory(
while notifier.should_keep_looping() { while notifier.should_keep_looping() {
match rx.recv_timeout(Duration::from_secs(1)) { match rx.recv_timeout(Duration::from_secs(1)) {
Ok(e) => { Ok(e) => {
println!("{:?}", e);
if let Some(paths) = get_paths_from_event_result(&e) { if let Some(paths) = get_paths_from_event_result(&e) {
notifier.detected_change(paths) notifier.detected_change(paths)
} }

6
src/main/kotlin/com/jetpackduba/gitnuro/git/TabState.kt
View file

@ -40,6 +40,8 @@ class TabState @Inject constructor(
val selectedItem: StateFlow<SelectedItem> = _selectedItem val selectedItem: StateFlow<SelectedItem> = _selectedItem
private val _taskEvent = MutableSharedFlow<TaskEvent>() private val _taskEvent = MutableSharedFlow<TaskEvent>()
val taskEvent: SharedFlow<TaskEvent> = _taskEvent val taskEvent: SharedFlow<TaskEvent> = _taskEvent
var lastOperation: Long = 0
private set
private var unsafeGit: Git? = null private var unsafeGit: Git? = null
val git: Git val git: Git
@ -88,6 +90,8 @@ class TabState @Inject constructor(
var refreshEvenIfCrashesInteractiveResult = false var refreshEvenIfCrashesInteractiveResult = false
operationRunning = true operationRunning = true
lastOperation = System.currentTimeMillis()
val processingInfo: ProcessingInfo = object : ProcessingInfo { val processingInfo: ProcessingInfo = object : ProcessingInfo {
override fun changeSubtitle(newSubtitle: String) { override fun changeSubtitle(newSubtitle: String) {
_processing.update { processingState -> _processing.update { processingState ->
@ -213,6 +217,8 @@ class TabState @Inject constructor(
var hasProcessFailed = false var hasProcessFailed = false
operationRunning = true operationRunning = true
lastOperation = System.currentTimeMillis()
try { try {
block(git) block(git)
} catch (ex: Exception) { } catch (ex: Exception) {

10
src/main/kotlin/com/jetpackduba/gitnuro/viewmodels/TabViewModel.kt
View file

@ -6,7 +6,6 @@ import com.jetpackduba.gitnuro.credentials.CredentialsState
import com.jetpackduba.gitnuro.credentials.CredentialsStateManager import com.jetpackduba.gitnuro.credentials.CredentialsStateManager
import com.jetpackduba.gitnuro.git.* import com.jetpackduba.gitnuro.git.*
import com.jetpackduba.gitnuro.git.branches.CreateBranchUseCase import com.jetpackduba.gitnuro.git.branches.CreateBranchUseCase
import com.jetpackduba.gitnuro.git.rebase.GetRebaseInteractiveStateUseCase
import com.jetpackduba.gitnuro.git.rebase.RebaseInteractiveState import com.jetpackduba.gitnuro.git.rebase.RebaseInteractiveState
import com.jetpackduba.gitnuro.git.repository.GetRepositoryStateUseCase import com.jetpackduba.gitnuro.git.repository.GetRepositoryStateUseCase
import com.jetpackduba.gitnuro.git.repository.InitLocalRepositoryUseCase import com.jetpackduba.gitnuro.git.repository.InitLocalRepositoryUseCase
@ -43,6 +42,7 @@ import javax.inject.Inject
import javax.inject.Provider import javax.inject.Provider
private const val MIN_TIME_IN_MS_BETWEEN_REFRESHES = 1000L private const val MIN_TIME_IN_MS_BETWEEN_REFRESHES = 1000L
private const val MIN_TIME_AFTER_GIT_OPERATION = 2000L
private const val TAG = "TabViewModel" private const val TAG = "TabViewModel"
@ -69,7 +69,6 @@ class TabViewModel @Inject constructor(
private val stageUntrackedFileUseCase: StageUntrackedFileUseCase, private val stageUntrackedFileUseCase: StageUntrackedFileUseCase,
private val openFilePickerUseCase: OpenFilePickerUseCase, private val openFilePickerUseCase: OpenFilePickerUseCase,
private val openUrlInBrowserUseCase: OpenUrlInBrowserUseCase, private val openUrlInBrowserUseCase: OpenUrlInBrowserUseCase,
private val getRebaseInteractiveStateUseCase: GetRebaseInteractiveStateUseCase,
private val sharedRepositoryStateManager: SharedRepositoryStateManager, private val sharedRepositoryStateManager: SharedRepositoryStateManager,
private val tabsManager: TabsManager, private val tabsManager: TabsManager,
private val tabScope: CoroutineScope, private val tabScope: CoroutineScope,
@ -162,7 +161,6 @@ class TabViewModel @Inject constructor(
openRepositoryUseCase(directory) openRepositoryUseCase(directory)
} }
repository.workTree // test if repository is valid repository.workTree // test if repository is valid
_repositorySelectionStatus.value = RepositorySelectionStatus.Open(repository) _repositorySelectionStatus.value = RepositorySelectionStatus.Open(repository)
val git = Git(repository) val git = Git(repository)
@ -227,6 +225,12 @@ class TabViewModel @Inject constructor(
// To prevent excessive updates, we add a slight delay between updates emission to prevent slowing down // To prevent excessive updates, we add a slight delay between updates emission to prevent slowing down
// the app by constantly running "git status". // the app by constantly running "git status".
val currentTimeMillis = System.currentTimeMillis() val currentTimeMillis = System.currentTimeMillis()
if (currentTimeMillis - tabState.lastOperation < MIN_TIME_AFTER_GIT_OPERATION) {
printDebug(TAG, "Git operation was executed recently, ignoring file system change")
return@collect
}
val diffTime = currentTimeMillis - lastNotify val diffTime = currentTimeMillis - lastNotify
// When .git dir has changed, do the refresh with a delay to avoid doing operations while a git // When .git dir has changed, do the refresh with a delay to avoid doing operations while a git