disable sharing of hidden files by default, add option to enable

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

@@ -290,7 +290,7 @@ public class Core {
         eventBus.register(DirectoryUnsharedEvent.class, directoryWatcher)
 
         log.info("initializing hasher service")
-        hasherService = new HasherService(new FileHasher(), eventBus, fileManager)
+        hasherService = new HasherService(new FileHasher(), eventBus, fileManager, props)
         eventBus.register(FileSharedEvent.class, hasherService)
         eventBus.register(FileUnsharedEvent.class, hasherService)
         eventBus.register(DirectoryUnsharedEvent.class, hasherService)

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

@@ -24,6 +24,7 @@ class MuWireSettings {
     File downloadLocation
     CrawlerResponse crawlerResponse
     boolean shareDownloadedFiles
+    boolean shareHiddenFiles
     boolean searchComments
     Set<String> watchedDirectories
     float downloadSequentialRatio
@@ -53,6 +54,7 @@ class MuWireSettings {
         autoDownloadUpdate = Boolean.parseBoolean(props.getProperty("autoDownloadUpdate","true"))
         updateType = props.getProperty("updateType","jar")
         shareDownloadedFiles = Boolean.parseBoolean(props.getProperty("shareDownloadedFiles","true"))
+        shareHiddenFiles = Boolean.parseBoolean(props.getProperty("shareHiddenFiles","false"))
         downloadSequentialRatio = Float.valueOf(props.getProperty("downloadSequentialRatio","0.8"))
         hostClearInterval = Integer.valueOf(props.getProperty("hostClearInterval","15"))
         hostHopelessInterval = Integer.valueOf(props.getProperty("hostHopelessInterval", "1440"))
@@ -92,6 +94,7 @@ class MuWireSettings {
         props.setProperty("autoDownloadUpdate", String.valueOf(autoDownloadUpdate))
         props.setProperty("updateType",String.valueOf(updateType))
         props.setProperty("shareDownloadedFiles", String.valueOf(shareDownloadedFiles))
+        props.setProperty("shareHiddenFiles", String.valueOf(shareHiddenFiles))
         props.setProperty("downloadSequentialRatio", String.valueOf(downloadSequentialRatio))
         props.setProperty("hostClearInterval", String.valueOf(hostClearInterval))
         props.setProperty("hostHopelessInterval", String.valueOf(hostHopelessInterval))

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

@@ -4,6 +4,7 @@ import java.util.concurrent.Executor
 import java.util.concurrent.Executors
 
 import com.muwire.core.EventBus
+import com.muwire.core.MuWireSettings
 import com.muwire.core.SharedFile
 
 class HasherService {
@@ -12,12 +13,14 @@ class HasherService {
     final EventBus eventBus
     final FileManager fileManager
     final Set<File> hashed = new HashSet<>()
+    final MuWireSettings settings
     Executor executor
 
-    HasherService(FileHasher hasher, EventBus eventBus, FileManager fileManager) {
+    HasherService(FileHasher hasher, EventBus eventBus, FileManager fileManager, MuWireSettings settings) {
         this.hasher = hasher
         this.eventBus = eventBus
         this.fileManager = fileManager
+        this.settings = settings
     }
 
     void start() {
@@ -26,6 +29,8 @@ class HasherService {
 
     void onFileSharedEvent(FileSharedEvent evt) {
         File canonical = evt.file.getCanonicalFile()
+        if (!settings.shareHiddenFiles && canonical.isHidden())
+            return
         if (fileManager.fileToSharedFile.containsKey(canonical)) 
             return
         if (hashed.add(canonical))

core/src/test/groovy/com/muwire/core/files/HasherServiceTest.groovy

@@ -25,7 +25,8 @@ class HasherServiceTest {
     void before() {
         eventBus = new EventBus()
         hasher = new FileHasher()
-        service = new HasherService(hasher, eventBus, new FileManager(eventBus, new MuWireSettings()))
+        def props = new MuWireSettings()
+        service = new HasherService(hasher, eventBus, new FileManager(eventBus, props), props)
         eventBus.register(FileHashedEvent.class, listener)
         eventBus.register(FileSharedEvent.class, service)
         service.start()

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

@@ -82,6 +82,10 @@ class OptionsController {
         boolean shareDownloaded = view.shareDownloadedCheckbox.model.isSelected()
         model.shareDownloadedFiles = shareDownloaded
         settings.shareDownloadedFiles = shareDownloaded
+        
+        boolean shareHidden = view.shareHiddenCheckbox.model.isSelected()
+        model.shareHiddenFiles = shareHidden
+        settings.shareHiddenFiles = shareHidden
 
         String downloadLocation = model.downloadLocation
         settings.downloadLocation = new File(downloadLocation)

gui/griffon-app/models/com/muwire/gui/OptionsModel.groovy

@@ -13,6 +13,7 @@ class OptionsModel {
     @Observable String updateCheckInterval
     @Observable boolean autoDownloadUpdate
     @Observable boolean shareDownloadedFiles
+    @Observable boolean shareHiddenFiles
     @Observable String downloadLocation
     @Observable boolean searchComments
 
@@ -50,6 +51,7 @@ class OptionsModel {
         updateCheckInterval = settings.updateCheckInterval
         autoDownloadUpdate = settings.autoDownloadUpdate
         shareDownloadedFiles = settings.shareDownloadedFiles
+        shareHiddenFiles = settings.shareHiddenFiles
         downloadLocation = settings.downloadLocation.getAbsolutePath()
         searchComments = settings.searchComments
 

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

@@ -852,7 +852,7 @@ class MainFrameView {
 
     def shareFiles = {
         def chooser = new JFileChooser()
-        chooser.setFileHidingEnabled(false)
+        chooser.setFileHidingEnabled(!model.core.muOptions.shareHiddenFiles)
         chooser.setDialogTitle("Select file to share")
         chooser.setFileSelectionMode(JFileChooser.FILES_ONLY)
         chooser.setMultiSelectionEnabled(true)

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

@@ -35,6 +35,7 @@ class OptionsView {
     def updateField
     def autoDownloadUpdateCheckbox
     def shareDownloadedCheckbox
+    def shareHiddenCheckbox
     def searchCommentsCheckbox
 
     def inboundLengthField
@@ -86,10 +87,13 @@ class OptionsView {
 
             label(text : "Share downloaded files", constraints : gbc(gridx : 0, gridy:4))
             shareDownloadedCheckbox = checkBox(selected : bind {model.shareDownloadedFiles}, constraints : gbc(gridx :1, gridy:4))
+            
+            label(text : "Share hidden files", constraints : gbc(gridx : 0, gridy:5))
+            shareHiddenCheckbox = checkBox(selected : bind {model.shareHiddenFiles}, constraints : gbc(gridx :1, gridy:5))
 
-            label(text : "Save downloaded files to:", constraints: gbc(gridx:0, gridy:5))
+            label(text : "Save downloaded files to:", constraints: gbc(gridx:0, gridy:6))
-            button(text : "Choose", constraints : gbc(gridx : 1, gridy:5), downloadLocationAction)
+            button(text : "Choose", constraints : gbc(gridx : 1, gridy:6), downloadLocationAction)
-            label(text : bind {model.downloadLocation}, constraints: gbc(gridx:0, gridy:6, gridwidth:2))
+            label(text : bind {model.downloadLocation}, constraints: gbc(gridx:0, gridy:7, gridwidth:2))
 
         }
         i = builder.panel {