All shared directories are watched directories. Fix manipulation of tree structure

core/src/main/groovy/com/muwire/core/Core.groovy

@@ -282,7 +282,7 @@ public class Core {
             i2pAcceptor, hostCache, trustService, searchManager, uploadManager, connectionEstablisher)
 
         log.info("initializing directory watcher")
-        directoryWatcher = new DirectoryWatcher(eventBus, fileManager)
+        directoryWatcher = new DirectoryWatcher(eventBus, fileManager, home, props)
         eventBus.register(FileSharedEvent.class, directoryWatcher)
         eventBus.register(AllFilesLoadedEvent.class, directoryWatcher)
         eventBus.register(DirectoryUnsharedEvent.class, directoryWatcher)
@@ -290,6 +290,8 @@ public class Core {
         log.info("initializing hasher service")
         hasherService = new HasherService(new FileHasher(), eventBus, fileManager)
         eventBus.register(FileSharedEvent.class, hasherService)
+        eventBus.register(FileUnsharedEvent.class, hasherService)
+        eventBus.register(DirectoryUnsharedEvent.class, hasherService)
 
         log.info("initializing trust subscriber")
         trustSubscriber = new TrustSubscriber(eventBus, i2pConnector, props)

core/src/main/groovy/com/muwire/core/MuWireSettings.groovy

@@ -6,6 +6,7 @@ import com.muwire.core.hostcache.CrawlerResponse
 import com.muwire.core.util.DataUtil
 
 import net.i2p.data.Base64
+import net.i2p.util.ConcurrentHashSet
 
 class MuWireSettings {
 
@@ -113,7 +114,7 @@ class MuWireSettings {
     }
     
     private static Set<String> readEncodedSet(Properties props, String property) {
-        Set<String> rv = new HashSet<>()
+        Set<String> rv = new ConcurrentHashSet<>()
         if (props.containsKey(property)) {
             String[] encoded = props.getProperty(property).split(",")
             encoded.each { rv << DataUtil.readi18nString(Base64.decode(it)) }

core/src/main/groovy/com/muwire/core/files/DirectoryWatcher.groovy

@@ -13,6 +13,7 @@ import java.nio.file.WatchService
 import java.util.concurrent.ConcurrentHashMap
 
 import com.muwire.core.EventBus
+import com.muwire.core.MuWireSettings
 import com.muwire.core.SharedFile
 
 import groovy.util.logging.Log
@@ -31,6 +32,8 @@ class DirectoryWatcher {
             kinds = [ENTRY_CREATE, ENTRY_MODIFY, ENTRY_DELETE]
     }
 
+    private final File home
+    private final MuWireSettings muOptions
     private final EventBus eventBus
     private final FileManager fileManager
     private final Thread watcherThread, publisherThread
@@ -39,7 +42,9 @@ class DirectoryWatcher {
     private WatchService watchService
     private volatile boolean shutdown
 
-    DirectoryWatcher(EventBus eventBus, FileManager fileManager) {
+    DirectoryWatcher(EventBus eventBus, FileManager fileManager, File home, MuWireSettings muOptions) {
+        this.home = home
+        this.muOptions = muOptions
         this.eventBus = eventBus
         this.fileManager = fileManager
         this.watcherThread = new Thread({watch() } as Runnable, "directory-watcher")
@@ -64,15 +69,28 @@ class DirectoryWatcher {
     void onFileSharedEvent(FileSharedEvent e) {
         if (!e.file.isDirectory())
             return
-        Path path = e.file.getCanonicalFile().toPath()
+        File canonical = e.file.getCanonicalFile()
+        Path path = canonical.toPath()
         WatchKey wk = path.register(watchService, kinds)
-        watchedDirectories.put(e.file, wk)
-
+        watchedDirectories.put(canonical, wk)
+        
+        if (muOptions.watchedDirectories.add(canonical.toString()))
+            saveMuSettings()
     }
 
     void onDirectoryUnsharedEvent(DirectoryUnsharedEvent e) {
         WatchKey wk = watchedDirectories.remove(e.directory)
         wk?.cancel()
+        
+        if (muOptions.watchedDirectories.remove(e.directory.toString()))
+            saveMuSettings()
+    }
+    
+    private void saveMuSettings() {
+        File muSettingsFile = new File(home, "MuWire.properties")
+        muSettingsFile.withOutputStream {
+            muOptions.write(it)
+        }
     }
 
     private void watch() {

core/src/main/groovy/com/muwire/core/files/HasherService.groovy

@@ -11,6 +11,7 @@ class HasherService {
     final FileHasher hasher
     final EventBus eventBus
     final FileManager fileManager
+    final Set<File> hashed = new HashSet<>()
     Executor executor
 
     HasherService(FileHasher hasher, EventBus eventBus, FileManager fileManager) {
@@ -24,13 +25,22 @@ class HasherService {
     }
 
     void onFileSharedEvent(FileSharedEvent evt) {
-        if (fileManager.fileToSharedFile.containsKey(evt.file.getCanonicalFile()))
+        File canonical = evt.file.getCanonicalFile()
+        if (fileManager.fileToSharedFile.containsKey(canonical)) 
             return
-        executor.execute( { -> process(evt.file) } as Runnable)
+        if (hashed.add(canonical))
+            executor.execute( { -> process(canonical) } as Runnable)
+    }
+    
+    void onFileUnsharedEvent(FileUnsharedEvent evt) {
+        hashed.remove(evt.unsharedFile.file)
+    }
+    
+    void onDirectoryUnsharedEvent(DirectoryUnsharedEvent evt) {
+        hashed.remove(evt.directory)
     }
 
     private void process(File f) {
-        f = f.getCanonicalFile()
         if (f.isDirectory()) {
             f.listFiles().each {eventBus.publish new FileSharedEvent(file: it) }
         } else {