Fix dispose FileChangeDetection

sdercolin · Jul 22, 2024 · e197bd4 · e197bd4
1 parent 46844f1
commit e197bd4
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/src/jvmMain/kotlin/com/sdercolin/vlabeler/ui/AppState.kt b/src/jvmMain/kotlin/com/sdercolin/vlabeler/ui/AppState.kt
@@ -478,6 +478,7 @@ class AppState(
 
     fun exit(fromError: Boolean = false) {
         mainScope.launch {
+            terminalAutoReloadLabel()
             terminateAutoSaveProject()
             if (!fromError) discardAutoSavedProjects()
             ipcState.close()

diff --git a/src/jvmMain/kotlin/com/sdercolin/vlabeler/ui/ProjectStore.kt b/src/jvmMain/kotlin/com/sdercolin/vlabeler/ui/ProjectStore.kt
@@ -144,6 +144,7 @@ interface ProjectStore {
      */
     fun reloadLabelFile(file: File?, skipConfirmation: Boolean)
     fun autoReloadLabel(behavior: AppConf.AutoReload.Behavior, moduleName: String)
+    suspend fun terminalAutoReloadLabel()
 
     suspend fun withExporting(onSuccess: suspend () -> File)
 }
@@ -812,4 +813,9 @@ class ProjectStoreImpl(
         cachedFileHashMap[file.absolutePath] = hash
         isExporting = false
     }
+
+    override suspend fun terminalAutoReloadLabel() {
+        fileChangeDetection?.awaitDispose()
+        fileChangeDetection = null
+    }
 }
diff --git a/src/jvmMain/kotlin/com/sdercolin/vlabeler/util/FileChangeDetection.kt b/src/jvmMain/kotlin/com/sdercolin/vlabeler/util/FileChangeDetection.kt
@@ -4,15 +4,18 @@ import com.sdercolin.vlabeler.env.Log
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.Job
+import kotlinx.coroutines.cancelAndJoin
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.yield
 import java.io.File
+import java.nio.file.ClosedWatchServiceException
 import java.nio.file.FileSystems
 import java.nio.file.Path
 import java.nio.file.Paths
 import java.nio.file.StandardWatchEventKinds.ENTRY_CREATE
 import java.nio.file.StandardWatchEventKinds.ENTRY_MODIFY
+import java.nio.file.WatchService
 
 class FileChangeDetection(
     private val directory: File,
@@ -21,6 +24,7 @@ class FileChangeDetection(
 ) {
     private var job: Job? = null
     private var callbackJob: Job? = null
+    private var watchService: WatchService? = null
 
     fun startIn(coroutineScope: CoroutineScope) {
         if (job?.isActive == true) {
@@ -34,6 +38,8 @@ class FileChangeDetection(
                     directory.mkdirs()
                 }
                 val watchService = FileSystems.getDefault().newWatchService()
+                this@FileChangeDetection.watchService?.close()
+                this@FileChangeDetection.watchService = watchService
                 val directoryPath = Paths.get(directory.absolutePath)
                 directoryPath.register(watchService, ENTRY_CREATE, ENTRY_MODIFY)
                 while (isActive) {
@@ -67,18 +73,27 @@ class FileChangeDetection(
                     }
                 }
             }.onFailure {
-                Log.error(it)
+                if (it !is ClosedWatchServiceException) {
+                    Log.error(it)
+                }
             }
         }
     }
 
     fun dispose() {
+        this@FileChangeDetection.watchService?.close()
         callbackJob?.cancel()
         callbackJob = null
         job?.cancel()
         job = null
     }
 
+    suspend fun awaitDispose() {
+        this@FileChangeDetection.watchService?.close()
+        callbackJob?.cancelAndJoin()
+        job?.cancelAndJoin()
+    }
+
     fun interface Callback {
         suspend fun onFileChanged(changed: List<File>, new: List<File>)
     }