Release 0.0.12 for search by hash

README.md

@@ -32,7 +32,6 @@ At the moment there are very few nodes on the network, so you will see very few
 
 ### Known bugs and limitations
 
-* Sometimes the list of shared files gets lost 
 * Many UI features you would expect are not there yet
 
 

cli/src/main/groovy/com/muwire/cli/Cli.groovy

@@ -4,9 +4,15 @@ import java.util.concurrent.CountDownLatch
 
 import com.muwire.core.Core
 import com.muwire.core.MuWireSettings
+import com.muwire.core.connection.ConnectionAttemptStatus
+import com.muwire.core.connection.ConnectionEvent
+import com.muwire.core.connection.DisconnectionEvent
 import com.muwire.core.files.AllFilesLoadedEvent
 import com.muwire.core.files.FileHashedEvent
+import com.muwire.core.files.FileLoadedEvent
 import com.muwire.core.files.FileSharedEvent
+import com.muwire.core.upload.UploadEvent
+import com.muwire.core.upload.UploadFinishedEvent
 
 class Cli {
     
@@ -28,28 +34,15 @@ class Cli {
         
         Core core 
         try {
-            core = new Core(props, home, "0.0.11")
+            core = new Core(props, home, "0.0.12")
         } catch (Exception bad) {
             bad.printStackTrace(System.out)
             println "Failed to initialize core, exiting"
             System.exit(1)
         }
 
-        def latch = new CountDownLatch(1)
-        def fileLoader = new Object() {
-            public void onAllFilesLoadedEvent(AllFilesLoadedEvent e) {
-                latch.countDown()
-            }
-        }
-        core.eventBus.register(AllFilesLoadedEvent.class, fileLoader)
-        core.startServices()
-        
-        println "waiting for files to load"
-        latch.await()
                 
         
-        // now we begin
-        println "MuWire is ready"
         
         def filesList
         if (args.length == 0) {
@@ -62,14 +55,39 @@ class Cli {
         Thread.sleep(1000)
         println "loading shared files from $filesList"
         
-        core.eventBus.register(FileHashedEvent.class, new Object() {
-            void onFileHashedEvent(FileHashedEvent e) {
-                if (e.error != null)
-                    println "ERROR $e.error"
-                else
-                    println "Shared file : $e.sharedFile.file"
+        // listener for shared files
+        def sharedListener = new SharedListener()
+        core.eventBus.register(FileHashedEvent.class, sharedListener)
+        core.eventBus.register(FileLoadedEvent.class, sharedListener)
+        
+        // for connections
+        def connectionsListener = new ConnectionListener()
+        core.eventBus.register(ConnectionEvent.class, connectionsListener)
+        core.eventBus.register(DisconnectionEvent.class, connectionsListener)
+        
+        // for uploads
+        def uploadsListener = new UploadsListener()
+        core.eventBus.register(UploadEvent.class, uploadsListener)
+        core.eventBus.register(UploadFinishedEvent.class, uploadsListener)
+        
+        Timer timer = new Timer("status-printer", true)
+        timer.schedule({
+            println "Connections $connectionsListener.connections Uploads $uploadsListener.uploads Shared $sharedListener.shared"
+        } as TimerTask, 60000, 60000)
+        
+        def latch = new CountDownLatch(1)
+        def fileLoader = new Object() {
+            public void onAllFilesLoadedEvent(AllFilesLoadedEvent e) {
+                latch.countDown()
             }
-        })
+        }
+        core.eventBus.register(AllFilesLoadedEvent.class, fileLoader)
+        core.startServices()
+        
+        println "waiting for files to load"
+        latch.await()
+        // now we begin
+        println "MuWire is ready"
         
         filesList = new File(filesList)
         filesList.withReader { 
@@ -83,4 +101,42 @@ class Cli {
         })
         Thread.sleep(Integer.MAX_VALUE)
     }
+    
+    static class ConnectionListener {
+        volatile int connections
+        public void onConnectionEvent(ConnectionEvent e) {
+            if (e.status == ConnectionAttemptStatus.SUCCESSFUL)
+                connections++
+        }
+        public void onDisconnectionEvent(DisconnectionEvent e) {
+            connections--
+        }
+    }
+    
+    static class UploadsListener {
+        volatile int uploads
+        public void onUploadEvent(UploadEvent e) {
+            uploads++
+            println "Starting upload of ${e.uploader.file.getName()} to ${e.uploader.request.downloader.getHumanReadableName()}"
+        }
+        public void onUploadFinishedEvent(UploadFinishedEvent e) {
+            uploads--
+            println "Finished upload of ${e.uploader.file.getName()} to ${e.uploader.request.downloader.getHumanReadableName()}"
+        }
+    }
+    
+    static class SharedListener {
+        volatile int shared
+        void onFileHashedEvent(FileHashedEvent e) {
+            if (e.error != null)
+                println "ERROR $e.error"
+            else {
+                println "Shared file : $e.sharedFile.file"
+                shared++
+            }
+        }
+        void onFileLoadedEvent(FileLoadedEvent e) {
+            shared++
+        }
+    }
 }

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

@@ -248,7 +248,7 @@ public class Core {
             }
         }
         
-        Core core = new Core(props, home, "0.0.11")
+        Core core = new Core(props, home, "0.0.12")
         core.startServices()
         
         // ... at the end, sleep or execute script

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

@@ -3,6 +3,7 @@ package com.muwire.core
 import java.util.concurrent.CopyOnWriteArrayList
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors
+import java.util.logging.Level
 
 import com.muwire.core.files.FileSharedEvent
 
@@ -30,7 +31,11 @@ class EventBus {
 			currentHandlers = handlers.getOrDefault(clazz, [])
 		}
 		currentHandlers.each {
-			it."on${clazz.getSimpleName()}"(e)
+            try {
+                it."on${clazz.getSimpleName()}"(e)
+            } catch (Exception bad) {
+                log.log(Level.SEVERE, "exception dispatching event",bad)
+            }
 		}
 	}
 	

core/src/main/groovy/com/muwire/core/connection/Connection.groovy

@@ -127,6 +127,8 @@ abstract class Connection implements Closeable {
         query.uuid = e.searchEvent.getUuid()
         query.firstHop = e.firstHop
         query.keywords = e.searchEvent.getSearchTerms()
+        if (e.searchEvent.searchHash != null)
+            query.infohash = Base64.encode(e.searchEvent.searchHash)
         query.replyTo = e.replyTo.toBase64()
         if (e.originator != null)
             query.originator = e.originator.toBase64()
@@ -180,7 +182,7 @@ abstract class Connection implements Closeable {
         
         
         SearchEvent searchEvent = new SearchEvent(searchTerms : search.keywords,
-                                            searchHash : search.infohash,
+                                            searchHash : Base64.decode(search.infohash),
                                             uuid : uuid)
         QueryEvent event = new QueryEvent ( searchEvent : searchEvent,
                                             replyTo : replyTo,

core/src/main/groovy/com/muwire/core/update/UpdateAvailableEvent.groovy

@@ -1,8 +1,10 @@
 package com.muwire.core.update
 
 import com.muwire.core.Event
+import com.muwire.core.InfoHash
 
 class UpdateAvailableEvent extends Event {
     String version
     String signer
+    String infoHash
 }

core/src/main/groovy/com/muwire/core/update/UpdateClient.groovy

@@ -36,7 +36,7 @@ class UpdateClient {
     
     void start() {
         session.addMuxedSessionListener(new Listener(), I2PSession.PROTO_DATAGRAM, 2)
-        timer.schedule({checkUpdate()} as TimerTask, 30000, 60 * 60 * 1000)
+        timer.schedule({checkUpdate()} as TimerTask, 60000, 60 * 60 * 1000)
     }
     
     void stop() {
@@ -107,7 +107,7 @@ class UpdateClient {
                 }
                 
                 log.info("new version $payload.version available, publishing event")
-                eventBus.publish(new UpdateAvailableEvent(version : payload.version, signer : payload.signer))
+                eventBus.publish(new UpdateAvailableEvent(version : payload.version, signer : payload.signer, infoHash : payload.infoHash))
                 
             } catch (Exception e) {
                 log.log(Level.WARNING,"Invalid datagram",e)

gradle.properties

@@ -1,5 +1,5 @@
 group         = com.muwire
-version       = 0.0.11
+version       = 0.0.12
 groovyVersion = 2.4.15
 slf4jVersion  = 1.7.25
 spockVersion  = 1.1-groovy-2.4

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

@@ -7,6 +7,8 @@ import griffon.core.mvc.MVCGroup
 import griffon.core.mvc.MVCGroupConfiguration
 import griffon.inject.MVCMember
 import griffon.metadata.ArtifactProviderFor
+import net.i2p.data.Base64
+
 import javax.annotation.Nonnull
 import javax.inject.Inject
 
@@ -42,15 +44,36 @@ class MainFrameController {
         params["uuid"] = uuid.toString()
         def group = mvcGroup.createMVCGroup("SearchTab", uuid.toString(), params)
         model.results[uuid.toString()] = group
-        
-        // this can be improved a lot
-        def terms = search.toLowerCase().trim().split(Constants.SPLIT_PATTERN)
-        def searchEvent = new SearchEvent(searchTerms : terms, uuid : uuid)
+
+        def searchEvent
+        if (model.hashSearch) {
+            searchEvent = new SearchEvent(searchHash : Base64.decode(search), uuid : uuid)
+        } else {
+            // this can be improved a lot
+            def terms = search.toLowerCase().trim().split(Constants.SPLIT_PATTERN)
+            searchEvent = new SearchEvent(searchTerms : terms, uuid : uuid)
+        }
         core.eventBus.publish(new QueryEvent(searchEvent : searchEvent, firstHop : true, 
             replyTo: core.me.destination, receivedOn: core.me.destination,
             originator : core.me))
     }
     
+    void search(String infoHash, String tabTitle) {
+        def cardsPanel = builder.getVariable("cards-panel")
+        cardsPanel.getLayout().show(cardsPanel, "search window")
+        def uuid = UUID.randomUUID()
+        Map<String, Object> params = new HashMap<>()
+        params["search-terms"] = tabTitle
+        params["uuid"] = uuid.toString()
+        def group = mvcGroup.createMVCGroup("SearchTab", uuid.toString(), params)
+        model.results[uuid.toString()] = group
+        
+        def searchEvent = new SearchEvent(searchHash : Base64.decode(infoHash), uuid:uuid)
+        core.eventBus.publish(new QueryEvent(searchEvent : searchEvent, firstHop : true,
+            replyTo: core.me.destination, receivedOn: core.me.destination,
+            originator : core.me))
+    }
+    
     private def selectedResult() {
         def selected = builder.getVariable("result-tabs").getSelectedComponent()
         def group = selected.getClientProperty("mvc-group")
@@ -137,6 +160,16 @@ class MainFrameController {
         markTrust("trusted-table", TrustLevel.NEUTRAL, model.trusted)
     }
     
+    @ControllerAction
+    void keywordSearch() {
+        model.hashSearch = false
+    }
+    
+    @ControllerAction
+    void hashSearch() {
+        model.hashSearch = true
+    }
+    
     void mvcGroupInit(Map<String, String> args) {
         application.addPropertyChangeListener("core", {e-> 
             core = e.getNewValue()

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

@@ -29,6 +29,7 @@ import com.muwire.core.upload.UploadFinishedEvent
 
 import griffon.core.GriffonApplication
 import griffon.core.artifact.GriffonModel
+import griffon.core.env.Metadata
 import griffon.core.mvc.MVCGroup
 import griffon.inject.MVCMember
 import griffon.transform.FXObservable
@@ -38,8 +39,11 @@ import griffon.metadata.ArtifactProviderFor
 
 @ArtifactProviderFor(GriffonModel)
 class MainFrameModel {
+    @Inject Metadata metadata
     @MVCMember @Nonnull
     FactoryBuilderSupport builder
+    @MVCMember @Nonnull
+    MainFrameController controller
     @Inject @Nonnull GriffonApplication application
     @Observable boolean coreInitialized = false
     
@@ -52,6 +56,8 @@ class MainFrameModel {
     def trusted = []
     def distrusted = []
     
+    boolean hashSearch
+    
     @Observable int connections
     @Observable String me
     @Observable boolean searchButtonsEnabled
@@ -260,7 +266,13 @@ class MainFrameModel {
     
     void onUpdateAvailableEvent(UpdateAvailableEvent e) {
         runInsideUIAsync {
-            JOptionPane.showMessageDialog(null, "A new version of MuWire is available from $e.signer.  Please update to $e.version")
+            
+            int option = JOptionPane.showConfirmDialog(null, 
+                "MuWire $e.version is available from $e.signer.  You have "+ metadata["application.version"]+" Update?",
+                "New MuWire version availble", JOptionPane.OK_CANCEL_OPTION)
+            if (option == JOptionPane.CANCEL_OPTION)
+                return
+            controller.search(e.infoHash,"MuWire update")
         }
     }
     

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

@@ -76,6 +76,12 @@ class MainFrameView {
 
                             }
                             panel( constraints: BorderLayout.EAST) {
+                                panel {
+                                    buttonGroup(id : "searchButtonGroup") 
+                                    radioButton(text : "Keywords", selected : true, buttonGroup : searchButtonGroup, keywordSearchAction)
+                                    radioButton(text : "Hash", selected : false, buttonGroup : searchButtonGroup, hashSearchAction)
+                                    
+                                }
                                 button(text: "Search", searchAction)
                             }
                         }