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

Added try catch to dir opening to avoid crash if the dir has been removed

Browse Source
This commit is contained in:
Abdelilah El Aissaoui 2022-01-31 23:42:42 +01:00
parent ef1e18fb91
commit edbb095246
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/kotlin/app/git/TabState.kt
View File

@ -95,13 +95,18 @@ class TabState @Inject constructor(
} }
} }
fun runOperation(block: suspend (git: Git) -> RefreshType) = managerScope.launch(Dispatchers.IO) { fun runOperation(showError: Boolean = false, block: suspend (git: Git) -> RefreshType) = managerScope.launch(Dispatchers.IO) {
operationRunning = true operationRunning = true
try { try {
val refreshType = block(safeGit) val refreshType = block(safeGit)
if (refreshType != RefreshType.NONE) if (refreshType != RefreshType.NONE)
_refreshData.emit(refreshType) _refreshData.emit(refreshType)
} catch (ex: Exception) {
ex.printStackTrace()
if (showError)
errorsManager.addError(newErrorNow(ex, ex.localizedMessage))
} finally { } finally {
operationRunning = false operationRunning = false
} }

3
src/main/kotlin/app/viewmodels/MenuViewModel.kt
View File

@ -5,7 +5,6 @@ import app.git.RemoteOperationsManager
import app.git.StashManager import app.git.StashManager
import app.git.TabState import app.git.TabState
import java.awt.Desktop import java.awt.Desktop
import java.io.File
import javax.inject.Inject import javax.inject.Inject
class MenuViewModel @Inject constructor( class MenuViewModel @Inject constructor(
@ -41,7 +40,7 @@ class MenuViewModel @Inject constructor(
return@safeProcessing RefreshType.UNCOMMITED_CHANGES return@safeProcessing RefreshType.UNCOMMITED_CHANGES
} }
fun openFolderInFileExplorer() = tabState.runOperation { git -> fun openFolderInFileExplorer() = tabState.runOperation (showError = true) { git ->
Desktop.getDesktop().open(git.repository.directory.parentFile) Desktop.getDesktop().open(git.repository.directory.parentFile)
return@runOperation RefreshType.NONE return@runOperation RefreshType.NONE