From fec042ec36d42d7c03587f5a09d3b48a56d2a0f3 Mon Sep 17 00:00:00 2001 From: Zlatin Balevsky Date: Fri, 4 Sep 2020 14:44:04 +0100 Subject: [PATCH] check if watched directories disappeared while MW was down --- .../core/files/directories/WatchedDirectoryManager.groovy | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/core/src/main/groovy/com/muwire/core/files/directories/WatchedDirectoryManager.groovy b/core/src/main/groovy/com/muwire/core/files/directories/WatchedDirectoryManager.groovy index c868a977..f31af1da 100644 --- a/core/src/main/groovy/com/muwire/core/files/directories/WatchedDirectoryManager.groovy +++ b/core/src/main/groovy/com/muwire/core/files/directories/WatchedDirectoryManager.groovy @@ -96,8 +96,12 @@ class WatchedDirectoryManager { forEach { def parsed = slurper.parse(it.toFile()) WatchedDirectory wd = WatchedDirectory.fromJson(parsed) - watchedDirs.put(wd.directory, wd) + if (wd.directory.exists() && wd.directory.isDirectory()) // check if directory disappeared + watchedDirs.put(wd.directory, wd) + else + it.toFile().delete() } + watchedDirs.values().stream().filter({it.autoWatch}).forEach { eventBus.publish(new DirectoryWatchedEvent(directory : it.directory)) eventBus.publish(new FileSharedEvent(file : it.directory))