Add unsharing of directories

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

@@ -28,6 +28,7 @@ import com.muwire.core.files.FileUnsharedEvent
 import com.muwire.core.files.HasherService
 import com.muwire.core.files.PersisterService
 import com.muwire.core.files.AllFilesLoadedEvent
+import com.muwire.core.files.DirectoryUnsharedEvent
 import com.muwire.core.files.DirectoryWatcher
 import com.muwire.core.hostcache.CacheClient
 import com.muwire.core.hostcache.HostCache
@@ -193,6 +194,7 @@ public class Core {
 		eventBus.register(FileDownloadedEvent.class, fileManager)
 		eventBus.register(FileUnsharedEvent.class, fileManager)
 		eventBus.register(SearchEvent.class, fileManager)
+        eventBus.register(DirectoryUnsharedEvent.class, fileManager)
         
         log.info("initializing mesh manager")
         MeshManager meshManager = new MeshManager(fileManager, home, props)
@@ -259,6 +261,7 @@ public class Core {
         directoryWatcher = new DirectoryWatcher(eventBus, fileManager)
         eventBus.register(FileSharedEvent.class, directoryWatcher)
         eventBus.register(AllFilesLoadedEvent.class, directoryWatcher)
+        eventBus.register(DirectoryUnsharedEvent.class, directoryWatcher)
         
         log.info("initializing hasher service")
         hasherService = new HasherService(new FileHasher(), eventBus, fileManager)

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

@@ -0,0 +1,7 @@
+package com.muwire.core.files
+
+import com.muwire.core.Event
+
+class DirectoryUnsharedEvent extends Event {
+    File directory
+}

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

@@ -35,6 +35,7 @@ class DirectoryWatcher {
     private final FileManager fileManager
     private final Thread watcherThread, publisherThread
     private final Map<File, Long> waitingFiles = new ConcurrentHashMap<>()
+    private final Map<File, WatchKey> watchedDirectories = new ConcurrentHashMap<>()
     private WatchService watchService
     private volatile boolean shutdown
     
@@ -64,9 +65,15 @@ class DirectoryWatcher {
         if (!e.file.isDirectory())
             return
         Path path = e.file.getCanonicalFile().toPath()
-        path.register(watchService, kinds)
+        WatchKey wk = path.register(watchService, kinds)
+        watchedDirectories.put(e.file, wk)
         
     }
+    
+    void onDirectoryUnsharedEvent(DirectoryUnsharedEvent e) {
+        WatchKey wk = watchedDirectories.remove(e.directory)
+        wk?.cancel()
+    }
 
     private void watch() {
         try {

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

@@ -135,4 +135,16 @@ class FileManager {
         }
         rv
     }
+    
+    void onDirectoryUnsharedEvent(DirectoryUnsharedEvent e) {
+        e.directory.listFiles().each { 
+            if (it.isDirectory())
+                eventBus.publish(new DirectoryUnsharedEvent(directory : it))
+            else {
+                SharedFile sf = fileToSharedFile.get(it)
+                if (sf != null)
+                    eventBus.publish(new FileUnsharedEvent(unsharedFile : sf))
+            }
+        }
+    }
 }

gui/griffon-app/controllers/com/muwire/gui/MainFrameController.groovy

@@ -19,6 +19,7 @@ import com.muwire.core.download.UIDownloadCancelledEvent
 import com.muwire.core.download.UIDownloadEvent
 import com.muwire.core.download.UIDownloadPausedEvent
 import com.muwire.core.download.UIDownloadResumedEvent
+import com.muwire.core.files.DirectoryUnsharedEvent
 import com.muwire.core.search.QueryEvent
 import com.muwire.core.search.SearchEvent
 import com.muwire.core.trust.TrustEvent
@@ -209,6 +210,18 @@ class MainFrameController {
         println "unsharing selected files"
     }
     
+    void stopWatchingDirectory() {
+        String directory = mvcGroup.view.getSelectedWatchedDirectory()
+        if (directory == null)
+            return
+        core.muOptions.watchedDirectories.remove(directory)
+        saveMuWireSettings()    
+        core.eventBus.publish(new DirectoryUnsharedEvent(directory : new File(directory)))
+                
+        model.watched.remove(directory)
+        builder.getVariable("watched-directories-table").model.fireTableDataChanged()
+    }
+    
     void saveMuWireSettings() {
         File f = new File(core.home, "MuWire.properties")
         f.withOutputStream { 

gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy

@@ -52,6 +52,7 @@ class MainFrameView {
     def downloadsTable
     def lastDownloadSortEvent
     def lastSharedSortEvent
+    def lastWatchedSortEvent
     
     void initUI() {
         UISettings settings = application.context.get("ui-settings")
@@ -397,6 +398,27 @@ class MainFrameView {
             }
         })
         
+        // watched directories table
+        def watchedTable = builder.getVariable("watched-directories-table")
+        watchedTable.rowSorter.addRowSorterListener({evt -> lastWatchedSortEvent = evt})
+        watchedTable.rowSorter.setSortsOnUpdates(true)
+        JPopupMenu watchedMenu = new JPopupMenu()
+        JMenuItem stopWatching = new JMenuItem("Stop sharing")
+        stopWatching.addActionListener({mvcGroup.controller.stopWatchingDirectory()})
+        watchedMenu.add(stopWatching)
+        watchedTable.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseReleased(MouseEvent e) {
+                if (e.isPopupTrigger())
+                    showPopupMenu(watchedMenu, e)
+            }
+            @Override
+            public void mousePressed(MouseEvent e) {
+                if (e.isPopupTrigger())
+                    showPopupMenu(watchedMenu, e)
+            }
+        })
+        
     }
     
     private static void showPopupMenu(JPopupMenu menu, MouseEvent event) {
@@ -543,4 +565,14 @@ class MainFrameView {
             model.core.eventBus.publish(new FileSharedEvent(file : f))
         }
     }
+    
+    String getSelectedWatchedDirectory() {
+        def watchedTable = builder.getVariable("watched-directories-table")
+        int selectedRow = watchedTable.getSelectedRow()
+        if (selectedRow < 0)
+            return null
+        if (lastWatchedSortEvent != null)
+            selectedRow = watchedTable.rowSorter.convertRowIndexToModel(selectedRow)
+        model.watched[selectedRow]
+    }
 }