Release 0.5.2

Add info about the default I2CP port to README.md

README.md

@@ -4,11 +4,11 @@ MuWire is an easy to use file-sharing program which offers anonymity using [I2P
 
 It is inspired by the LimeWire Gnutella client and developped by a former LimeWire developer.
 
-The current stable release - 0.4.0 is avaiable for download at https://muwire.com.  You can find technical documentation in the "doc" folder.
+The current stable release - 0.4.15 is avaiable for download at https://muwire.com.  You can find technical documentation in the "doc" folder.
 
 ### Building
 
-You need JRE 8 or newer.  After installing that and setting up the appropriate paths, just type
+You need JDK 8 or newer.  After installing that and setting up the appropriate paths, just type
 
 ```
 ./gradlew clean assemble
@@ -19,38 +19,23 @@ If you want to run the unit tests, type
 ./gradlew clean build
 ```
 
-Some of the UI tests will fail because they haven't been written yet :-/
+If you want to build binary bundles that do not depend on Java or I2P, see the https://github.com/zlatinb/muwire-pkg project
 
 ### Running
 
-You need to have an I2P router up and running on the same machine.  After you build the application, look inside `gui/build/distributions`.  Untar/unzip one of the `shadow` files and then run the jar contained inside by typing `java -jar MuWire-x.y.z.jar` in a terminal or command prompt.  If you use a custom I2CP host and port, create a file `$HOME/.MuWire/i2p.properties` and put `i2cp.tcp.host=<host>` and `i2cp.tcp.port=<port>` in there.
+After you build the application, look inside `gui/build/distributions`.  Untar/unzip one of the `shadow` files and then run the jar contained inside by typing `java -jar gui-x.y.z.jar` in a terminal or command prompt.
 
-The first time you run MuWire it will ask you to select a nickname.  This nickname will be displayed with search results, so that others can verify the file was shared by you.  It is best to leave MuWire running all the time, just like I2P.
+If you have an I2P router running on the same machine that is all you need to do.  If you use a custom I2CP host and port, create a file `i2p.properties` and put `i2cp.tcp.host=<host>` and `i2cp.tcp.port=<port>` in there.  On Windows that file should go into `%HOME%\AppData\Roaming\MuWire`, on Mac into `$HOME/Library/Application Support/MuWire` and on Linux `$HOME/.MuWire`
+
+[Default I2CP port]\: `7654`
+
+### GPG Fingerprint
+
+```
+471B 9FD4 5517 A5ED 101F  C57D A728 3207 2D52 5E41
+```
+
+You can find the full key at https://keybase.io/zlatinb
 
 
-### Known bugs and limitations
+[Default I2CP port]: https://geti2p.net/en/docs/ports
-
-* Many UI features you would expect are not there yet
-
-### Quick FAQ
-
-* why is MuWire slow ?
-  
-  - too few sources you're downloading from
-  - you can increase the number of tunnels by using more tunnels via Options->I2P Inbound/Outbound Quantity 
-    the default is 4 and you could raise up to as high as 16 ( Caution !!!!)
-
-* my search is not returning (enough) results !
-
-  - search is keyword or hash based
-  - keywords and hash(es) are NOT regexed or wildcarded so they have to be complete
-    so searching for 'musi' will not return results with 'music' - you have to search for 'music'
-  - ALL keywords have to match 
-  - only use space for keyword separation
-  - if you already have the file in question it is not displayed ( can be changed via Options )
-
-* what's this right click -> 'Copy hash to clipboard' for ?
-
-  - if you have a specific file you wish to share or download you can use the hash as a unique identifier
-    to make sure you have exactly the right file.
-  - you can share this hash with others to ensure they are getting the right file

TODO.md

@@ -12,14 +12,6 @@ This reduces query traffic by not sending last hop queries to peers that definit
 
 This helps with scalability
 
-##### Trust List Sharing
-
-For helping users make better decisions whom to trust
-
-##### Content Control Panel
-
-To allow every user to not route queries for content they do not like.  This is mostly GUI work, the backend part is simple
-
 ##### Web UI, REST Interface, etc.
 
 Basically any non-gui non-cli user interface
@@ -31,5 +23,4 @@ To enable parsing of metadata from known file types and the user editing it or a
 ### Small Items
 
 * Wrapper of some kind for in-place upgrades
-* Download file sequentially
+* Automatic adjustment of number of I2P tunnels
-* Multiple-selection download, Ctrl-A

build.gradle

@@ -2,7 +2,7 @@ subprojects {
     apply plugin: 'groovy'
 
     dependencies {
-        compile 'net.i2p:i2p:0.9.40'
+        compile "net.i2p:i2p:${i2pVersion}"
         compile 'org.codehaus.groovy:groovy-all:2.4.15'
     }
 

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

@@ -35,7 +35,7 @@ class Cli {
 
         Core core
         try {
-            core = new Core(props, home, "0.4.4")
+            core = new Core(props, home, "0.5.2")
         } catch (Exception bad) {
             bad.printStackTrace(System.out)
             println "Failed to initialize core, exiting"

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

@@ -53,7 +53,7 @@ class CliDownloader {
 
         Core core
         try {
-            core = new Core(props, home, "0.4.4")
+            core = new Core(props, home, "0.5.2")
         } catch (Exception bad) {
             bad.printStackTrace(System.out)
             println "Failed to initialize core, exiting"

core/build.gradle

@@ -2,9 +2,9 @@ apply plugin : 'application'
 mainClassName = 'com.muwire.core.Core'
 applicationDefaultJvmArgs = ['-Djava.util.logging.config.file=logging.properties']
 dependencies {
-    compile 'net.i2p:router:0.9.40'
+    compile "net.i2p:router:${i2pVersion}"
-    compile 'net.i2p.client:mstreaming:0.9.40'
+    compile "net.i2p.client:mstreaming:${i2pVersion}"
-    compile 'net.i2p.client:streaming:0.9.40'
+    compile "net.i2p.client:streaming:${i2pVersion}"
 
     testCompile 'org.junit.jupiter:junit-jupiter-api:5.4.2'    
     testCompile 'junit:junit:4.12'

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

@@ -1,13 +0,0 @@
-package com.muwire.core
-
-import net.i2p.crypto.SigType
-
-class Constants {
-    public static final byte PERSONA_VERSION = (byte)1
-    public static final SigType SIG_TYPE = SigType.EdDSA_SHA512_Ed25519 
-    
-    public static final int MAX_HEADER_SIZE = 0x1 << 14
-    public static final int MAX_HEADERS = 16
-    
-    public static final String SPLIT_PATTERN = "[\\*\\+\\-,\\.:;\\(\\)=_/\\\\\\!\\\"\\\'\\\$%\\|\\[\\]\\{\\}\\?]"
-}

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

@@ -20,6 +20,7 @@ import com.muwire.core.download.UIDownloadPausedEvent
 import com.muwire.core.download.UIDownloadResumedEvent
 import com.muwire.core.files.FileDownloadedEvent
 import com.muwire.core.files.FileHashedEvent
+import com.muwire.core.files.FileHashingEvent
 import com.muwire.core.files.FileHasher
 import com.muwire.core.files.FileLoadedEvent
 import com.muwire.core.files.FileManager
@@ -27,6 +28,8 @@ import com.muwire.core.files.FileSharedEvent
 import com.muwire.core.files.FileUnsharedEvent
 import com.muwire.core.files.HasherService
 import com.muwire.core.files.PersisterService
+import com.muwire.core.files.UICommentEvent
+import com.muwire.core.files.UIPersistFilesEvent
 import com.muwire.core.files.AllFilesLoadedEvent
 import com.muwire.core.files.DirectoryUnsharedEvent
 import com.muwire.core.files.DirectoryWatcher
@@ -34,11 +37,13 @@ import com.muwire.core.hostcache.CacheClient
 import com.muwire.core.hostcache.HostCache
 import com.muwire.core.hostcache.HostDiscoveredEvent
 import com.muwire.core.mesh.MeshManager
+import com.muwire.core.search.BrowseManager
 import com.muwire.core.search.QueryEvent
 import com.muwire.core.search.ResultsEvent
 import com.muwire.core.search.ResultsSender
 import com.muwire.core.search.SearchEvent
 import com.muwire.core.search.SearchManager
+import com.muwire.core.search.UIBrowseEvent
 import com.muwire.core.search.UIResultBatchEvent
 import com.muwire.core.trust.TrustEvent
 import com.muwire.core.trust.TrustService
@@ -47,6 +52,8 @@ import com.muwire.core.trust.TrustSubscriptionEvent
 import com.muwire.core.update.UpdateClient
 import com.muwire.core.upload.UploadManager
 import com.muwire.core.util.MuWireLogManager
+import com.muwire.core.content.ContentControlEvent
+import com.muwire.core.content.ContentManager
 
 import groovy.util.logging.Log
 import net.i2p.I2PAppContext
@@ -89,6 +96,7 @@ public class Core {
     private final DirectoryWatcher directoryWatcher
     final FileManager fileManager
     final UploadManager uploadManager
+    final ContentManager contentManager
 
     private final Router router
 
@@ -131,6 +139,7 @@ public class Core {
         } else {
             log.info("launching embedded router")
             Properties routerProps = new Properties()
+            routerProps.setProperty("i2p.dir.base", home.getAbsolutePath())
             routerProps.setProperty("i2p.dir.config", home.getAbsolutePath())
             routerProps.setProperty("router.excludePeerCaps", "KLM")
             routerProps.setProperty("i2np.inboundKBytesPerSecond", String.valueOf(props.inBw))
@@ -140,33 +149,33 @@ public class Core {
             routerProps.setProperty("i2np.udp.port", i2pOptions["i2np.udp.port"])
             routerProps.setProperty("i2np.udp.internalPort", i2pOptions["i2np.udp.port"])
             router = new Router(routerProps)
-            I2PAppContext.getGlobalContext().metaClass = new RouterContextMetaClass()
+            router.getContext().setLogManager(new MuWireLogManager())
             router.runRouter()
             while(!router.isRunning())
                 Thread.sleep(100)
         }
 
-		log.info("initializing I2P socket manager")
+        log.info("initializing I2P socket manager")
-		def i2pClient = new I2PClientFactory().createClient()
+        def i2pClient = new I2PClientFactory().createClient()
-		File keyDat = new File(home, "key.dat")
+        File keyDat = new File(home, "key.dat")
-		if (!keyDat.exists()) {
+        if (!keyDat.exists()) {
-			log.info("Creating new key.dat")
+            log.info("Creating new key.dat")
-			keyDat.withOutputStream { 
+            keyDat.withOutputStream {
-				i2pClient.createDestination(it, Constants.SIG_TYPE)
+                i2pClient.createDestination(it, Constants.SIG_TYPE)
-			}
+            }
-		}
+        }
 
 
         // options like tunnel length and quantity
-		I2PSession i2pSession
+        I2PSession i2pSession
-		I2PSocketManager socketManager
+        I2PSocketManager socketManager
-		keyDat.withInputStream {
+        keyDat.withInputStream {
-			socketManager = new I2PSocketManagerFactory().createManager(it, i2pOptions["i2cp.tcp.host"], i2pOptions["i2cp.tcp.port"].toInteger(), i2pOptions)
+            socketManager = new I2PSocketManagerFactory().createManager(it, i2pOptions["i2cp.tcp.host"], i2pOptions["i2cp.tcp.port"].toInteger(), i2pOptions)
-		}
+        }
-		socketManager.getDefaultOptions().setReadTimeout(60000)
+        socketManager.getDefaultOptions().setReadTimeout(60000)
-		socketManager.getDefaultOptions().setConnectTimeout(30000)
+        socketManager.getDefaultOptions().setConnectTimeout(30000)
         socketManager.addDisconnectListener({eventBus.publish(new RouterDisconnectedEvent())} as DisconnectListener)
-		i2pSession = socketManager.getSession()
+        i2pSession = socketManager.getSession()
 
         def destination = new Destination()
         def spk = new SigningPrivateKey(Constants.SIG_TYPE)
@@ -175,7 +184,7 @@ public class Core {
             def privateKey = new PrivateKey()
             privateKey.readBytes(it)
             spk.readBytes(it)
-		}
+        }
 
         def baos = new ByteArrayOutputStream()
         def daos = new DataOutputStream(baos)
@@ -193,65 +202,67 @@ public class Core {
         me = new Persona(new ByteArrayInputStream(baos.toByteArray()))
         log.info("Loaded myself as "+me.getHumanReadableName())
 
-		eventBus = new EventBus()
+        eventBus = new EventBus()
 
-		log.info("initializing trust service")
+        log.info("initializing trust service")
-		File goodTrust = new File(home, "trusted")
+        File goodTrust = new File(home, "trusted")
-		File badTrust = new File(home, "distrusted")
+        File badTrust = new File(home, "distrusted")
-		trustService = new TrustService(goodTrust, badTrust, 5000)
+        trustService = new TrustService(goodTrust, badTrust, 5000)
-		eventBus.register(TrustEvent.class, trustService)
+        eventBus.register(TrustEvent.class, trustService)
 
 
-		log.info "initializing file manager"
+        log.info "initializing file manager"
-		fileManager = new FileManager(eventBus, props)
+        fileManager = new FileManager(eventBus, props)
-		eventBus.register(FileHashedEvent.class, fileManager)
+        eventBus.register(FileHashedEvent.class, fileManager)
-		eventBus.register(FileLoadedEvent.class, fileManager)
+        eventBus.register(FileLoadedEvent.class, fileManager)
-		eventBus.register(FileDownloadedEvent.class, fileManager)
+        eventBus.register(FileDownloadedEvent.class, fileManager)
-		eventBus.register(FileUnsharedEvent.class, fileManager)
+        eventBus.register(FileUnsharedEvent.class, fileManager)
-		eventBus.register(SearchEvent.class, fileManager)
+        eventBus.register(SearchEvent.class, fileManager)
         eventBus.register(DirectoryUnsharedEvent.class, fileManager)
+        eventBus.register(UICommentEvent.class, fileManager)
 
         log.info("initializing mesh manager")
         MeshManager meshManager = new MeshManager(fileManager, home, props)
         eventBus.register(SourceDiscoveredEvent.class, meshManager)
 
-		log.info "initializing persistence service"
+        log.info "initializing persistence service"
-		persisterService = new PersisterService(new File(home, "files.json"), eventBus, 15000, fileManager)
+        persisterService = new PersisterService(new File(home, "files.json"), eventBus, 60000, fileManager)
         eventBus.register(UILoadedEvent.class, persisterService)
+        eventBus.register(UIPersistFilesEvent.class, persisterService)
 
-		log.info("initializing host cache")
+        log.info("initializing host cache")
-		File hostStorage = new File(home, "hosts.json")
+        File hostStorage = new File(home, "hosts.json")
         hostCache = new HostCache(trustService,hostStorage, 30000, props, i2pSession.getMyDestination())
-		eventBus.register(HostDiscoveredEvent.class, hostCache)
+        eventBus.register(HostDiscoveredEvent.class, hostCache)
-		eventBus.register(ConnectionEvent.class, hostCache)
+        eventBus.register(ConnectionEvent.class, hostCache)
 
-		log.info("initializing connection manager")
+        log.info("initializing connection manager")
-		connectionManager = props.isLeaf() ? 
+        connectionManager = props.isLeaf() ?
-			new LeafConnectionManager(eventBus, me, 3, hostCache, props) : 
+            new LeafConnectionManager(eventBus, me, 3, hostCache, props) :
             new UltrapeerConnectionManager(eventBus, me, 512, 512, hostCache, trustService, props)
-		eventBus.register(TrustEvent.class, connectionManager)
+        eventBus.register(TrustEvent.class, connectionManager)
-		eventBus.register(ConnectionEvent.class, connectionManager)
+        eventBus.register(ConnectionEvent.class, connectionManager)
-		eventBus.register(DisconnectionEvent.class, connectionManager)
+        eventBus.register(DisconnectionEvent.class, connectionManager)
         eventBus.register(QueryEvent.class, connectionManager)
 
-		log.info("initializing cache client")
+        log.info("initializing cache client")
-		cacheClient = new CacheClient(eventBus,hostCache, connectionManager, i2pSession, props, 10000)
+        cacheClient = new CacheClient(eventBus,hostCache, connectionManager, i2pSession, props, 10000)
 
         log.info("initializing update client")
         updateClient = new UpdateClient(eventBus, i2pSession, myVersion, props, fileManager, me)
         eventBus.register(FileDownloadedEvent.class, updateClient)
         eventBus.register(UIResultBatchEvent.class, updateClient)
 
-		log.info("initializing connector")
+        log.info("initializing connector")
-		I2PConnector i2pConnector = new I2PConnector(socketManager)
+        I2PConnector i2pConnector = new I2PConnector(socketManager)
 
-		log.info "initializing results sender"
+        log.info "initializing results sender"
-		ResultsSender resultsSender = new ResultsSender(eventBus, i2pConnector, me)
+        ResultsSender resultsSender = new ResultsSender(eventBus, i2pConnector, me, props)
 
-		log.info "initializing search manager"
+        log.info "initializing search manager"
-		SearchManager searchManager = new SearchManager(eventBus, me, resultsSender)
+        SearchManager searchManager = new SearchManager(eventBus, me, resultsSender)
-		eventBus.register(QueryEvent.class, searchManager)
+        eventBus.register(QueryEvent.class, searchManager)
-		eventBus.register(ResultsEvent.class, searchManager)
+        eventBus.register(ResultsEvent.class, searchManager)
 
         log.info("initializing download manager")
         downloadManager = new DownloadManager(eventBus, trustService, meshManager, props, i2pConnector, home, me)
@@ -269,26 +280,38 @@ public class Core {
         log.info("initializing connection establisher")
         connectionEstablisher = new ConnectionEstablisher(eventBus, i2pConnector, props, connectionManager, hostCache)
 
-		log.info("initializing acceptor")
+        log.info("initializing acceptor")
-		I2PAcceptor i2pAcceptor = new I2PAcceptor(socketManager)
+        I2PAcceptor i2pAcceptor = new I2PAcceptor(socketManager)
-		connectionAcceptor = new ConnectionAcceptor(eventBus, connectionManager, props, 
+        connectionAcceptor = new ConnectionAcceptor(eventBus, connectionManager, props,
-            i2pAcceptor, hostCache, trustService, searchManager, uploadManager, connectionEstablisher)
+            i2pAcceptor, hostCache, trustService, searchManager, uploadManager, fileManager, 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)
 
         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)
 
         log.info("initializing trust subscriber")
         trustSubscriber = new TrustSubscriber(eventBus, i2pConnector, props)
         eventBus.register(UILoadedEvent.class, trustSubscriber)
         eventBus.register(TrustSubscriptionEvent.class, trustSubscriber)
-	}
+        
+        log.info("initializing content manager")
+        contentManager = new ContentManager()
+        eventBus.register(ContentControlEvent.class, contentManager)
+        eventBus.register(QueryEvent.class, contentManager)
+        
+        log.info("initializing browse manager")
+        BrowseManager browseManager = new BrowseManager(i2pConnector, eventBus)
+        eventBus.register(UIBrowseEvent.class, browseManager)
+        
+    }
 
     public void startServices() {
         hasherService.start()
@@ -318,6 +341,8 @@ public class Core {
         connectionEstablisher.stop()
         log.info("shutting down directory watcher")
         directoryWatcher.stop()
+        log.info("shutting down cache client")
+        cacheClient.stop()
         log.info("shutting down connection manager")
         connectionManager.shutdown()
         if (router != null) {
@@ -326,19 +351,6 @@ public class Core {
         }
     }
 
-    static class RouterContextMetaClass extends DelegatingMetaClass {
-        private final Object logManager = new MuWireLogManager()
-        RouterContextMetaClass() {
-            super(RouterContext.class)
-        }
-        
-        Object invokeMethod(Object object, String name, Object[] args) {
-            if (name == "logManager")
-                return logManager
-            super.invokeMethod(object, name, args)
-        }
-    }
-    
     static main(args) {
         def home = System.getProperty("user.home") + File.separator + ".MuWire"
         home = new File(home)
@@ -363,7 +375,7 @@ public class Core {
             }
         }
 
-        Core core = new Core(props, home, "0.4.4")
+        Core core = new Core(props, home, "0.5.2")
         core.startServices()
 
         // ... at the end, sleep or execute script

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

@@ -4,17 +4,17 @@ import java.util.concurrent.atomic.AtomicLong
 
 class Event {
 
-	private static final AtomicLong SEQ_NO = new AtomicLong();
+    private static final AtomicLong SEQ_NO = new AtomicLong();
-	final long seqNo
+    final long seqNo
-	final long timestamp
+    final long timestamp
 
-	Event() {
+    Event() {
-		seqNo = SEQ_NO.getAndIncrement()
+        seqNo = SEQ_NO.getAndIncrement()
-		timestamp = System.currentTimeMillis()
+        timestamp = System.currentTimeMillis()
-	}
+    }
 
-	@Override
+    @Override
-	public String toString() {
+    public String toString() {
-		"seqNo $seqNo timestamp $timestamp"
+        "seqNo $seqNo timestamp $timestamp"
-	}
+    }
 }

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

@@ -11,41 +11,46 @@ import groovy.util.logging.Log
 @Log
 class EventBus {
 
-	private Map handlers = new HashMap()
+    private Map handlers = new HashMap()
-	private final Executor executor = Executors.newSingleThreadExecutor {r ->
+    private final Executor executor = Executors.newSingleThreadExecutor {r ->
-		def rv = new Thread(r)
+        def rv = new Thread(r)
-		rv.setDaemon(true)
+        rv.setDaemon(true)
-		rv.setName("event-bus")
+        rv.setName("event-bus")
-		rv
+        rv
-	}
+    }
 
-	void publish(Event e) {
+    void publish(Event e) {
-		executor.execute({publishInternal(e)} as Runnable)
+        executor.execute({publishInternal(e)} as Runnable)
-	}
+    }
 
-	private void publishInternal(Event e) {
+    private void publishInternal(Event e) {
-		log.fine "publishing event $e of type ${e.getClass().getSimpleName()} event $e"
+        log.fine "publishing event $e of type ${e.getClass().getSimpleName()} event $e"
-		def currentHandlers
+        def currentHandlers
-		final def clazz = e.getClass()
+        final def clazz = e.getClass()
-		synchronized(this) {
+        synchronized(this) {
-			currentHandlers = handlers.getOrDefault(clazz, [])
+            currentHandlers = handlers.getOrDefault(clazz, [])
-		}
+        }
-		currentHandlers.each {
+        currentHandlers.each {
             try {
                 it."on${clazz.getSimpleName()}"(e)
             } catch (Exception bad) {
                 log.log(Level.SEVERE, "exception dispatching event",bad)
             }
-		}
+        }
-	}
+    }
 
-	synchronized void register(Class<? extends Event> eventType, def handler) {
+    synchronized void register(Class<? extends Event> eventType, def handler) {
-		log.info "Registering $handler for type $eventType"
+        log.info "Registering $handler for type $eventType"
-		def currentHandlers = handlers.get(eventType)
+        def currentHandlers = handlers.get(eventType)
-		if (currentHandlers == null) {
+        if (currentHandlers == null) {
-			currentHandlers = new CopyOnWriteArrayList()
+            currentHandlers = new CopyOnWriteArrayList()
-			handlers.put(eventType, currentHandlers)
+            handlers.put(eventType, currentHandlers)
-		}
+        }
-		currentHandlers.add handler
+        currentHandlers.add handler
-	}
+    }
+    
+    synchronized void unregister(Class<? extends Event> eventType, def handler) {
+        log.info("Unregistering $handler for type $eventType")
+        handlers[eventType]?.remove(handler)
+    }
 }

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

@@ -6,11 +6,13 @@ import com.muwire.core.hostcache.CrawlerResponse
 import com.muwire.core.util.DataUtil
 
 import net.i2p.data.Base64
+import net.i2p.util.ConcurrentHashSet
 
 class MuWireSettings {
 
     final boolean isLeaf
     boolean allowUntrusted
+    boolean searchExtraHop
     boolean allowTrustLists
     int trustListInterval
     Set<Persona> trustSubscriptions
@@ -20,45 +22,60 @@ class MuWireSettings {
     String updateType
     String nickname
     File downloadLocation
+    File incompleteLocation
     CrawlerResponse crawlerResponse
     boolean shareDownloadedFiles
+    boolean shareHiddenFiles
+    boolean searchComments
+    boolean browseFiles
     Set<String> watchedDirectories
     float downloadSequentialRatio
-    int hostClearInterval
+    int hostClearInterval, hostHopelessInterval, hostRejectInterval
     int meshExpiration
+    int speedSmoothSeconds
     boolean embeddedRouter
     int inBw, outBw
+    Set<String> watchedKeywords
+    Set<String> watchedRegexes
 
-	MuWireSettings() {
+    MuWireSettings() {
         this(new Properties())
     }
 
-	MuWireSettings(Properties props) {
+    MuWireSettings(Properties props) {
-		isLeaf = Boolean.valueOf(props.get("leaf","false"))
+        isLeaf = Boolean.valueOf(props.get("leaf","false"))
-		allowUntrusted = Boolean.valueOf(props.getProperty("allowUntrusted","true"))
+        allowUntrusted = Boolean.valueOf(props.getProperty("allowUntrusted","true"))
+        searchExtraHop = Boolean.valueOf(props.getProperty("searchExtraHop","false"))
         allowTrustLists = Boolean.valueOf(props.getProperty("allowTrustLists","true"))
         trustListInterval = Integer.valueOf(props.getProperty("trustListInterval","1"))
-		crawlerResponse = CrawlerResponse.valueOf(props.get("crawlerResponse","REGISTERED"))
+        crawlerResponse = CrawlerResponse.valueOf(props.get("crawlerResponse","REGISTERED"))
         nickname = props.getProperty("nickname","MuWireUser")
         downloadLocation = new File((String)props.getProperty("downloadLocation",
             System.getProperty("user.home")))
-        downloadRetryInterval = Integer.parseInt(props.getProperty("downloadRetryInterval","1"))
+        String incompleteLocationProp = props.getProperty("incompleteLocation")
+        if (incompleteLocationProp != null)
+            incompleteLocation = new File(incompleteLocationProp)
+        downloadRetryInterval = Integer.parseInt(props.getProperty("downloadRetryInterval","60"))
         updateCheckInterval = Integer.parseInt(props.getProperty("updateCheckInterval","24"))
         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","60"))
+        hostClearInterval = Integer.valueOf(props.getProperty("hostClearInterval","15"))
+        hostHopelessInterval = Integer.valueOf(props.getProperty("hostHopelessInterval", "1440"))
+        hostRejectInterval = Integer.valueOf(props.getProperty("hostRejectInterval", "1"))
         meshExpiration = Integer.valueOf(props.getProperty("meshExpiration","60"))
         embeddedRouter = Boolean.valueOf(props.getProperty("embeddedRouter","false"))
         inBw = Integer.valueOf(props.getProperty("inBw","256"))
         outBw = Integer.valueOf(props.getProperty("outBw","128"))
+        searchComments = Boolean.valueOf(props.getProperty("searchComments","true"))
+        browseFiles = Boolean.valueOf(props.getProperty("browseFiles","true"))
+        speedSmoothSeconds = Integer.valueOf(props.getProperty("speedSmoothSeconds","60"))
 
-        watchedDirectories = new HashSet<>()
+        watchedDirectories = readEncodedSet(props, "watchedDirectories")
-        if (props.containsKey("watchedDirectories")) {
+        watchedKeywords = readEncodedSet(props, "watchedKeywords")
-            String[] encoded = props.getProperty("watchedDirectories").split(",")
+        watchedRegexes = readEncodedSet(props, "watchedRegexes")
-            encoded.each { watchedDirectories << DataUtil.readi18nString(Base64.decode(it)) }
-        }
 
         trustSubscriptions = new HashSet<>()
         if (props.containsKey("trustSubscriptions")) {
@@ -66,35 +83,43 @@ class MuWireSettings {
                 trustSubscriptions.add(new Persona(new ByteArrayInputStream(Base64.decode(it))))
             }
         }
-	}
+        
+        
+    }
 
     void write(OutputStream out) throws IOException {
         Properties props = new Properties()
         props.setProperty("leaf", isLeaf.toString())
         props.setProperty("allowUntrusted", allowUntrusted.toString())
+        props.setProperty("searchExtraHop", String.valueOf(searchExtraHop))
         props.setProperty("allowTrustLists", String.valueOf(allowTrustLists))
         props.setProperty("trustListInterval", String.valueOf(trustListInterval))
         props.setProperty("crawlerResponse", crawlerResponse.toString())
         props.setProperty("nickname", nickname)
         props.setProperty("downloadLocation", downloadLocation.getAbsolutePath())
+        if (incompleteLocation != null)
+            props.setProperty("incompleteLocation", incompleteLocation.getAbsolutePath())
         props.setProperty("downloadRetryInterval", String.valueOf(downloadRetryInterval))
         props.setProperty("updateCheckInterval", String.valueOf(updateCheckInterval))
         props.setProperty("autoDownloadUpdate", String.valueOf(autoDownloadUpdate))
-        props.setProperty("updateType",updateType)
+        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))
+        props.setProperty("hostRejectInterval", String.valueOf(hostRejectInterval))
         props.setProperty("meshExpiration", String.valueOf(meshExpiration))
         props.setProperty("embeddedRouter", String.valueOf(embeddedRouter))
         props.setProperty("inBw", String.valueOf(inBw))
         props.setProperty("outBw", String.valueOf(outBw))
+        props.setProperty("searchComments", String.valueOf(searchComments))
+        props.setProperty("browseFiles", String.valueOf(browseFiles))
+        props.setProperty("speedSmoothSeconds", String.valueOf(speedSmoothSeconds))
 
-        if (!watchedDirectories.isEmpty()) {
+        writeEncodedSet(watchedDirectories, "watchedDirectories", props)
-            String encoded = watchedDirectories.stream().
+        writeEncodedSet(watchedKeywords, "watchedKeywords", props)
-                map({Base64.encode(DataUtil.encodei18nString(it))}).
+        writeEncodedSet(watchedRegexes, "watchedRegexes", props)
-                collect(Collectors.joining(","))
-            props.setProperty("watchedDirectories", encoded)
-        }
 
         if (!trustSubscriptions.isEmpty()) {
             String encoded = trustSubscriptions.stream().
@@ -106,25 +131,43 @@ class MuWireSettings {
         props.store(out, "")
     }
     
-	boolean isLeaf() {
+    private static Set<String> readEncodedSet(Properties props, String property) {
-		isLeaf
+        Set<String> rv = new ConcurrentHashSet<>()
-	}
+        if (props.containsKey(property)) {
+            String[] encoded = props.getProperty(property).split(",")
+            encoded.each { rv << DataUtil.readi18nString(Base64.decode(it)) }
+        }
+        rv
+    }
     
-	boolean allowUntrusted() {
+    private static void writeEncodedSet(Set<String> set, String property, Properties props) {
-		allowUntrusted
+        if (set.isEmpty())
-	} 
+            return
+        String encoded = set.stream().
+            map({Base64.encode(DataUtil.encodei18nString(it))}).
+            collect(Collectors.joining(","))
+        props.setProperty(property, encoded)
+    }
 
-	void setAllowUntrusted(boolean allowUntrusted) {
+    boolean isLeaf() {
-		this.allowUntrusted = allowUntrusted
+        isLeaf
-	}
+    }
 
-	CrawlerResponse getCrawlerResponse() {
+    boolean allowUntrusted() {
-		crawlerResponse
+        allowUntrusted
-	}
+    }
 
-	void setCrawlerResponse(CrawlerResponse crawlerResponse) {
+    void setAllowUntrusted(boolean allowUntrusted) {
-		this.crawlerResponse = crawlerResponse
+        this.allowUntrusted = allowUntrusted
-	}
+    }
+
+    CrawlerResponse getCrawlerResponse() {
+        crawlerResponse
+    }
+
+    void setCrawlerResponse(CrawlerResponse crawlerResponse) {
+        this.crawlerResponse = crawlerResponse
+    }
 
     String getNickname() {
         nickname

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

@@ -2,12 +2,12 @@ package com.muwire.core
 
 abstract class Service {
 
-	volatile boolean loaded
+    volatile boolean loaded
 
-	abstract void load()
+    abstract void load()
 
-	void waitForLoad() {
+    void waitForLoad() {
-		while (!loaded)
+        while (!loaded)
-			Thread.sleep(10)
+            Thread.sleep(10)
-	}
+    }
 }

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

@@ -0,0 +1,7 @@
+package com.muwire.core
+
+class SplitPattern {
+    
+    public static final String SPLIT_PATTERN = "[\\*\\+\\-,\\.:;\\(\\)=_/\\\\\\!\\\"\\\'\\\$%\\|\\[\\]\\{\\}\\?]";
+    
+}

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

@@ -25,104 +25,104 @@ abstract class Connection implements Closeable {
     private static final int SEARCHES = 10
     private static final long INTERVAL = 1000
 
-	final EventBus eventBus
+    final EventBus eventBus
-	final Endpoint endpoint
+    final Endpoint endpoint
-	final boolean incoming
+    final boolean incoming
-	final HostCache hostCache
+    final HostCache hostCache
     final TrustService trustService
     final MuWireSettings settings
 
-	private final AtomicBoolean running = new AtomicBoolean()
+    private final AtomicBoolean running = new AtomicBoolean()
-	private final BlockingQueue messages = new LinkedBlockingQueue()
+    private final BlockingQueue messages = new LinkedBlockingQueue()
-	private final Thread reader, writer
+    private final Thread reader, writer
     private final LinkedList<Long> searchTimestamps = new LinkedList<>()
 
-	protected final String name
+    protected final String name
 
-	long lastPingSentTime, lastPongReceivedTime
+    long lastPingSentTime, lastPongReceivedTime
 
-	Connection(EventBus eventBus, Endpoint endpoint, boolean incoming, 
+    Connection(EventBus eventBus, Endpoint endpoint, boolean incoming,
         HostCache hostCache, TrustService trustService, MuWireSettings settings) {
-		this.eventBus = eventBus
+        this.eventBus = eventBus
-		this.incoming = incoming
+        this.incoming = incoming
-		this.endpoint = endpoint
+        this.endpoint = endpoint
-		this.hostCache = hostCache
+        this.hostCache = hostCache
         this.trustService = trustService
         this.settings = settings
 
-		this.name = endpoint.destination.toBase32().substring(0,8)
+        this.name = endpoint.destination.toBase32().substring(0,8)
 
-		this.reader = new Thread({readLoop()} as Runnable)
+        this.reader = new Thread({readLoop()} as Runnable)
-		this.reader.setName("reader-$name")
+        this.reader.setName("reader-$name")
-		this.reader.setDaemon(true)
+        this.reader.setDaemon(true)
 
-		this.writer = new Thread({writeLoop()} as Runnable)
+        this.writer = new Thread({writeLoop()} as Runnable)
-		this.writer.setName("writer-$name")
+        this.writer.setName("writer-$name")
-		this.writer.setDaemon(true)
+        this.writer.setDaemon(true)
-	}
+    }
 
-	/**
+    /**
-	 * starts the connection threads
+     * starts the connection threads
-	 */
+     */
-	void start() {
+    void start() {
-		if (!running.compareAndSet(false, true)) {
+        if (!running.compareAndSet(false, true)) {
-			log.log(Level.WARNING,"$name already running", new Exception())
+            log.log(Level.WARNING,"$name already running", new Exception())
-			return
+            return
-		}
+        }
-		reader.start()
+        reader.start()
-		writer.start()
+        writer.start()
-	}
+    }
 
-	@Override
+    @Override
-	public void close() {
+    public void close() {
-		if (!running.compareAndSet(true, false)) {
+        if (!running.compareAndSet(true, false)) {
-			log.log(Level.WARNING, "$name already closed", new Exception() )
+            log.log(Level.WARNING, "$name already closed", new Exception() )
-			return
+            return
-		}
+        }
         log.info("closing $name")
-		reader.interrupt()
+        reader.interrupt()
-		writer.interrupt()
+        writer.interrupt()
-		endpoint.close()
+        endpoint.close()
-		eventBus.publish(new DisconnectionEvent(destination: endpoint.destination))
+        eventBus.publish(new DisconnectionEvent(destination: endpoint.destination))
-	}
+    }
 
-	protected void readLoop() {
+    protected void readLoop() {
-		try {
+        try {
-			while(running.get()) {
+            while(running.get()) {
-				read()
+                read()
-			}
+            }
-		} catch (SocketTimeoutException e) {
+        } catch (SocketTimeoutException e) {
         } catch (Exception e) {
             log.log(Level.WARNING,"unhandled exception in reader",e)
         } finally {
             close()
         }
-	}
+    }
 
-	protected abstract void read()
+    protected abstract void read()
 
-	protected void writeLoop() {
+    protected void writeLoop() {
-		try {
+        try {
-			while(running.get()) {
+            while(running.get()) {
-				def message = messages.take()
+                def message = messages.take()
-				write(message)
+                write(message)
-			}
+            }
-		} catch (Exception e) {
+        } catch (Exception e) {
             log.log(Level.WARNING, "unhandled exception in writer",e)
         } finally {
             close()
         }
-	}
+    }
 
-	protected abstract void write(def message);
+    protected abstract void write(def message);
 
-	void sendPing() {
+    void sendPing() {
-		def ping = [:]
+        def ping = [:]
-		ping.type = "Ping"
+        ping.type = "Ping"
-		ping.version = 1
+        ping.version = 1
-		messages.put(ping)
+        messages.put(ping)
-		lastPingSentTime = System.currentTimeMillis()
+        lastPingSentTime = System.currentTimeMillis()
-	}
+    }
 
     void sendQuery(QueryEvent e) {
         def query = [:]
@@ -132,6 +132,8 @@ abstract class Connection implements Closeable {
         query.firstHop = e.firstHop
         query.keywords = e.searchEvent.getSearchTerms()
         query.oobInfohash = e.searchEvent.oobInfohash
+        query.searchComments = e.searchEvent.searchComments
+        query.compressedResults = e.searchEvent.compressedResults
         if (e.searchEvent.searchHash != null)
             query.infohash = Base64.encode(e.searchEvent.searchHash)
         query.replyTo = e.replyTo.toBase64()
@@ -140,25 +142,25 @@ abstract class Connection implements Closeable {
         messages.put(query)
     }
 
-	protected void handlePing() {
+    protected void handlePing() {
-		log.fine("$name received ping")
+        log.fine("$name received ping")
-		def pong = [:]
+        def pong = [:]
-		pong.type = "Pong"
+        pong.type = "Pong"
-		pong.version = 1
+        pong.version = 1
-		pong.pongs = hostCache.getGoodHosts(10).collect { d -> d.toBase64() }
+        pong.pongs = hostCache.getGoodHosts(10).collect { d -> d.toBase64() }
-		messages.put(pong)
+        messages.put(pong)
-	}
+    }
 
-	protected void handlePong(def pong) {
+    protected void handlePong(def pong) {
-		log.fine("$name received pong")
+        log.fine("$name received pong")
-		lastPongReceivedTime = System.currentTimeMillis()
+        lastPongReceivedTime = System.currentTimeMillis()
-		if (pong.pongs == null)
+        if (pong.pongs == null)
-			throw new Exception("Pong doesn't have pongs")
+            throw new Exception("Pong doesn't have pongs")
-		pong.pongs.each { 
+        pong.pongs.each {
-			def dest = new Destination(it)
+            def dest = new Destination(it)
-			eventBus.publish(new HostDiscoveredEvent(destination: dest))
+            eventBus.publish(new HostDiscoveredEvent(destination: dest))
-		}
+        }
-	}
+    }
 
     private boolean throttleSearch() {
         final long now = System.currentTimeMillis()
@@ -209,11 +211,19 @@ abstract class Connection implements Closeable {
         boolean oob = false
         if (search.oobInfohash != null)
             oob = search.oobInfohash
+        boolean searchComments = false
+        if (search.searchComments != null)
+            searchComments = search.searchComments
+        boolean compressedResults = false
+        if (search.compressedResults != null)
+            compressedResults = search.compressedResults
 
         SearchEvent searchEvent = new SearchEvent(searchTerms : search.keywords,
                                             searchHash : infohash,
                                             uuid : uuid,
-                                            oobInfohash : oob)
+                                            oobInfohash : oob,
+                                            searchComments : searchComments,
+                                            compressedResults : compressedResults)
         QueryEvent event = new QueryEvent ( searchEvent : searchEvent,
                                             replyTo : replyTo,
                                             originator : originator,

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

@@ -5,11 +5,15 @@ import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
 import java.util.logging.Level
 import java.util.zip.DeflaterOutputStream
+import java.util.zip.GZIPInputStream
+import java.util.zip.GZIPOutputStream
 import java.util.zip.InflaterInputStream
 
+import com.muwire.core.Constants
 import com.muwire.core.EventBus
 import com.muwire.core.MuWireSettings
 import com.muwire.core.Persona
+import com.muwire.core.files.FileManager
 import com.muwire.core.hostcache.HostCache
 import com.muwire.core.trust.TrustLevel
 import com.muwire.core.trust.TrustService
@@ -17,6 +21,7 @@ import com.muwire.core.upload.UploadManager
 import com.muwire.core.util.DataUtil
 import com.muwire.core.search.InvalidSearchResultException
 import com.muwire.core.search.ResultsParser
+import com.muwire.core.search.ResultsSender
 import com.muwire.core.search.SearchManager
 import com.muwire.core.search.UIResultBatchEvent
 import com.muwire.core.search.UIResultEvent
@@ -25,132 +30,141 @@ import com.muwire.core.search.UnexpectedResultsException
 import groovy.json.JsonOutput
 import groovy.json.JsonSlurper
 import groovy.util.logging.Log
+import net.i2p.data.Base64
 
 @Log
 class ConnectionAcceptor {
 
-	final EventBus eventBus
+    final EventBus eventBus
-	final UltrapeerConnectionManager manager
+    final UltrapeerConnectionManager manager
-	final MuWireSettings settings
+    final MuWireSettings settings
-	final I2PAcceptor acceptor
+    final I2PAcceptor acceptor
-	final HostCache hostCache
+    final HostCache hostCache
-	final TrustService trustService
+    final TrustService trustService
     final SearchManager searchManager
     final UploadManager uploadManager
+    final FileManager fileManager
     final ConnectionEstablisher establisher
 
-	final ExecutorService acceptorThread
+    final ExecutorService acceptorThread
-	final ExecutorService handshakerThreads
+    final ExecutorService handshakerThreads
 
     private volatile shutdown
 
-	ConnectionAcceptor(EventBus eventBus, UltrapeerConnectionManager manager,
+    ConnectionAcceptor(EventBus eventBus, UltrapeerConnectionManager manager,
-		MuWireSettings settings, I2PAcceptor acceptor, HostCache hostCache,
+        MuWireSettings settings, I2PAcceptor acceptor, HostCache hostCache,
-		TrustService trustService, SearchManager searchManager, UploadManager uploadManager,
+        TrustService trustService, SearchManager searchManager, UploadManager uploadManager,
-        ConnectionEstablisher establisher) {
+        FileManager fileManager, ConnectionEstablisher establisher) {
-		this.eventBus = eventBus
+        this.eventBus = eventBus
-		this.manager = manager
+        this.manager = manager
-		this.settings = settings
+        this.settings = settings
-		this.acceptor = acceptor
+        this.acceptor = acceptor
-		this.hostCache = hostCache
+        this.hostCache = hostCache
-		this.trustService = trustService
+        this.trustService = trustService
         this.searchManager = searchManager
+        this.fileManager = fileManager
         this.uploadManager = uploadManager
-		this.establisher = establisher
+        this.establisher = establisher
 
-		acceptorThread = Executors.newSingleThreadExecutor { r -> 
+        acceptorThread = Executors.newSingleThreadExecutor { r ->
-			def rv = new Thread(r)
+            def rv = new Thread(r)
-			rv.setDaemon(true)
+            rv.setDaemon(true)
-			rv.setName("acceptor")
+            rv.setName("acceptor")
-			rv
+            rv
-		}
+        }
 
-		handshakerThreads = Executors.newCachedThreadPool { r ->
+        handshakerThreads = Executors.newCachedThreadPool { r ->
-			def rv = new Thread(r)
+            def rv = new Thread(r)
-			rv.setDaemon(true)
+            rv.setDaemon(true)
-			rv.setName("acceptor-processor-${System.currentTimeMillis()}")
+            rv.setName("acceptor-processor-${System.currentTimeMillis()}")
-			rv
+            rv
-		}
+        }
-	}
+    }
 
-	void start() {
+    void start() {
-		acceptorThread.execute({acceptLoop()} as Runnable)
+        acceptorThread.execute({acceptLoop()} as Runnable)
-	}
+    }
 
-	void stop() {
+    void stop() {
         shutdown = true
-		acceptorThread.shutdownNow()
+        acceptorThread.shutdownNow()
-		handshakerThreads.shutdownNow()
+        handshakerThreads.shutdownNow()
-	}
+    }
 
-	private void acceptLoop() {
+    private void acceptLoop() {
         try {
-		while(true) {
+        while(true) {
-			def incoming = acceptor.accept()
+            def incoming = acceptor.accept()
-			log.info("accepted connection from ${incoming.destination.toBase32()}")
+            log.info("accepted connection from ${incoming.destination.toBase32()}")
-			switch(trustService.getLevel(incoming.destination)) {
+            switch(trustService.getLevel(incoming.destination)) {
-				case TrustLevel.TRUSTED : break
+                case TrustLevel.TRUSTED : break
-				case TrustLevel.NEUTRAL :
+                case TrustLevel.NEUTRAL :
-					if (settings.allowUntrusted())
+                    if (settings.allowUntrusted())
-						break
+                        break
-				case TrustLevel.DISTRUSTED :
+                case TrustLevel.DISTRUSTED :
-					log.info("Disallowing distrusted connection")
+                    log.info("Disallowing distrusted connection")
-					incoming.close()
+                    incoming.close()
-					continue
+                    continue
-			}
+            }
-			handshakerThreads.execute({processIncoming(incoming)} as Runnable)
+            handshakerThreads.execute({processIncoming(incoming)} as Runnable)
-		}
+        }
         } catch (Exception e) {
             log.log(Level.WARNING, "exception in accept loop",e)
             if (!shutdown)
                 throw e
         }
-	}
+    }
 
-	private void processIncoming(Endpoint e) {
+    private void processIncoming(Endpoint e) {
-		InputStream is = e.inputStream
+        InputStream is = e.inputStream
-		try {
+        try {
-			int read = is.read()
+            int read = is.read()
-			switch(read) {
+            switch(read) {
-				case (byte)'M':
+                case (byte)'M':
                     if (settings.isLeaf())
                         throw new IOException("Incoming connection as leaf")
-					processMuWire(e)
+                    processMuWire(e)
-					break
+                    break
-				case (byte)'G':
+                case (byte)'G':
-					processGET(e)
+                    processGET(e)
-					break
+                    break
                 case (byte)'H':
                     processHashList(e)
                     break
                 case (byte)'P':
                     processPOST(e)
                     break
+                case (byte)'R':
+                    processRESULTS(e)
+                    break
                 case (byte)'T':
                     processTRUST(e)
                     break
-				default:
+                case (byte)'B':
-					throw new Exception("Invalid read $read")
+                    processBROWSE(e)
-			}
+                    break
-		} catch (Exception ex) {
+                default:
-			log.log(Level.WARNING, "incoming connection failed",ex)
+                    throw new Exception("Invalid read $read")
-			e.close()
+            }
-			eventBus.publish new ConnectionEvent(endpoint: e, incoming: true, leaf: null, status: ConnectionAttemptStatus.FAILED)
+        } catch (Exception ex) {
-		}
+            log.log(Level.WARNING, "incoming connection failed",ex)
-	}
+            e.close()
+            eventBus.publish new ConnectionEvent(endpoint: e, incoming: true, leaf: null, status: ConnectionAttemptStatus.FAILED)
+        }
+    }
 
-	private void processMuWire(Endpoint e) {
+    private void processMuWire(Endpoint e) {
-		byte[] uWire = "uWire ".bytes
+        byte[] uWire = "uWire ".bytes
-		for (int i = 0; i < uWire.length; i++) {
+        for (int i = 0; i < uWire.length; i++) {
-			int read = e.inputStream.read()
+            int read = e.inputStream.read()
-			if (read != uWire[i]) {
+            if (read != uWire[i]) {
-				throw new IOException("unexpected value $read at position $i")
+                throw new IOException("unexpected value $read at position $i")
-			}
+            }
-		}
+        }
 
-		byte[] type = new byte[4]
+        byte[] type = new byte[4]
-		DataInputStream dis = new DataInputStream(e.inputStream)
+        DataInputStream dis = new DataInputStream(e.inputStream)
-		dis.readFully(type)
+        dis.readFully(type)
 
         if (type == "leaf".bytes)
             handleIncoming(e, true)
@@ -160,44 +174,44 @@ class ConnectionAcceptor {
             throw new IOException("unknown connection type $type")
     }
 
-	private void handleIncoming(Endpoint e, boolean leaf) {
+    private void handleIncoming(Endpoint e, boolean leaf) {
-		boolean accept = !manager.isConnected(e.destination) && 
+        boolean accept = !manager.isConnected(e.destination) &&
             !establisher.isInProgress(e.destination) &&
             (leaf ? manager.hasLeafSlots() : manager.hasPeerSlots())
-		if (accept) {
+        if (accept) {
-			log.info("accepting connection, leaf:$leaf")
+            log.info("accepting connection, leaf:$leaf")
-			e.outputStream.write("OK".bytes)
+            e.outputStream.write("OK".bytes)
-			e.outputStream.flush()
+            e.outputStream.flush()
-			def wrapped = new Endpoint(e.destination, new InflaterInputStream(e.inputStream), new DeflaterOutputStream(e.outputStream, true), e.toClose)
+            def wrapped = new Endpoint(e.destination, new InflaterInputStream(e.inputStream), new DeflaterOutputStream(e.outputStream, true), e.toClose)
-			eventBus.publish(new ConnectionEvent(endpoint: wrapped, incoming: true, leaf: leaf, status: ConnectionAttemptStatus.SUCCESSFUL))
+            eventBus.publish(new ConnectionEvent(endpoint: wrapped, incoming: true, leaf: leaf, status: ConnectionAttemptStatus.SUCCESSFUL))
-		} else {
+        } else {
-			log.info("rejecting connection, leaf:$leaf")
+            log.info("rejecting connection, leaf:$leaf")
-			e.outputStream.write("REJECT".bytes)
+            e.outputStream.write("REJECT".bytes)
-			def hosts = hostCache.getGoodHosts(10)
+            def hosts = hostCache.getGoodHosts(10)
-			if (!hosts.isEmpty()) {
+            if (!hosts.isEmpty()) {
-				def json = [:]
+                def json = [:]
-				json.tryHosts = hosts.collect { d -> d.toBase64() }
+                json.tryHosts = hosts.collect { d -> d.toBase64() }
-				json = JsonOutput.toJson(json)
+                json = JsonOutput.toJson(json)
-				def os = new DataOutputStream(e.outputStream)
+                def os = new DataOutputStream(e.outputStream)
-				os.writeShort(json.bytes.length)
+                os.writeShort(json.bytes.length)
-				os.write(json.bytes)
+                os.write(json.bytes)
-			}
+            }
-			e.outputStream.flush()
+            e.outputStream.flush()
-			e.close()
+            e.close()
-			eventBus.publish(new ConnectionEvent(endpoint: e, incoming: true, leaf: leaf, status: ConnectionAttemptStatus.REJECTED))
+            eventBus.publish(new ConnectionEvent(endpoint: e, incoming: true, leaf: leaf, status: ConnectionAttemptStatus.REJECTED))
-		}
+        }
-	}
+    }
 
 
 
-	private void processGET(Endpoint e) {
+    private void processGET(Endpoint e) {
         byte[] et = new byte[3]
         final DataInputStream dis = new DataInputStream(e.getInputStream())
         dis.readFully(et)
         if (et != "ET ".getBytes(StandardCharsets.US_ASCII))
             throw new IOException("Invalid GET connection")
         uploadManager.processGET(e)
-	}
+    }
 
     private void processHashList(Endpoint e) {
         byte[] ashList = new byte[8]
@@ -229,7 +243,7 @@ class ConnectionAcceptor {
 
             Persona sender = new Persona(dis)
             if (sender.destination != e.getDestination())
-                throw new IOException("Sender destination mismatch expected $e.getDestination(), got $sender.destination")
+                throw new IOException("Sender destination mismatch expected ${e.getDestination()}, got $sender.destination")
             int nResults = dis.readUnsignedShort()
             UIResultEvent[] results = new UIResultEvent[nResults]
             for (int i = 0; i < nResults; i++) {
@@ -247,43 +261,146 @@ class ConnectionAcceptor {
         }
     }
     
-    private void processTRUST(Endpoint e) {
+    private void processRESULTS(Endpoint e) {
-        byte[] RUST = new byte[6]
+        InputStream is = e.getInputStream()
-        DataInputStream dis = new DataInputStream(e.getInputStream())
+        DataInputStream dis = new DataInputStream(is)
-        dis.readFully(RUST)
+        byte[] esults = new byte[7]
-        if (RUST != "RUST\r\n".getBytes(StandardCharsets.US_ASCII))
+        dis.readFully(esults)
-            throw new IOException("Invalid TRUST connection")
+        if (esults != "ESULTS ".getBytes(StandardCharsets.US_ASCII))
-        String header
+            throw new IOException("Invalid RESULTS connection")
-        while ((header = DataUtil.readTillRN(dis)) != ""); // ignore headers for now
             
-        OutputStream os = e.getOutputStream()
+        JsonSlurper slurper = new JsonSlurper()
-        if (!settings.allowTrustLists) {
+        try {
-            os.write("403 Not Allowed\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
+            String uuid = DataUtil.readTillRN(dis)
-            os.flush()
+            UUID resultsUUID = UUID.fromString(uuid)
+            if (!searchManager.hasLocalSearch(resultsUUID))
+                throw new UnexpectedResultsException(resultsUUID.toString())
+            
+                
+            // parse all headers
+            Map<String,String> headers = new HashMap<>()
+            String header
+            while((header = DataUtil.readTillRN(is)) != "" && headers.size() < Constants.MAX_HEADERS) {
+                int colon = header.indexOf(':')
+                if (colon == -1 || colon == header.length() - 1)
+                    throw new IOException("invalid header $header")
+                String key = header.substring(0, colon)
+                String value = header.substring(colon + 1)
+                headers[key] = value.trim()
+            }
+            
+            if (!headers.containsKey("Sender"))
+                throw new IOException("No Sender header")
+            if (!headers.containsKey("Count"))
+                throw new IOException("No Count header")
+                
+            byte [] personaBytes = Base64.decode(headers['Sender'])
+            Persona sender = new Persona(new ByteArrayInputStream(personaBytes))
+            if (sender.destination != e.getDestination())
+                throw new IOException("Sender destination mismatch expected ${e.getDestination()}, got $sender.destination")
+                
+            int nResults = Integer.parseInt(headers['Count'])
+            if (nResults > Constants.MAX_RESULTS)
+                throw new IOException("too many results $nResults")
+                
+            dis = new DataInputStream(new GZIPInputStream(dis))
+            UIResultEvent[] results = new UIResultEvent[nResults]
+            for (int i = 0; i < nResults; i++) {
+                int jsonSize = dis.readUnsignedShort()
+                byte [] payload = new byte[jsonSize]
+                dis.readFully(payload)
+                def json = slurper.parse(payload)
+                results[i] = ResultsParser.parse(sender, resultsUUID, json)
+            }
+            eventBus.publish(new UIResultBatchEvent(uuid: resultsUUID, results: results))
+        } catch (IOException bad) {
+            log.log(Level.WARNING, "failed to process RESULTS", bad)
+        } finally {
             e.close()
-            return
         }
             
-        os.write("200 OK\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
+    }
-        List<Persona> good = new ArrayList<>(trustService.good.values())
-        int size = Math.min(Short.MAX_VALUE * 2, good.size())
-        good = good.subList(0, size)
-        DataOutputStream dos = new DataOutputStream(os)
-        dos.writeShort(size)
-        good.each {
-            it.write(dos)
-        }
     
-        List<Persona> bad = new ArrayList<>(trustService.bad.values())
+    private void processBROWSE(Endpoint e) {
-        size = Math.min(Short.MAX_VALUE * 2, bad.size())
+        try {
-        bad = bad.subList(0, size)
+            byte [] rowse = new byte[7]
-        dos.writeShort(size)
+            DataInputStream dis = new DataInputStream(e.getInputStream())
-        bad.each {
+            dis.readFully(rowse)
-            it.write(dos)
+            if (rowse != "ROWSE\r\n".getBytes(StandardCharsets.US_ASCII))
-        }
+                throw new IOException("Invalid BROWSE connection")
+            String header
+            while ((header = DataUtil.readTillRN(dis)) != ""); // ignore headers for now
 
-        dos.flush()
+            OutputStream os = e.getOutputStream()
-        e.close()
+            if (!settings.browseFiles) {
+                os.write("403 Not Allowed\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
+                os.flush()
+                e.close()
+                return
+            }
+
+
+            os.write("200 OK\r\n".getBytes(StandardCharsets.US_ASCII))
+
+            def sharedFiles = fileManager.getSharedFiles().values()
+
+            os.write("Count: ${sharedFiles.size()}\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
+
+            DataOutputStream dos = new DataOutputStream(new GZIPOutputStream(os))
+            JsonOutput jsonOutput = new JsonOutput()
+            sharedFiles.each {
+                def obj = ResultsSender.sharedFileToObj(it, false)
+                def json = jsonOutput.toJson(obj)
+                dos.writeShort((short)json.length())
+                dos.write(json.getBytes(StandardCharsets.US_ASCII))
+            }
+            dos.flush()
+            dos.close()
+        } finally {
+            e.close()
+        }
+    }
+
+    private void processTRUST(Endpoint e) {
+        try {
+            byte[] RUST = new byte[6]
+            DataInputStream dis = new DataInputStream(e.getInputStream())
+            dis.readFully(RUST)
+            if (RUST != "RUST\r\n".getBytes(StandardCharsets.US_ASCII))
+                throw new IOException("Invalid TRUST connection")
+            String header
+            while ((header = DataUtil.readTillRN(dis)) != ""); // ignore headers for now
+
+                OutputStream os = e.getOutputStream()
+            if (!settings.allowTrustLists) {
+                os.write("403 Not Allowed\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
+                os.flush()
+                e.close()
+                return
+            }
+
+            os.write("200 OK\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
+            List<Persona> good = new ArrayList<>(trustService.good.values())
+            int size = Math.min(Short.MAX_VALUE * 2, good.size())
+            good = good.subList(0, size)
+            DataOutputStream dos = new DataOutputStream(os)
+            dos.writeShort(size)
+            good.each {
+                it.write(dos)
+            }
+
+            List<Persona> bad = new ArrayList<>(trustService.bad.values())
+            size = Math.min(Short.MAX_VALUE * 2, bad.size())
+            bad = bad.subList(0, size)
+            dos.writeShort(size)
+            bad.each {
+                it.write(dos)
+            }
+
+            dos.flush()
+        } finally {
+            e.close()
+        }
     }
 
 }

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

@@ -22,162 +22,167 @@ import net.i2p.util.ConcurrentHashSet
 @Log
 class ConnectionEstablisher {
 
-	private static final int CONCURRENT = 4
+    private static final int CONCURRENT = 4
 
-	final EventBus eventBus
+    final EventBus eventBus
-	final I2PConnector i2pConnector
+    final I2PConnector i2pConnector
-	final MuWireSettings settings
+    final MuWireSettings settings
-	final ConnectionManager connectionManager
+    final ConnectionManager connectionManager
-	final HostCache hostCache
+    final HostCache hostCache
 
-	final Timer timer
+    final Timer timer
-	final ExecutorService executor
+    final ExecutorService executor, closer
 
-	final Set inProgress = new ConcurrentHashSet()
+    final Set inProgress = new ConcurrentHashSet()
 
     ConnectionEstablisher(){}
 
-	ConnectionEstablisher(EventBus eventBus, I2PConnector i2pConnector, MuWireSettings settings,
+    ConnectionEstablisher(EventBus eventBus, I2PConnector i2pConnector, MuWireSettings settings,
-		ConnectionManager connectionManager, HostCache hostCache) {
+        ConnectionManager connectionManager, HostCache hostCache) {
-		this.eventBus = eventBus
+        this.eventBus = eventBus
-		this.i2pConnector = i2pConnector
+        this.i2pConnector = i2pConnector
-		this.settings = settings
+        this.settings = settings
-		this.connectionManager = connectionManager
+        this.connectionManager = connectionManager
-		this.hostCache = hostCache
+        this.hostCache = hostCache
-		timer = new Timer("connection-timer",true)
+        timer = new Timer("connection-timer",true)
-		executor = Executors.newFixedThreadPool(CONCURRENT, { r -> 
+        executor = Executors.newFixedThreadPool(CONCURRENT, { r ->
-			def rv = new Thread(r)
+            def rv = new Thread(r)
-			rv.setDaemon(true)
+            rv.setDaemon(true)
-			rv.setName("connector-${System.currentTimeMillis()}")
+            rv.setName("connector-${System.currentTimeMillis()}")
-			rv 
+            rv
-		} as ThreadFactory)
+        } as ThreadFactory)
-	}
         
-	void start() {
+        closer = Executors.newSingleThreadExecutor()
-		timer.schedule({connectIfNeeded()} as TimerTask, 100, 1000)
+    }
-	}
 
-	void stop() {
+    void start() {
-		timer.cancel()
+        timer.schedule({connectIfNeeded()} as TimerTask, 100, 1000)
-		executor.shutdownNow()
+    }
-	}
 
-	private void connectIfNeeded() {
+    void stop() {
-		if (!connectionManager.needsConnections())
+        timer.cancel()
-			return
+        executor.shutdownNow()
-		if (inProgress.size() >= CONCURRENT)
+        closer.shutdown()
-			return
+    }
 
-		def toTry = null
+    private void connectIfNeeded() {
-		for (int i = 0; i < 5; i++) {
+        if (!connectionManager.needsConnections())
-			toTry = hostCache.getHosts(1)
+            return
-			if (toTry.isEmpty())
+        if (inProgress.size() >= CONCURRENT)
-				return
+            return
-			toTry = toTry[0]
-			if (!connectionManager.isConnected(toTry) &&
-				!inProgress.contains(toTry)) {
-				break
-			}
-		}
-		if (toTry == null)
-			return
-		if (!connectionManager.isConnected(toTry) && inProgress.add(toTry))
-			executor.execute({connect(toTry)} as Runnable)
-	}
 
-	private void connect(Destination toTry) {
+        def toTry = null
-		log.info("starting connect to ${toTry.toBase32()}")
+        for (int i = 0; i < 5; i++) {
-		try {
+            toTry = hostCache.getHosts(1)
-			def endpoint = i2pConnector.connect(toTry)
+            if (toTry.isEmpty())
-			log.info("successful transport connect to ${toTry.toBase32()}")
+                return
+            toTry = toTry[0]
+            if (!connectionManager.isConnected(toTry) &&
+                !inProgress.contains(toTry)) {
+                break
+            }
+        }
+        if (toTry == null)
+            return
+        if (!connectionManager.isConnected(toTry) && inProgress.add(toTry))
+            executor.execute({connect(toTry)} as Runnable)
+    }
 
-			// outgoing handshake
+    private void connect(Destination toTry) {
-			endpoint.outputStream.write("MuWire ".bytes)
+        log.info("starting connect to ${toTry.toBase32()}")
-			def type = settings.isLeaf() ? "leaf" : "peer"
+        try {
-			endpoint.outputStream.write(type.bytes)
+            def endpoint = i2pConnector.connect(toTry)
-			endpoint.outputStream.flush()
+            log.info("successful transport connect to ${toTry.toBase32()}")
 
-			InputStream is = endpoint.inputStream
+            // outgoing handshake
-			int read = is.read()
+            endpoint.outputStream.write("MuWire ".bytes)
-			if (read == -1) {
+            def type = settings.isLeaf() ? "leaf" : "peer"
-				fail endpoint
+            endpoint.outputStream.write(type.bytes)
-				return
+            endpoint.outputStream.flush()
-			}
-			switch(read) {
-				case (byte)'O': readK(endpoint); break
-				case (byte)'R': readEJECT(endpoint); break
-				default :
-					log.warning("unknown response $read")
-					fail endpoint
-			}
-		} catch (Exception e) {
-			log.log(Level.WARNING, "Couldn't connect to ${toTry.toBase32()}", e)
-			def endpoint = new Endpoint(toTry, null, null, null)
-			fail(endpoint)
-		} finally {
-			inProgress.remove(toTry)
-		}
-	}
 
-	private void fail(Endpoint endpoint) {
+            InputStream is = endpoint.inputStream
-		endpoint.close()
+            int read = is.read()
-		eventBus.publish(new ConnectionEvent(endpoint: endpoint, incoming: false, leaf: false, status: ConnectionAttemptStatus.FAILED))
+            if (read == -1) {
-	}
+                fail endpoint
+                return
+            }
+            switch(read) {
+                case (byte)'O': readK(endpoint); break
+                case (byte)'R': readEJECT(endpoint); break
+                default :
+                    log.warning("unknown response $read")
+                    fail endpoint
+            }
+        } catch (Exception e) {
+            log.log(Level.WARNING, "Couldn't connect to ${toTry.toBase32()}", e)
+            def endpoint = new Endpoint(toTry, null, null, null)
+            fail(endpoint)
+        } finally {
+            inProgress.remove(toTry)
+        }
+    }
 
-	private void readK(Endpoint e) {
+    private void fail(Endpoint endpoint) {
-		int read = e.inputStream.read()
+        closer.execute {
-		if (read != 'K') {
+            endpoint.close()
-			log.warning("unknown response after O: $read")
+            eventBus.publish(new ConnectionEvent(endpoint: endpoint, incoming: false, leaf: false, status: ConnectionAttemptStatus.FAILED))
-			fail e
+        } as Runnable
-			return
+    }
-		}
 
-		log.info("connection to ${e.destination.toBase32()} established")
+    private void readK(Endpoint e) {
+        int read = e.inputStream.read()
+        if (read != 'K') {
+            log.warning("unknown response after O: $read")
+            fail e
+            return
+        }
 
-		// wrap into deflater / inflater streams and publish
+        log.info("connection to ${e.destination.toBase32()} established")
-		def wrapped = new Endpoint(e.destination, new InflaterInputStream(e.inputStream), new DeflaterOutputStream(e.outputStream, true), e.toClose)
-		eventBus.publish(new ConnectionEvent(endpoint: wrapped, incoming: false, leaf: false, status: ConnectionAttemptStatus.SUCCESSFUL))
-	}
 
-	private void readEJECT(Endpoint e) {
+        // wrap into deflater / inflater streams and publish
-		byte[] eject = "EJECT".bytes
+        def wrapped = new Endpoint(e.destination, new InflaterInputStream(e.inputStream), new DeflaterOutputStream(e.outputStream, true), e.toClose)
-		for (int i = 0; i < eject.length; i++) {
+        eventBus.publish(new ConnectionEvent(endpoint: wrapped, incoming: false, leaf: false, status: ConnectionAttemptStatus.SUCCESSFUL))
-			int read = e.inputStream.read()
+    }
-			if (read != eject[i]) {
+
-				log.warning("Unknown response after R at position $i")
+    private void readEJECT(Endpoint e) {
-				fail e
+        byte[] eject = "EJECT".bytes
-				return
+        for (int i = 0; i < eject.length; i++) {
-			}
+            int read = e.inputStream.read()
-		}
+            if (read != eject[i]) {
-		log.info("connection to ${e.destination.toBase32()} rejected")
+                log.warning("Unknown response after R at position $i")
+                fail e
+                return
+            }
+        }
+        log.info("connection to ${e.destination.toBase32()} rejected")
 
 
-		eventBus.publish(new ConnectionEvent(endpoint: e, incoming: false, leaf: false, status: ConnectionAttemptStatus.REJECTED))
+        eventBus.publish(new ConnectionEvent(endpoint: e, incoming: false, leaf: false, status: ConnectionAttemptStatus.REJECTED))
-		try {
+        try {
-			DataInputStream dais = new DataInputStream(e.inputStream)
+            DataInputStream dais = new DataInputStream(e.inputStream)
-			int payloadSize = dais.readUnsignedShort()
+            int payloadSize = dais.readUnsignedShort()
-			byte[] payload = new byte[payloadSize]
+            byte[] payload = new byte[payloadSize]
-			dais.readFully(payload)
+            dais.readFully(payload)
 
-			def json = new JsonSlurper()
+            def json = new JsonSlurper()
-			json = json.parse(payload)
+            json = json.parse(payload)
 
-			if (json.tryHosts == null) {
+            if (json.tryHosts == null) {
-				log.warning("post-rejection json didn't contain hosts to try")
+                log.warning("post-rejection json didn't contain hosts to try")
-				return
+                return
-			}
+            }
 
-			json.tryHosts.asList().each {
+            json.tryHosts.asList().each {
-				Destination suggested = new Destination(it)
+                Destination suggested = new Destination(it)
-				eventBus.publish(new HostDiscoveredEvent(destination: suggested))
+                eventBus.publish(new HostDiscoveredEvent(destination: suggested))
-			}
+            }
-		} catch (Exception ignore) {
+        } catch (Exception ignore) {
-			log.log(Level.WARNING,"Problem parsing post-rejection payload",ignore)
+            log.log(Level.WARNING,"Problem parsing post-rejection payload",ignore)
-		} finally {
+        } finally {
-			// the end
+            // the end
-			e.close()
+            closer.execute({e.close()} as Runnable)
-		}
+        }
-	}
+    }
 
     public boolean isInProgress(Destination d) {
         inProgress.contains(d)

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

@@ -6,14 +6,14 @@ import net.i2p.data.Destination
 
 class ConnectionEvent extends Event {
 
-	Endpoint endpoint
+    Endpoint endpoint
-	boolean incoming
+    boolean incoming
-	Boolean leaf // can be null if uknown
+    Boolean leaf // can be null if uknown
-	ConnectionAttemptStatus status
+    ConnectionAttemptStatus status
 
-	@Override
+    @Override
-	public String toString() {
+    public String toString() {
-		"ConnectionEvent ${super.toString()} endpoint: $endpoint incoming: $incoming leaf : $leaf status : $status"
+        "ConnectionEvent ${super.toString()} endpoint: $endpoint incoming: $incoming leaf : $leaf status : $status"
-	}
+    }
 
 }

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

@@ -12,63 +12,63 @@ import net.i2p.data.Destination
 
 abstract class ConnectionManager {
 
-	private static final int PING_TIME = 20000
+    private static final int PING_TIME = 20000
 
-	final EventBus eventBus
+    final EventBus eventBus
 
-	private final Timer timer
+    private final Timer timer
 
-	protected final HostCache hostCache
+    protected final HostCache hostCache
     protected final Persona me
     protected final MuWireSettings settings
 
-	ConnectionManager() {}
+    ConnectionManager() {}
 
-	ConnectionManager(EventBus eventBus, Persona me, HostCache hostCache, MuWireSettings settings) {
+    ConnectionManager(EventBus eventBus, Persona me, HostCache hostCache, MuWireSettings settings) {
-		this.eventBus = eventBus
+        this.eventBus = eventBus
         this.me = me
-		this.hostCache = hostCache
+        this.hostCache = hostCache
         this.settings = settings
-		this.timer = new Timer("connections-pinger",true)
+        this.timer = new Timer("connections-pinger",true)
-	}
+    }
 
-	void start() {
+    void start() {
-		timer.schedule({sendPings()} as TimerTask, 1000,1000)
+        timer.schedule({sendPings()} as TimerTask, 1000,1000)
-	}
+    }
 
-	void stop() {
+    void stop() {
-		timer.cancel()
+        timer.cancel()
-		getConnections().each { it.close() }
+        getConnections().each { it.close() }
-	}
+    }
 
-	void onTrustEvent(TrustEvent e) {
+    void onTrustEvent(TrustEvent e) {
-		if (e.level == TrustLevel.DISTRUSTED)
+        if (e.level == TrustLevel.DISTRUSTED)
-			drop(e.persona.destination)
+            drop(e.persona.destination)
-	}
+    }
 
-	abstract void drop(Destination d)
+    abstract void drop(Destination d)
 
-	abstract Collection<Connection> getConnections()
+    abstract Collection<Connection> getConnections()
 
-	protected abstract int getDesiredConnections()
+    protected abstract int getDesiredConnections()
 
-	boolean needsConnections() {
+    boolean needsConnections() {
-		return getConnections().size() < getDesiredConnections()
+        return getConnections().size() < getDesiredConnections()
-	}
+    }
 
-	abstract boolean isConnected(Destination d)
+    abstract boolean isConnected(Destination d)
 
-	abstract void onConnectionEvent(ConnectionEvent e)
+    abstract void onConnectionEvent(ConnectionEvent e)
 
-	abstract void onDisconnectionEvent(DisconnectionEvent e)
+    abstract void onDisconnectionEvent(DisconnectionEvent e)
 
     abstract void shutdown()
 
-	protected void sendPings() {
+    protected void sendPings() {
-		final long now = System.currentTimeMillis()
+        final long now = System.currentTimeMillis()
-		getConnections().each { 
+        getConnections().each {
-			if (now - it.lastPingSentTime > PING_TIME)
+            if (now - it.lastPingSentTime > PING_TIME)
-				it.sendPing()
+                it.sendPing()
-		}
+        }
-	}
+    }
 }

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

@@ -6,10 +6,10 @@ import net.i2p.data.Destination
 
 class DisconnectionEvent extends Event {
 
-	Destination destination
+    Destination destination
 
-	@Override
+    @Override
-	public String toString() {
+    public String toString() {
-		"DisconnectionEvent ${super.toString()} destination:${destination.toBase32()}"
+        "DisconnectionEvent ${super.toString()} destination:${destination.toBase32()}"
-	}
+    }
 }

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

@@ -8,39 +8,39 @@ import net.i2p.data.Destination
 
 @Log
 class Endpoint implements Closeable {
-	final Destination destination
+    final Destination destination
-	final InputStream inputStream
+    final InputStream inputStream
-	final OutputStream outputStream
+    final OutputStream outputStream
     final def toClose
 
-	private final AtomicBoolean closed = new AtomicBoolean()
+    private final AtomicBoolean closed = new AtomicBoolean()
 
-	Endpoint(Destination destination, InputStream inputStream, OutputStream outputStream, def toClose) {
+    Endpoint(Destination destination, InputStream inputStream, OutputStream outputStream, def toClose) {
-		this.destination = destination
+        this.destination = destination
-		this.inputStream = inputStream
+        this.inputStream = inputStream
-		this.outputStream = outputStream
+        this.outputStream = outputStream
         this.toClose = toClose
-	}
+    }
 
-	@Override
+    @Override
-	public void close() {
+    public void close() {
-		if (!closed.compareAndSet(false, true)) {
+        if (!closed.compareAndSet(false, true)) {
-			log.log(Level.WARNING,"Close loop detected for ${destination.toBase32()}", new Exception())
+            log.log(Level.WARNING,"Close loop detected for ${destination.toBase32()}", new Exception())
-			return
+            return
-		}
+        }
-		if (inputStream != null) {
+        if (inputStream != null) {
-			try {inputStream.close()} catch (Exception ignore) {}
+            try {inputStream.close()} catch (Exception ignore) {}
-		}
+        }
-		if (outputStream != null) {
+        if (outputStream != null) {
-			try {outputStream.close()} catch (Exception ignore) {}
+            try {outputStream.close()} catch (Exception ignore) {}
-		}
+        }
         if (toClose != null) {
             try {toClose.reset()} catch (Exception ignore) {}
         }
-	}
+    }
 
-	@Override
+    @Override
-	public String toString() {
+    public String toString() {
-		"destination: ${destination.toBase32()}"
+        "destination: ${destination.toBase32()}"
-	}
+    }
 }

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

@@ -5,18 +5,18 @@ import net.i2p.client.streaming.I2PSocketManager
 
 class I2PAcceptor {
 
-	final I2PSocketManager socketManager
+    final I2PSocketManager socketManager
-	final I2PServerSocket serverSocket
+    final I2PServerSocket serverSocket
 
-	I2PAcceptor() {}
+    I2PAcceptor() {}
 
-	I2PAcceptor(I2PSocketManager socketManager) {
+    I2PAcceptor(I2PSocketManager socketManager) {
-		this.socketManager = socketManager
+        this.socketManager = socketManager
-		this.serverSocket = socketManager.getServerSocket()
+        this.serverSocket = socketManager.getServerSocket()
-	}
+    }
 
-	Endpoint accept() {
+    Endpoint accept() {
-		def socket = serverSocket.accept()
+        def socket = serverSocket.accept()
-		new Endpoint(socket.getPeerDestination(), socket.getInputStream(), socket.getOutputStream(), socket)
+        new Endpoint(socket.getPeerDestination(), socket.getInputStream(), socket.getOutputStream(), socket)
-	}
+    }
 }

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

@@ -5,17 +5,17 @@ import net.i2p.data.Destination
 
 class I2PConnector {
 
-	final I2PSocketManager socketManager
+    final I2PSocketManager socketManager
 
-	I2PConnector() {}
+    I2PConnector() {}
 
-	I2PConnector(I2PSocketManager socketManager) {
+    I2PConnector(I2PSocketManager socketManager) {
-		this.socketManager = socketManager
+        this.socketManager = socketManager
-	}
+    }
 
-	Endpoint connect(Destination dest) {
+    Endpoint connect(Destination dest) {
-		def socket = socketManager.connect(dest)
+        def socket = socketManager.connect(dest)
-		new Endpoint(dest, socket.getInputStream(), socket.getOutputStream(), socket)
+        new Endpoint(dest, socket.getInputStream(), socket.getOutputStream(), socket)
-	}
+    }
 
 }

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

@@ -17,21 +17,21 @@ import net.i2p.data.Destination
  */
 class LeafConnection extends Connection {
 
-	public LeafConnection(EventBus eventBus, Endpoint endpoint, HostCache hostCache, 
+    public LeafConnection(EventBus eventBus, Endpoint endpoint, HostCache hostCache,
         TrustService trustService, MuWireSettings settings) {
-		super(eventBus, endpoint, true, hostCache, trustService, settings);
+        super(eventBus, endpoint, true, hostCache, trustService, settings);
-	}
+    }
 
-	@Override
+    @Override
-	protected void read() {
+    protected void read() {
-		// TODO Auto-generated method stub
+        // TODO Auto-generated method stub
 
-	}
+    }
 
-	@Override
+    @Override
-	protected void write(Object message) {
+    protected void write(Object message) {
-		// TODO Auto-generated method stub
+        // TODO Auto-generated method stub
 
-	}
+    }
 
 }

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

@@ -14,21 +14,21 @@ import net.i2p.data.Destination
 @Log
 class LeafConnectionManager extends ConnectionManager {
 
-	final int maxConnections
+    final int maxConnections
 
-	final Map<Destination, UltrapeerConnection> connections = new ConcurrentHashMap()
+    final Map<Destination, UltrapeerConnection> connections = new ConcurrentHashMap()
 
-	public LeafConnectionManager(EventBus eventBus, Persona me, int maxConnections, 
+    public LeafConnectionManager(EventBus eventBus, Persona me, int maxConnections,
         HostCache hostCache, MuWireSettings settings) {
-		super(eventBus, me, hostCache, settings)
+        super(eventBus, me, hostCache, settings)
-		this.maxConnections = maxConnections
+        this.maxConnections = maxConnections
-	}
+    }
 
-	@Override
+    @Override
-	public void drop(Destination d) {
+    public void drop(Destination d) {
-		// TODO Auto-generated method stub
+        // TODO Auto-generated method stub
 
-	}
+    }
 
     void onQueryEvent(QueryEvent e) {
         if (me.destination == e.receivedOn) {
@@ -37,41 +37,41 @@ class LeafConnectionManager extends ConnectionManager {
 
     }
 
-	@Override
+    @Override
-	public Collection<Connection> getConnections() {
+    public Collection<Connection> getConnections() {
-		connections.values()
+        connections.values()
-	}
+    }
 
-	@Override
+    @Override
-	protected int getDesiredConnections() {
+    protected int getDesiredConnections() {
-		return maxConnections;
+        return maxConnections;
-	}
+    }
 
-	@Override
+    @Override
-	public boolean isConnected(Destination d) {
+    public boolean isConnected(Destination d) {
-		connections.containsKey(d)
+        connections.containsKey(d)
-	}
+    }
 
-	@Override
+    @Override
-	public void onConnectionEvent(ConnectionEvent e) {
+    public void onConnectionEvent(ConnectionEvent e) {
-		if (e.incoming || e.leaf) {
+        if (e.incoming || e.leaf) {
-			log.severe("Got inconsistent event as a leaf! $e")
+            log.severe("Got inconsistent event as a leaf! $e")
-			return
+            return
-		}
+        }
-		if (e.status != ConnectionAttemptStatus.SUCCESSFUL)
+        if (e.status != ConnectionAttemptStatus.SUCCESSFUL)
-			return
+            return
 
-		Connection c = new UltrapeerConnection(eventBus, e.endpoint)
+        Connection c = new UltrapeerConnection(eventBus, e.endpoint)
-		connections.put(e.endpoint.destination, c)
+        connections.put(e.endpoint.destination, c)
-		c.start()
+        c.start()
-	}
+    }
 
-	@Override 
+    @Override
-	public void onDisconnectionEvent(DisconnectionEvent e) {
+    public void onDisconnectionEvent(DisconnectionEvent e) {
-		def removed = connections.remove(e.destination)
+        def removed = connections.remove(e.destination)
-		if (removed == null)
+        if (removed == null)
-			log.severe("removed destination not present in connection manager ${e.destination.toBase32()}")
+            log.severe("removed destination not present in connection manager ${e.destination.toBase32()}")
-	}
+    }
 
     @Override
     void shutdown() {

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

@@ -21,62 +21,62 @@ import net.i2p.data.Destination
 @Log
 class PeerConnection extends Connection {
 
-	private final DataInputStream dis
+    private final DataInputStream dis
-	private final DataOutputStream dos
+    private final DataOutputStream dos
 
-	private final byte[] readHeader = new byte[3]
+    private final byte[] readHeader = new byte[3]
-	private final byte[] writeHeader = new byte[3]
+    private final byte[] writeHeader = new byte[3]
 
-	private final JsonSlurper slurper = new JsonSlurper()
+    private final JsonSlurper slurper = new JsonSlurper()
 
-	public PeerConnection(EventBus eventBus, Endpoint endpoint,
+    public PeerConnection(EventBus eventBus, Endpoint endpoint,
-			boolean incoming, HostCache hostCache, TrustService trustService,
+            boolean incoming, HostCache hostCache, TrustService trustService,
             MuWireSettings settings) {
-		super(eventBus, endpoint, incoming, hostCache, trustService, settings)
+        super(eventBus, endpoint, incoming, hostCache, trustService, settings)
-		this.dis = new DataInputStream(endpoint.inputStream)
+        this.dis = new DataInputStream(endpoint.inputStream)
-		this.dos = new DataOutputStream(endpoint.outputStream)
+        this.dos = new DataOutputStream(endpoint.outputStream)
-	}
+    }
 
-	@Override
+    @Override
-	protected void read() {
+    protected void read() {
-		dis.readFully(readHeader)
+        dis.readFully(readHeader)
-		int length = DataUtil.readLength(readHeader)
+        int length = DataUtil.readLength(readHeader)
-		log.fine("$name read length $length")
+        log.fine("$name read length $length")
 
-		byte[] payload = new byte[length]
+        byte[] payload = new byte[length]
-		dis.readFully(payload)
+        dis.readFully(payload)
 
-		if ((readHeader[0] & (byte)0x80) == 0x80) {
+        if ((readHeader[0] & (byte)0x80) == 0x80) {
-			// TODO process binary
+            // TODO process binary
-		} else {
+        } else {
-			def json = slurper.parse(payload)
+            def json = slurper.parse(payload)
-			if (json.type == null)
+            if (json.type == null)
-				throw new Exception("missing json type")
+                throw new Exception("missing json type")
-			switch(json.type) {
+            switch(json.type) {
-				case "Ping" : handlePing(); break;
+                case "Ping" : handlePing(); break;
-				case "Pong" : handlePong(json); break;
+                case "Pong" : handlePong(json); break;
                 case "Search": handleSearch(json); break
-				default :
+                default :
-					throw new Exception("unknown json type ${json.type}")
+                    throw new Exception("unknown json type ${json.type}")
-			}
+            }
-		}
+        }
-	}
+    }
 
-	@Override
+    @Override
-	protected void write(Object message) {
+    protected void write(Object message) {
-		byte[] payload
+        byte[] payload
-		if (message instanceof Map) {
+        if (message instanceof Map) {
-			payload = JsonOutput.toJson(message).bytes
+            payload = JsonOutput.toJson(message).bytes
-			DataUtil.packHeader(payload.length, writeHeader)
+            DataUtil.packHeader(payload.length, writeHeader)
-			log.fine "$name writing message type ${message.type} length $payload.length"
+            log.fine "$name writing message type ${message.type} length $payload.length"
-			writeHeader[0] &= (byte)0x7F
+            writeHeader[0] &= (byte)0x7F
-		} else {
+        } else {
-			// TODO: write binary
+            // TODO: write binary
-		}
+        }
 
-		dos.write(writeHeader)
+        dos.write(writeHeader)
-		dos.write(payload)
+        dos.write(payload)
-		dos.flush()
+        dos.flush()
-	}
+    }
 
 }

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

@@ -17,30 +17,30 @@ import net.i2p.data.Destination
  */
 class UltrapeerConnection extends Connection {
 
-	public UltrapeerConnection(EventBus eventBus, Endpoint endpoint, HostCache hostCache, TrustService trustService) {
+    public UltrapeerConnection(EventBus eventBus, Endpoint endpoint, HostCache hostCache, TrustService trustService) {
-		super(eventBus, endpoint, false, hostCache, trustService)
+        super(eventBus, endpoint, false, hostCache, trustService)
-	}
+    }
 
-	@Override
+    @Override
-	protected void read() {
+    protected void read() {
-		// TODO Auto-generated method stub
+        // TODO Auto-generated method stub
 
-	}
+    }
 
-	@Override
+    @Override
-	protected void write(Object message) {
+    protected void write(Object message) {
-		if (message instanceof Map) {
+        if (message instanceof Map) {
-			writeJsonMessage(message)
+            writeJsonMessage(message)
-		} else {
+        } else {
-			writeBinaryMessage(message)
+            writeBinaryMessage(message)
-		}
+        }
-	}
+    }
 
-	private void writeJsonMessage(def message) {
+    private void writeJsonMessage(def message) {
 
-	}
+    }
 
-	private void writeBinaryMessage(def message) {
+    private void writeBinaryMessage(def message) {
 
-	}
+    }
 }

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

@@ -16,26 +16,26 @@ import net.i2p.data.Destination
 @Log
 class UltrapeerConnectionManager extends ConnectionManager {
 
-	final int maxPeers, maxLeafs
+    final int maxPeers, maxLeafs
     final TrustService trustService
 
-	final Map<Destination, PeerConnection> peerConnections = new ConcurrentHashMap()
+    final Map<Destination, PeerConnection> peerConnections = new ConcurrentHashMap()
-	final Map<Destination, LeafConnection> leafConnections = new ConcurrentHashMap()
+    final Map<Destination, LeafConnection> leafConnections = new ConcurrentHashMap()
 
-	UltrapeerConnectionManager() {}
+    UltrapeerConnectionManager() {}
 
-	public UltrapeerConnectionManager(EventBus eventBus, Persona me, int maxPeers, int maxLeafs, 
+    public UltrapeerConnectionManager(EventBus eventBus, Persona me, int maxPeers, int maxLeafs,
         HostCache hostCache, TrustService trustService, MuWireSettings settings) {
-		super(eventBus, me, hostCache, settings)
+        super(eventBus, me, hostCache, settings)
-		this.maxPeers = maxPeers
+        this.maxPeers = maxPeers
-		this.maxLeafs = maxLeafs
+        this.maxLeafs = maxLeafs
         this.trustService = trustService
-	}
+    }
-	@Override
+    @Override
-	public void drop(Destination d) {
+    public void drop(Destination d) {
-		peerConnections.get(d)?.close()
+        peerConnections.get(d)?.close()
         leafConnections.get(d)?.close()
-	}
+    }
 
     void onQueryEvent(QueryEvent e) {
         forwardQueryToLeafs(e)
@@ -50,57 +50,57 @@ class UltrapeerConnectionManager extends ConnectionManager {
         }
     }
 
-	@Override
+    @Override
-	public Collection<Connection> getConnections() {
+    public Collection<Connection> getConnections() {
-		def rv = new ArrayList(peerConnections.size() + leafConnections.size())
+        def rv = new ArrayList(peerConnections.size() + leafConnections.size())
-		rv.addAll(peerConnections.values())
+        rv.addAll(peerConnections.values())
-		rv.addAll(leafConnections.values())
+        rv.addAll(leafConnections.values())
-		rv
+        rv
-	}
+    }
 
-	boolean hasLeafSlots() {
+    boolean hasLeafSlots() {
-		leafConnections.size() < maxLeafs
+        leafConnections.size() < maxLeafs
-	}
+    }
 
-	boolean hasPeerSlots() {
+    boolean hasPeerSlots() {
-		peerConnections.size() < maxPeers
+        peerConnections.size() < maxPeers
-	}
+    }
 
-	@Override
+    @Override
-	protected int getDesiredConnections() {
+    protected int getDesiredConnections() {
-		return maxPeers / 2;
+        return maxPeers / 2;
-	}
+    }
-	@Override
+    @Override
-	public boolean isConnected(Destination d) {
+    public boolean isConnected(Destination d) {
-		peerConnections.containsKey(d) || leafConnections.containsKey(d)
+        peerConnections.containsKey(d) || leafConnections.containsKey(d)
-	}
+    }
 
-	@Override
+    @Override
-	public void onConnectionEvent(ConnectionEvent e) {
+    public void onConnectionEvent(ConnectionEvent e) {
-		if (!e.incoming && e.leaf) {
+        if (!e.incoming && e.leaf) {
-			log.severe("Inconsistent event $e")
+            log.severe("Inconsistent event $e")
-			return
+            return
-		}
+        }
 
-		if (e.status != ConnectionAttemptStatus.SUCCESSFUL)
+        if (e.status != ConnectionAttemptStatus.SUCCESSFUL)
-			return
+            return
 
-		Connection c = e.leaf ? 
+        Connection c = e.leaf ?
-			new LeafConnection(eventBus, e.endpoint, hostCache, trustService, settings) : 
+            new LeafConnection(eventBus, e.endpoint, hostCache, trustService, settings) :
-			new PeerConnection(eventBus, e.endpoint, e.incoming, hostCache, trustService, settings)
+            new PeerConnection(eventBus, e.endpoint, e.incoming, hostCache, trustService, settings)
-		def map = e.leaf ? leafConnections : peerConnections
+        def map = e.leaf ? leafConnections : peerConnections
-		map.put(e.endpoint.destination, c)
+        map.put(e.endpoint.destination, c)
-		c.start()
+        c.start()
-	}
+    }
 
-	@Override
+    @Override
-	public void onDisconnectionEvent(DisconnectionEvent e) {
+    public void onDisconnectionEvent(DisconnectionEvent e) {
-		def removed = peerConnections.remove(e.destination)
+        def removed = peerConnections.remove(e.destination)
-		if (removed == null)
+        if (removed == null)
-			removed = leafConnections.remove(e.destination)
+            removed = leafConnections.remove(e.destination)
-		if (removed == null)
+        if (removed == null)
-			log.severe("Removed connection not present in either leaf or peer map ${e.destination.toBase32()}")
+            log.severe("Removed connection not present in either leaf or peer map ${e.destination.toBase32()}")
-	}
+    }
 
     @Override
     void shutdown() {
@@ -110,7 +110,7 @@ class UltrapeerConnectionManager extends ConnectionManager {
         leafConnections.clear()
     }
 
-	void forwardQueryToLeafs(QueryEvent e) {
+    void forwardQueryToLeafs(QueryEvent e) {
 
-	}
+    }
 }

core/src/main/groovy/com/muwire/core/content/ContentControlEvent.groovy

@@ -0,0 +1,9 @@
+package com.muwire.core.content
+
+import com.muwire.core.Event
+
+class ContentControlEvent extends Event {
+    String term
+    boolean regex
+    boolean add
+}

core/src/main/groovy/com/muwire/core/content/ContentManager.groovy

@@ -0,0 +1,30 @@
+package com.muwire.core.content
+
+import java.util.concurrent.ConcurrentHashMap
+
+import com.muwire.core.search.QueryEvent
+
+import net.i2p.util.ConcurrentHashSet
+
+class ContentManager {
+
+    Set<Matcher> matchers = new ConcurrentHashSet()    
+    
+    void onContentControlEvent(ContentControlEvent e) {
+        Matcher m
+        if (e.regex)
+            m = new RegexMatcher(e.term)
+        else
+            m = new KeywordMatcher(e.term)
+        if (e.add)
+            matchers.add(m)
+        else
+            matchers.remove(m)
+    }
+    
+    void onQueryEvent(QueryEvent e) {
+        if (e.searchEvent.searchTerms == null)
+            return
+        matchers.each { it.process(e) }
+    }
+}

core/src/main/groovy/com/muwire/core/content/KeywordMatcher.groovy

@@ -0,0 +1,36 @@
+package com.muwire.core.content
+
+class KeywordMatcher extends Matcher {
+    private final String keyword
+    KeywordMatcher(String keyword) {
+        this.keyword = keyword
+    }
+    
+    @Override
+    protected boolean match(List<String> searchTerms) {
+        boolean found = false
+        searchTerms.each { 
+            if (keyword == it)
+                found = true
+        }
+        found
+    }
+    
+    @Override
+    public String getTerm() {
+        keyword
+    }
+    
+    @Override
+    public int hashCode() {
+        keyword.hashCode()
+    }
+    
+    @Override
+    public boolean equals(Object o) {
+        if (!(o instanceof KeywordMatcher))
+            return false
+        KeywordMatcher other = (KeywordMatcher) o
+        keyword.equals(other.keyword)
+    }
+}

core/src/main/groovy/com/muwire/core/content/Match.groovy

@@ -0,0 +1,9 @@
+package com.muwire.core.content
+
+import com.muwire.core.Persona
+
+class Match {
+    Persona persona
+    String [] keywords
+    long timestamp
+}

core/src/main/groovy/com/muwire/core/content/Matcher.groovy

@@ -0,0 +1,20 @@
+package com.muwire.core.content
+
+import com.muwire.core.search.QueryEvent
+
+abstract class Matcher {
+    final List<Match> matches = Collections.synchronizedList(new ArrayList<>())
+    final Set<UUID> uuids = new HashSet<>()
+    
+    protected abstract boolean match(List<String> searchTerms);
+    
+    public abstract String getTerm();
+    
+    public void process(QueryEvent qe) {
+        def terms = qe.searchEvent.searchTerms
+        if (match(terms) && uuids.add(qe.searchEvent.uuid)) {
+            long now = System.currentTimeMillis()
+            matches << new Match(persona : qe.originator, keywords : terms, timestamp : now)
+        }
+    }
+}

core/src/main/groovy/com/muwire/core/content/RegexMatcher.groovy

@@ -0,0 +1,35 @@
+package com.muwire.core.content
+
+import java.util.regex.Pattern
+import java.util.stream.Collectors
+
+class RegexMatcher extends Matcher {
+    private final Pattern pattern
+    RegexMatcher(String pattern) {
+        this.pattern = Pattern.compile(pattern)
+    }
+    
+    @Override
+    protected boolean match(List<String> keywords) {
+        String combined = keywords.join(" ")
+        return pattern.matcher(combined).find()
+    }
+    
+    @Override
+    public String getTerm() {
+        pattern.pattern()
+    }
+    
+    @Override
+    public int hashCode() {
+        pattern.pattern().hashCode()
+    }
+    
+    @Override
+    public boolean equals(Object o) {
+        if (!(o instanceof RegexMatcher))
+            return false
+        RegexMatcher other = (RegexMatcher) o
+        pattern.pattern() == other.pattern.pattern()
+    }
+}

core/src/main/groovy/com/muwire/core/download/DownloadManager.groovy

@@ -34,7 +34,7 @@ public class DownloadManager {
     private final MuWireSettings muSettings
     private final I2PConnector connector
     private final Executor executor
-    private final File incompletes, home
+    private final File home
     private final Persona me
 
     private final Map<InfoHash, Downloader> downloaders = new ConcurrentHashMap<>()
@@ -46,12 +46,9 @@ public class DownloadManager {
         this.meshManager = meshManager
         this.muSettings = muSettings
         this.connector = connector
-        this.incompletes = new File(home,"incompletes")
         this.home = home
         this.me = me
 
-        incompletes.mkdir()
-        
         this.executor = Executors.newCachedThreadPool({ r ->
             Thread rv = new Thread(r)
             rv.setName("download-worker")
@@ -63,6 +60,11 @@ public class DownloadManager {
 
     public void onUIDownloadEvent(UIDownloadEvent e) {
 
+        File incompletes = muSettings.incompleteLocation
+        if (incompletes == null)
+            incompletes = new File(home, "incompletes")
+        incompletes.mkdirs()
+        
         def size = e.result[0].size
         def infohash = e.result[0].infohash
         def pieceSize = e.result[0].pieceSize
@@ -74,7 +76,7 @@ public class DownloadManager {
         destinations.addAll(e.sources)
         destinations.remove(me.destination)
 
-        Pieces pieces = getPieces(infohash, size, pieceSize)
+        Pieces pieces = getPieces(infohash, size, pieceSize, e.sequential)
 
         def downloader = new Downloader(eventBus, this, me, e.target, size,
             infohash, pieceSize, connector, destinations,
@@ -123,7 +125,17 @@ public class DownloadManager {
                 infoHash = new InfoHash(root)
             }
             
-            Pieces pieces = getPieces(infoHash, (long)json.length, json.pieceSizePow2)
+            boolean sequential = false
+            if (json.sequential != null)
+                sequential = json.sequential
+                
+            File incompletes
+            if (json.incompletes != null) 
+                incompletes = new File(DataUtil.readi18nString(Base64.decode(json.incompletes)))
+            else
+                incompletes = new File(home, "incompletes")
+
+            Pieces pieces = getPieces(infoHash, (long)json.length, json.pieceSizePow2, sequential)
 
             def downloader = new Downloader(eventBus, this, me, file, (long)json.length,
                 infoHash, json.pieceSizePow2, connector, destinations, incompletes, pieces)
@@ -137,12 +149,12 @@ public class DownloadManager {
         }
     }
 
-    private Pieces getPieces(InfoHash infoHash, long length, int pieceSizePow2) {
+    private Pieces getPieces(InfoHash infoHash, long length, int pieceSizePow2, boolean sequential) {
         int pieceSize = 0x1 << pieceSizePow2
         int nPieces = (int)(length / pieceSize)
         if (length % pieceSize != 0)
             nPieces++
-        Mesh mesh = meshManager.getOrCreate(infoHash, nPieces)
+        Mesh mesh = meshManager.getOrCreate(infoHash, nPieces, sequential)
         mesh.pieces
     }
 
@@ -188,6 +200,11 @@ public class DownloadManager {
                         json.hashRoot = Base64.encode(infoHash.getRoot())
 
                     json.paused = downloader.paused
+                    
+                    json.sequential = downloader.pieces.ratio == 0f
+                    
+                    json.incompletes = Base64.encode(DataUtil.encodei18nString(downloader.incompletes.getAbsolutePath()))
+                    
                     writer.println(JsonOutput.toJson(json))
                 }
             }

core/src/main/groovy/com/muwire/core/download/DownloadSession.groovy

@@ -14,6 +14,7 @@ import static com.muwire.core.util.DataUtil.readTillRN
 import groovy.util.logging.Log
 
 import java.nio.ByteBuffer
+import java.nio.MappedByteBuffer
 import java.nio.channels.FileChannel
 import java.nio.charset.StandardCharsets
 import java.nio.file.Files
@@ -25,8 +26,6 @@ import java.util.logging.Level
 @Log
 class DownloadSession {
 
-    private static int SAMPLES = 10
-    
     private final EventBus eventBus
     private final String meB64
     private final Pieces pieces
@@ -38,10 +37,10 @@ class DownloadSession {
     private final Set<Integer> available
     private final MessageDigest digest
 
-    private final LinkedList<Long> timestamps = new LinkedList<>()
+    private long lastSpeedRead = System.currentTimeMillis()
-    private final LinkedList<Integer> reads = new LinkedList<>()
+    private long dataSinceLastRead
 
-    private ByteBuffer mapped
+    private MappedByteBuffer mapped
 
     DownloadSession(EventBus eventBus, String meB64, Pieces pieces, InfoHash infoHash, Endpoint endpoint, File file,
         int pieceSize, long fileLength, Set<Integer> available) {
@@ -71,21 +70,23 @@ class DownloadSession {
         OutputStream os = endpoint.getOutputStream()
         InputStream is = endpoint.getInputStream()
 
-        int piece
+        int[] pieceAndPosition
         if (available.isEmpty())
-            piece = pieces.claim()
+            pieceAndPosition = pieces.claim()
         else
-            piece = pieces.claim(new HashSet<>(available))
+            pieceAndPosition = pieces.claim(new HashSet<>(available))
-        if (piece == -1)
+        if (pieceAndPosition == null)
             return false
+        int piece = pieceAndPosition[0]
+        int position = pieceAndPosition[1]
+        boolean steal = pieceAndPosition[2] == 1
         boolean unclaim = true
 
-        log.info("will download piece $piece")
+        log.info("will download piece $piece from position $position steal $steal")
-        
-        long start = piece * pieceSize
-        long end = Math.min(fileLength, start + pieceSize) - 1
-        long length = end - start + 1
 
+        long pieceStart = piece * ((long)pieceSize)
+        long end = Math.min(fileLength, pieceStart + pieceSize) - 1
+        long start = pieceStart + position
         String root = Base64.encode(infoHash.getRoot())
 
         try {
@@ -174,8 +175,9 @@ class DownloadSession {
             FileChannel channel
             try {
                 channel = Files.newByteChannel(file.toPath(), EnumSet.of(StandardOpenOption.READ, StandardOpenOption.WRITE,
-                        StandardOpenOption.SPARSE, StandardOpenOption.CREATE)) // TODO: double-check, maybe CREATE_NEW
+                        StandardOpenOption.SPARSE, StandardOpenOption.CREATE)) 
-                mapped = channel.map(FileChannel.MapMode.READ_WRITE, start, end - start + 1)
+                mapped = channel.map(FileChannel.MapMode.READ_WRITE, pieceStart, end - pieceStart + 1)
+                mapped.position(position)
 
                 byte[] tmp = new byte[0x1 << 13]
                 while(mapped.hasRemaining()) {
@@ -186,31 +188,28 @@ class DownloadSession {
                         throw new IOException()
                     synchronized(this) {
                         mapped.put(tmp, 0, read)
-
+                        dataSinceLastRead += read
-                        if (timestamps.size() == SAMPLES) {
+                        pieces.markPartial(piece, mapped.position())
-                            timestamps.removeFirst()
-                            reads.removeFirst()
-                        }
-                        timestamps.addLast(System.currentTimeMillis())
-                        reads.addLast(read)
                     }
                 }
 
                 mapped.clear()
                 digest.update(mapped)
-                DataUtil.tryUnmap(mapped)
                 byte [] hash = digest.digest()
                 byte [] expected = new byte[32]
                 System.arraycopy(infoHash.getHashList(), piece * 32, expected, 0, 32)
-                if (hash != expected)
+                if (hash != expected) {
-                    throw new BadHashException()
+                    pieces.markPartial(piece, 0)
+                    throw new BadHashException("bad hash on piece $piece")
+                }
             } finally {
                 try { channel?.close() } catch (IOException ignore) {}
+                DataUtil.tryUnmap(mapped)
             }
             pieces.markDownloaded(piece)
             unclaim = false
         } finally {
-            if (unclaim)
+            if (unclaim && !steal) 
                 pieces.unclaim(piece)
         }
         return true
@@ -223,24 +222,11 @@ class DownloadSession {
     }
 
     synchronized int speed() {
-        if (timestamps.size() < SAMPLES)
-            return 0
-        int totalRead = 0
-        int idx = 0
         final long now = System.currentTimeMillis()
-        
+        long interval = Math.max(1000, now - lastSpeedRead)
-        while(idx < SAMPLES && timestamps.get(idx) < now - 1000)
+        lastSpeedRead = now;
-            idx++
+        int rv = (int) (dataSinceLastRead * 1000.0 / interval)
-        if (idx == SAMPLES)
+        dataSinceLastRead = 0
-            return 0
+        rv
-        if (idx == SAMPLES - 1)
-            return reads[idx]
-            
-        long interval = timestamps.last - timestamps[idx]
-        if (interval == 0) 
-            interval = 1
-        for (int i = idx; i < SAMPLES; i++)
-            totalRead += reads[idx]
-        (int)(totalRead * 1000.0 / interval)
     }
 }

core/src/main/groovy/com/muwire/core/download/Downloader.groovy

@@ -7,6 +7,7 @@ import com.muwire.core.connection.Endpoint
 import java.nio.file.AtomicMoveNotSupportedException
 import java.nio.file.Files
 import java.nio.file.StandardCopyOption
+import java.time.Instant
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
@@ -26,6 +27,7 @@ import net.i2p.util.ConcurrentHashSet
 
 @Log
 public class Downloader {
+    
     public enum DownloadState { CONNECTING, HASHLIST, DOWNLOADING, FAILED, CANCELLED, PAUSED, FINISHED }
     private enum WorkerState { CONNECTING, HASHLIST, DOWNLOADING, FINISHED}
 
@@ -47,6 +49,7 @@ public class Downloader {
     private final I2PConnector connector
     private final Set<Destination> destinations
     private final int nPieces
+    private final File incompletes
     private final File piecesFile
     private final File incompleteFile
     final int pieceSizePow2
@@ -58,6 +61,11 @@ public class Downloader {
     private final AtomicBoolean eventFired = new AtomicBoolean()
     private boolean piecesFileClosed
 
+    private ArrayList speedArr = new ArrayList<Integer>()
+    private int speedPos = 0
+    private int speedAvg = 0
+    private long timestamp = Instant.now().toEpochMilli()
+
     public Downloader(EventBus eventBus, DownloadManager downloadManager,
         Persona me, File file, long length, InfoHash infoHash,
         int pieceSizePow2, I2PConnector connector, Set<Destination> destinations,
@@ -70,6 +78,7 @@ public class Downloader {
         this.length = length
         this.connector = connector
         this.destinations = destinations
+        this.incompletes = incompletes
         this.piecesFile = new File(incompletes, file.getName()+".pieces")
         this.incompleteFile = new File(incompletes, file.getName()+".part")
         this.pieceSizePow2 = pieceSizePow2
@@ -101,8 +110,14 @@ public class Downloader {
         if (!piecesFile.exists())
             return
         piecesFile.eachLine {
-            int piece = Integer.parseInt(it)
+            String [] split = it.split(",")
-            pieces.markDownloaded(piece)
+            int piece = Integer.parseInt(split[0])
+            if (split.length == 1)
+                pieces.markDownloaded(piece)
+            else {
+                int position = Integer.parseInt(split[1])
+                pieces.markPartial(piece, position)
+            }
         }
     }
 
@@ -111,9 +126,7 @@ public class Downloader {
             if (piecesFileClosed)
                 return
             piecesFile.withPrintWriter { writer ->
-                pieces.getDownloaded().each { piece ->
+                pieces.write(writer)
-                    writer.println(piece)
-                }
             }
         }
     }
@@ -124,14 +137,41 @@ public class Downloader {
 
 
     public int speed() {
-        int total = 0
+        int currSpeed = 0
         if (getCurrentState() == DownloadState.DOWNLOADING) {
             activeWorkers.values().each {
                 if (it.currentState == WorkerState.DOWNLOADING)
-                    total += it.speed()
+                    currSpeed += it.speed()
             }
         }
-        total
+        
+        if (speedArr.size() != downloadManager.muSettings.speedSmoothSeconds) {
+            speedArr.clear()
+            downloadManager.muSettings.speedSmoothSeconds.times { speedArr.add(0) }
+            speedPos = 0
+        }
+
+        // normalize to speedArr.size
+        currSpeed /= speedArr.size()
+
+        // compute new speedAvg and update speedArr
+        if ( speedArr[speedPos] > speedAvg ) {
+            speedAvg = 0
+        } else {
+            speedAvg -= speedArr[speedPos]
+        }
+        speedAvg += currSpeed
+        speedArr[speedPos] = currSpeed
+        // this might be necessary due to rounding errors
+        if (speedAvg < 0)
+            speedAvg = 0
+
+        // rolling index over the speedArr
+        speedPos++
+        if (speedPos >= speedArr.size())
+            speedPos=0
+
+        speedAvg
     }
 
     public DownloadState getCurrentState() {
@@ -272,12 +312,17 @@ public class Downloader {
             } catch (Exception bad) {
                 log.log(Level.WARNING,"Exception while downloading",DataUtil.findRoot(bad))
             } finally {
+                writePieces()
                 currentState = WorkerState.FINISHED
                 if (pieces.isComplete() && eventFired.compareAndSet(false, true)) {
                     synchronized(piecesFile) {
                         piecesFileClosed = true
                         piecesFile.delete()
                     }
+                    activeWorkers.values().each { 
+                        if (it.destination != destination)
+                            it.cancel()
+                    }
                     try {
                         Files.move(incompleteFile.toPath(), file.toPath(), StandardCopyOption.ATOMIC_MOVE)
                     } catch (AtomicMoveNotSupportedException e) {
@@ -286,7 +331,7 @@ public class Downloader {
                     }
                     eventBus.publish(
                         new FileDownloadedEvent(
-                            downloadedFile : new DownloadedFile(file, getInfoHash(), pieceSizePow2, successfulDestinations),
+                            downloadedFile : new DownloadedFile(file.getCanonicalFile(), getInfoHash(), pieceSizePow2, successfulDestinations),
                         downloader : Downloader.this))
 
                 }

core/src/main/groovy/com/muwire/core/download/Pieces.groovy

@@ -5,6 +5,7 @@ class Pieces {
     private final int nPieces
     private final float ratio
     private final Random random = new Random()
+    private final Map<Integer,Integer> partials = new HashMap<>()
 
     Pieces(int nPieces) {
         this(nPieces, 1.0f)
@@ -17,16 +18,22 @@ class Pieces {
         claimed = new BitSet(nPieces)
     }
     
-    synchronized int claim() {
+    synchronized int[] claim() {
         int claimedCardinality = claimed.cardinality()
-        if (claimedCardinality == nPieces)
+        if (claimedCardinality == nPieces) {
-            return -1
+            // steal
+            int downloadedCardinality = done.cardinality()
+            if (downloadedCardinality == nPieces)
+                return null
+            int rv = done.nextClearBit(0)
+            return [rv, partials.getOrDefault(rv, 0), 1]
+        }
 
         // if fuller than ratio just do sequential
-        if ( (1.0f * claimedCardinality) / nPieces > ratio) {
+        if ( (1.0f * claimedCardinality) / nPieces >= ratio) {
             int rv = claimed.nextClearBit(0)
             claimed.set(rv)
-            return rv
+            return [rv, partials.getOrDefault(rv, 0), 0]
         }
 
         while(true) {
@@ -34,20 +41,29 @@ class Pieces {
             if (claimed.get(start))
                 continue
             claimed.set(start)
-            return start
+            return [start, partials.getOrDefault(start,0), 0]
         }
     }
 
-    synchronized int claim(Set<Integer> available) {
+    synchronized int[] claim(Set<Integer> available) {
-        for (int i = claimed.nextSetBit(0); i >= 0; i = claimed.nextSetBit(i+1))
+        for (int i = done.nextSetBit(0); i >= 0; i = done.nextSetBit(i+1))
             available.remove(i)
         if (available.isEmpty())
-            return -1
+            return null
-        List<Integer> toList = available.toList()
+        Set<Integer> availableCopy = new HashSet<>(available)
-        Collections.shuffle(toList)
+        for (int i = claimed.nextSetBit(0); i >= 0; i = claimed.nextSetBit(i+1))
+            availableCopy.remove(i)
+        if (availableCopy.isEmpty()) {
+            // steal
+            int rv = available.first()
+            return [rv, partials.getOrDefault(rv, 0), 1]
+        }
+        List<Integer> toList = availableCopy.toList()
+        if (ratio > 0f)
+            Collections.shuffle(toList)
         int rv = toList[0]
         claimed.set(rv)
-        rv
+        [rv, partials.getOrDefault(rv, 0), 0]
     }
 
     synchronized def getDownloaded() {
@@ -61,6 +77,11 @@ class Pieces {
     synchronized void markDownloaded(int piece) {
         done.set(piece)
         claimed.set(piece)
+        partials.remove(piece)
+    }
+    
+    synchronized void markPartial(int piece, int position) {
+        partials.put(piece, position)
     }
 
     synchronized void unclaim(int piece) {
@@ -82,5 +103,15 @@ class Pieces {
     synchronized void clearAll() {
         done.clear()
         claimed.clear()
+        partials.clear()
+    }
+    
+    synchronized void write(PrintWriter writer) {
+        for (int i = done.nextSetBit(0); i >= 0; i = done.nextSetBit(i+1)) {
+            writer.println(i)
+        }
+        partials.each { piece, position ->
+            writer.println("$piece,$position")
+        }
     }
 }

core/src/main/groovy/com/muwire/core/download/UIDownloadEvent.groovy

@@ -10,4 +10,5 @@ class UIDownloadEvent extends Event {
     UIResultEvent[] result
     Set<Destination> sources
     File target
+    boolean sequential
 }

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/FileDownloadedEvent.groovy

@@ -8,5 +8,5 @@ import net.i2p.data.Destination
 
 class FileDownloadedEvent extends Event {
     Downloader downloader
-	DownloadedFile downloadedFile
+    DownloadedFile downloadedFile
 }

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

@@ -5,8 +5,8 @@ import com.muwire.core.SharedFile
 
 class FileHashedEvent extends Event {
 
-	SharedFile sharedFile
+    SharedFile sharedFile
-	String error
+    String error
 
     @Override
     public String toString() {

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

@@ -13,67 +13,67 @@ import java.security.NoSuchAlgorithmException
 
 class FileHasher {
 
-	/** max size of shared file is 128 GB */
+    /** max size of shared file is 128 GB */
-	public static final long MAX_SIZE = 0x1L << 37
+    public static final long MAX_SIZE = 0x1L << 37
 
-	/**
+    /**
-	 * @param size of the file to be shared
+     * @param size of the file to be shared
-	 * @return the size of each piece in power of 2
+     * @return the size of each piece in power of 2
      * piece size is minimum 128 KBytees and maximum 16 MBytes in power of 2 steps (2^17 - 2^24)
      * there can be up to 8192 pieces maximum per file
-	 */
+     */
-	static int getPieceSize(long size) {
+    static int getPieceSize(long size) {
-		if (size <= 0x1 << 30)
+        if (size <= 0x1 << 30)
-			return 17
+            return 17
 
-		for (int i = 31; i <= 37; i++) {
+        for (int i = 31; i <= 37; i++) {
-			if (size <= 0x1L << i) {
+            if (size <= 0x1L << i) {
-				return i-13
+                return i-13
-			}
+            }
-		}
+        }
 
-		throw new IllegalArgumentException("File too large $size")
+        throw new IllegalArgumentException("File too large $size")
-	}
+    }
 
-	final MessageDigest digest
+    final MessageDigest digest
 
-	FileHasher() {
+    FileHasher() {
-		try {
+        try {
-			digest = MessageDigest.getInstance("SHA-256")
+            digest = MessageDigest.getInstance("SHA-256")
-		} catch (NoSuchAlgorithmException impossible) {
+        } catch (NoSuchAlgorithmException impossible) {
-			digest = null
+            digest = null
-			System.exit(1)
+            System.exit(1)
-		}
+        }
-	}
+    }
 
-	InfoHash hashFile(File file) {
+    InfoHash hashFile(File file) {
-		final long length = file.length()
+        final long length = file.length()
-		final int size = 0x1 << getPieceSize(length)
+        final int size = 0x1 << getPieceSize(length)
-		int numPieces = (int) (length / size)
+        int numPieces = (int) (length / size)
-		if (numPieces * size < length)
+        if (numPieces * size < length)
-			numPieces++
+            numPieces++
 
-		def output = new ByteArrayOutputStream()
+        def output = new ByteArrayOutputStream()
-		RandomAccessFile raf = new RandomAccessFile(file, "r")
+        RandomAccessFile raf = new RandomAccessFile(file, "r")
-		try {
+        try {
-			MappedByteBuffer buf
+            MappedByteBuffer buf
-			for (int i = 0; i < numPieces - 1; i++) {
+            for (int i = 0; i < numPieces - 1; i++) {
-				buf = raf.getChannel().map(MapMode.READ_ONLY, ((long)size) * i, size)
+                buf = raf.getChannel().map(MapMode.READ_ONLY, ((long)size) * i, size)
-				digest.update buf
+                digest.update buf
                 DataUtil.tryUnmap(buf)
-				output.write(digest.digest(), 0, 32)
+                output.write(digest.digest(), 0, 32)
-			}
+            }
-			def lastPieceLength = length - (numPieces - 1) * ((long)size)
+            def lastPieceLength = length - (numPieces - 1) * ((long)size)
-			buf = raf.getChannel().map(MapMode.READ_ONLY, length - lastPieceLength, lastPieceLength)
+            buf = raf.getChannel().map(MapMode.READ_ONLY, length - lastPieceLength, lastPieceLength)
-			digest.update buf
+            digest.update buf
-			output.write(digest.digest(), 0, 32)
+            output.write(digest.digest(), 0, 32)
-		} finally {
+        } finally {
-			raf.close()
+            raf.close()
-		}
+        }
 
-		byte [] hashList = output.toByteArray()
+        byte [] hashList = output.toByteArray()
-		InfoHash.fromHashList(hashList)
+        InfoHash.fromHashList(hashList)
-	}
+    }
 
     public static void main(String[] args) {
         if (args.length != 1) {

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

@@ -0,0 +1,15 @@
+package com.muwire.core.files
+
+import com.muwire.core.Event
+import com.muwire.core.SharedFile
+
+class FileHashingEvent extends Event {
+
+    File hashingFile
+
+    @Override
+    public String toString() {
+        super.toString() + " hashingFile " + hashingFile.getAbsolutePath()
+    }
+
+}

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

@@ -5,5 +5,5 @@ import com.muwire.core.SharedFile
 
 class FileLoadedEvent extends Event {
 
-	SharedFile loadedFile
+    SharedFile loadedFile
 }

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

@@ -8,33 +8,36 @@ import com.muwire.core.UILoadedEvent
 import com.muwire.core.search.ResultsEvent
 import com.muwire.core.search.SearchEvent
 import com.muwire.core.search.SearchIndex
+import com.muwire.core.util.DataUtil
 
 import groovy.util.logging.Log
+import net.i2p.data.Base64
 
 @Log
 class FileManager {
 
 
-	final EventBus eventBus
+    final EventBus eventBus
     final MuWireSettings settings
-	final Map<InfoHash, Set<SharedFile>> rootToFiles = Collections.synchronizedMap(new HashMap<>())
+    final Map<InfoHash, Set<SharedFile>> rootToFiles = Collections.synchronizedMap(new HashMap<>())
-	final Map<File, SharedFile> fileToSharedFile = Collections.synchronizedMap(new HashMap<>())
+    final Map<File, SharedFile> fileToSharedFile = Collections.synchronizedMap(new HashMap<>())
-	final Map<String, Set<File>> nameToFiles = new HashMap<>()
+    final Map<String, Set<File>> nameToFiles = new HashMap<>()
-	final SearchIndex index = new SearchIndex()
+    final Map<String, Set<File>> commentToFile = new HashMap<>()
+    final SearchIndex index = new SearchIndex()
 
-	FileManager(EventBus eventBus, MuWireSettings settings) {
+    FileManager(EventBus eventBus, MuWireSettings settings) {
         this.settings = settings
-		this.eventBus = eventBus
+        this.eventBus = eventBus
-	}
+    }
 
     void onFileHashedEvent(FileHashedEvent e) {
         if (e.sharedFile != null)
             addToIndex(e.sharedFile)
     }
 
-	void onFileLoadedEvent(FileLoadedEvent e) {
+    void onFileLoadedEvent(FileLoadedEvent e) {
-		addToIndex(e.loadedFile)
+        addToIndex(e.loadedFile)
-	}
+    }
 
     void onFileDownloadedEvent(FileDownloadedEvent e) {
         if (settings.shareDownloadedFiles) {
@@ -42,88 +45,141 @@ class FileManager {
         }
     }
 
-	private void addToIndex(SharedFile sf) {
+    private void addToIndex(SharedFile sf) {
         log.info("Adding shared file " + sf.getFile())
-		InfoHash infoHash = sf.getInfoHash()
+        InfoHash infoHash = sf.getInfoHash()
-		Set<SharedFile> existing = rootToFiles.get(infoHash)
+        Set<SharedFile> existing = rootToFiles.get(infoHash)
-		if (existing == null) {
+        if (existing == null) {
             log.info("adding new root")
-			existing = new HashSet<>()
+            existing = new HashSet<>()
-			rootToFiles.put(infoHash, existing);
+            rootToFiles.put(infoHash, existing);
-		}
+        }
-		existing.add(sf)
+        existing.add(sf)
-		fileToSharedFile.put(sf.file, sf)
+        fileToSharedFile.put(sf.file, sf)
 
-		String name = sf.getFile().getName()
+        String name = sf.getFile().getName()
-		Set<File> existingFiles = nameToFiles.get(name)
+        Set<File> existingFiles = nameToFiles.get(name)
-		if (existingFiles == null) {
+        if (existingFiles == null) {
-			existingFiles = new HashSet<>()
+            existingFiles = new HashSet<>()
-			nameToFiles.put(name, existingFiles)
+            nameToFiles.put(name, existingFiles)
-		}
+        }
-		existingFiles.add(sf.getFile())
+        existingFiles.add(sf.getFile())
 
-		index.add(name)
+        String comment = sf.getComment()
-	}
+        if (comment != null) {
+            comment = DataUtil.readi18nString(Base64.decode(comment))
+            index.add(comment)
+            Set<File> existingComment = commentToFile.get(comment)
+            if(existingComment == null) {
+                existingComment = new HashSet<>()
+                commentToFile.put(comment, existingComment)
+            }
+            existingComment.add(sf.getFile())
+        }
         
-	void onFileUnsharedEvent(FileUnsharedEvent e) {
+        index.add(name)
-		SharedFile sf = e.unsharedFile
+    }
-		InfoHash infoHash = sf.getInfoHash()
-		Set<SharedFile> existing = rootToFiles.get(infoHash)
-		if (existing != null) {
-			existing.remove(sf)
-			if (existing.isEmpty()) {
-				rootToFiles.remove(infoHash)
-			}
-		}
 
-		fileToSharedFile.remove(sf.file)
+    void onFileUnsharedEvent(FileUnsharedEvent e) {
+        SharedFile sf = e.unsharedFile
+        InfoHash infoHash = sf.getInfoHash()
+        Set<SharedFile> existing = rootToFiles.get(infoHash)
+        if (existing != null) {
+            existing.remove(sf)
+            if (existing.isEmpty()) {
+                rootToFiles.remove(infoHash)
+            }
+        }
 
-		String name = sf.getFile().getName()
+        fileToSharedFile.remove(sf.file)
-		Set<File> existingFiles = nameToFiles.get(name)
-		if (existingFiles != null) {
-			existingFiles.remove(sf.file)
-			if (existingFiles.isEmpty()) {
-				nameToFiles.remove(name)
-			}
-		}
 
-		index.remove(name)
+        String name = sf.getFile().getName()
-	}
+        Set<File> existingFiles = nameToFiles.get(name)
+        if (existingFiles != null) {
+            existingFiles.remove(sf.file)
+            if (existingFiles.isEmpty()) {
+                nameToFiles.remove(name)
+            }
+        }
         
-	Map<File, SharedFile> getSharedFiles() {
+        String comment = sf.getComment()
+        if (comment != null) {
+            Set<File> existingComment = commentToFile.get(comment)
+            if (existingComment != null) {
+                existingComment.remove(sf.getFile())
+                if (existingComment.isEmpty()) {
+                    commentToFile.remove(comment)
+                    index.remove(comment)
+                }
+            }
+        }
+
+        index.remove(name)
+    }
+    
+    void onUICommentEvent(UICommentEvent e) {
+        if (e.oldComment != null) {
+            def comment = DataUtil.readi18nString(Base64.decode(e.oldComment))
+            Set<File> existingFiles = commentToFile.get(comment) 
+            existingFiles.remove(e.sharedFile.getFile())
+            if (existingFiles.isEmpty()) {
+                commentToFile.remove(comment)
+                index.remove(comment)
+            }
+        }
+        
+        String comment = e.sharedFile.getComment()
+        comment = DataUtil.readi18nString(Base64.decode(comment))
+        if (comment != null) {
+            index.add(comment)
+            Set<File> existingComment = commentToFile.get(comment)
+            if(existingComment == null) {
+                existingComment = new HashSet<>()
+                commentToFile.put(comment, existingComment)
+            }
+            existingComment.add(e.sharedFile.getFile())
+        }        
+    }
+
+    Map<File, SharedFile> getSharedFiles() {
         synchronized(fileToSharedFile) {
             return new HashMap<>(fileToSharedFile)
         }
-	}
+    }
 
     Set<SharedFile> getSharedFiles(byte []root) {
             return rootToFiles.get(new InfoHash(root))
     }
 
-	void onSearchEvent(SearchEvent e) {
+    void onSearchEvent(SearchEvent e) {
-		// hash takes precedence
+        // hash takes precedence
-		ResultsEvent re = null
+        ResultsEvent re = null
-		if (e.searchHash != null) {
+        if (e.searchHash != null) {
             Set<SharedFile> found
             found = rootToFiles.get new InfoHash(e.searchHash)
             found = filter(found, e.oobInfohash)
-			if (found != null && !found.isEmpty())
+            if (found != null && !found.isEmpty())
-				re = new ResultsEvent(results: found.asList(), uuid: e.uuid, searchEvent: e)
+                re = new ResultsEvent(results: found.asList(), uuid: e.uuid, searchEvent: e)
-		} else {
+        } else {
-			def names = index.search e.searchTerms
+            def names = index.search e.searchTerms
-			Set<File> files = new HashSet<>()
+            Set<File> files = new HashSet<>()
-			names.each { files.addAll nameToFiles.getOrDefault(it, []) }
+            names.each { 
-			Set<SharedFile> sharedFiles = new HashSet<>()
+                files.addAll nameToFiles.getOrDefault(it, [])
-			files.each { sharedFiles.add fileToSharedFile[it] }
+                if (e.searchComments)
+                    files.addAll commentToFile.getOrDefault(it, [])
+            }
+            Set<SharedFile> sharedFiles = new HashSet<>()
+            files.each { sharedFiles.add fileToSharedFile[it] }
             files = filter(sharedFiles, e.oobInfohash)
-			if (!sharedFiles.isEmpty())
-				re = new ResultsEvent(results: sharedFiles.asList(), uuid: e.uuid, searchEvent: e)
             
-		}
+            if (!sharedFiles.isEmpty())
+                re = new ResultsEvent(results: sharedFiles.asList(), uuid: e.uuid, searchEvent: e)
 
-		if (re != null)
+        }
-			eventBus.publish(re)
+
-	}
+        if (re != null)
+            eventBus.publish(re)
+    }
 
     private static Set<SharedFile> filter(Set<SharedFile> files, boolean oob) {
         if (!oob)

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

@@ -4,7 +4,7 @@ import com.muwire.core.Event
 
 class FileSharedEvent extends Event {
 
-	File file
+    File file
 
     @Override
     public String toString() {

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

@@ -4,5 +4,5 @@ import com.muwire.core.Event
 import com.muwire.core.SharedFile
 
 class FileUnsharedEvent extends Event {
-	SharedFile unsharedFile
+    SharedFile unsharedFile
 }

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

@@ -4,44 +4,60 @@ 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 {
 
-	final FileHasher hasher
+    final FileHasher hasher
-	final EventBus eventBus
+    final EventBus eventBus
     final FileManager fileManager
-	Executor executor
+    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.hasher = hasher
-		this.eventBus = eventBus
+        this.eventBus = eventBus
         this.fileManager = fileManager
-	}
+        this.settings = settings
+    }
 
-	void start() {
+    void start() {
-		executor = Executors.newSingleThreadExecutor()
+        executor = Executors.newSingleThreadExecutor()
-	}
+    }
 
-	void onFileSharedEvent(FileSharedEvent evt) {
+    void onFileSharedEvent(FileSharedEvent evt) {
-        if (fileManager.fileToSharedFile.containsKey(evt.file.getCanonicalFile()))
+        File canonical = evt.file.getCanonicalFile()
+        if (!settings.shareHiddenFiles && canonical.isHidden())
             return
-		executor.execute( { -> process(evt.file) } as Runnable)
+        if (fileManager.fileToSharedFile.containsKey(canonical)) 
-	}
+            return
+        if (hashed.add(canonical))
+            executor.execute( { -> process(canonical) } as Runnable)
+    }
     
-	private void process(File f) {
+    void onFileUnsharedEvent(FileUnsharedEvent evt) {
-		f = f.getCanonicalFile()
+        hashed.remove(evt.unsharedFile.file)
-		if (f.isDirectory()) {
+    }
-			f.listFiles().each {eventBus.publish new FileSharedEvent(file: it) }
+    
-		} else {
+    void onDirectoryUnsharedEvent(DirectoryUnsharedEvent evt) {
-			if (f.length() == 0) {
+        hashed.remove(evt.directory)
-				eventBus.publish new FileHashedEvent(error: "Not sharing empty file $f")
+    }
-			} else if (f.length() > FileHasher.MAX_SIZE) {
+
-				eventBus.publish new FileHashedEvent(error: "$f is too large to be shared ${f.length()}")
+    private void process(File f) {
-			} else {
+        if (f.isDirectory()) {
-				def hash = hasher.hashFile f
+            f.listFiles().each {eventBus.publish new FileSharedEvent(file: it) }
-				eventBus.publish new FileHashedEvent(sharedFile: new SharedFile(f, hash, FileHasher.getPieceSize(f.length())))
+        } else {
-			}
+            if (f.length() == 0) {
-		}
+                eventBus.publish new FileHashedEvent(error: "Not sharing empty file $f")
-	}
+            } else if (f.length() > FileHasher.MAX_SIZE) {
+                eventBus.publish new FileHashedEvent(error: "$f is too large to be shared ${f.length()}")
+            } else {
+                eventBus.publish new FileHashingEvent(hashingFile: f)
+                def hash = hasher.hashFile f
+                eventBus.publish new FileHashedEvent(sharedFile: new SharedFile(f, hash, FileHasher.getPieceSize(f.length())))
+            }
+        }
+    }
 }

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

@@ -3,6 +3,9 @@ package com.muwire.core.files
 import java.nio.file.CopyOption
 import java.nio.file.Files
 import java.nio.file.StandardCopyOption
+import java.util.concurrent.ExecutorService
+import java.util.concurrent.Executors
+import java.util.concurrent.ThreadFactory
 import java.util.logging.Level
 import java.util.stream.Collectors
 
@@ -23,135 +26,148 @@ import net.i2p.data.Destination
 @Log
 class PersisterService extends Service {
 
-	final File location
+    final File location
-	final EventBus listener
+    final EventBus listener
-	final int interval
+    final int interval
-	final Timer timer
+    final Timer timer
-	final FileManager fileManager
+    final FileManager fileManager
+    final ExecutorService persisterExecutor = Executors.newSingleThreadExecutor({ r -> 
+        new Thread(r, "file persister")
+    } as ThreadFactory)
 
-	PersisterService(File location, EventBus listener, int interval, FileManager fileManager) {
+    PersisterService(File location, EventBus listener, int interval, FileManager fileManager) {
-		this.location = location
+        this.location = location
-		this.listener = listener
+        this.listener = listener
-		this.interval = interval
+        this.interval = interval
-		this.fileManager = fileManager
+        this.fileManager = fileManager
-		timer = new Timer("file persister", true)
+        timer = new Timer("file persister timer", true)
-	}
+    }
 
-	void stop() {
+    void stop() {
-		timer.cancel()
+        timer.cancel()
-	}
+    }
 
     void onUILoadedEvent(UILoadedEvent e) {
         timer.schedule({load()} as TimerTask, 1)
     }
     
-	void load() {
+    void onUIPersistFilesEvent(UIPersistFilesEvent e) {
-		if (location.exists() && location.isFile()) {
+        persistFiles()
-			def slurper = new JsonSlurper()
+    }
-			try {
+
-				location.eachLine {
+    void load() {
-					if (it.trim().length() > 0) {
+        Thread.currentThread().setPriority(Thread.MIN_PRIORITY)
-						def parsed = slurper.parseText it
+
-						def event = fromJson parsed
+        if (location.exists() && location.isFile()) {
-						if (event != null) {
+            int loaded = 0
+            def slurper = new JsonSlurper()
+            try {
+                location.eachLine {
+                    if (it.trim().length() > 0) {
+                        def parsed = slurper.parseText it
+                        def event = fromJson parsed
+                        if (event != null) {
                             log.fine("loaded file $event.loadedFile.file")
-							listener.publish event
+                            listener.publish event
-						}
+                            loaded++
-					}
+                            if (loaded % 10 == 0)
-				}
+                                Thread.sleep(20)
+                        }
+                    }
+                }
                 listener.publish(new AllFilesLoadedEvent())
-			} catch (IllegalArgumentException|NumberFormatException e) {
+            } catch (IllegalArgumentException|NumberFormatException e) {
                 log.log(Level.WARNING, "couldn't load files",e)
-			}
+            }
-		} else {
+        } else {
             listener.publish(new AllFilesLoadedEvent())
         }
-		timer.schedule({persistFiles()} as TimerTask, 0, interval)
+        timer.schedule({persistFiles()} as TimerTask, 0, interval)
-		loaded = true
+        loaded = true
-	}
+    }
 
-	private static FileLoadedEvent fromJson(def json) {
+    private static FileLoadedEvent fromJson(def json) {
-		if (json.file == null || json.length == null || json.infoHash == null || json.hashList == null)
+        if (json.file == null || json.length == null || json.infoHash == null || json.hashList == null)
-			throw new IllegalArgumentException()
+            throw new IllegalArgumentException()
-		if (!(json.hashList instanceof List))
+        if (!(json.hashList instanceof List))
-			throw new IllegalArgumentException()
+            throw new IllegalArgumentException()
 
-		def file = new File(DataUtil.readi18nString(Base64.decode(json.file)))
+        def file = new File(DataUtil.readi18nString(Base64.decode(json.file)))
-		file = file.getCanonicalFile()
+        file = file.getCanonicalFile()
-		if (!file.exists() || file.isDirectory())
+        if (!file.exists() || file.isDirectory())
-			return null
+            return null
-		long length = Long.valueOf(json.length)
+        long length = Long.valueOf(json.length)
-		if (length != file.length())
+        if (length != file.length())
-			return null
+            return null
 
-		List hashList = (List) json.hashList
+        List hashList = (List) json.hashList
-		ByteArrayOutputStream baos = new ByteArrayOutputStream()
+        ByteArrayOutputStream baos = new ByteArrayOutputStream()
-		hashList.each {
+        hashList.each {
-			byte [] hash = Base64.decode it.toString()
+            byte [] hash = Base64.decode it.toString()
-			if (hash == null)
+            if (hash == null)
-				throw new IllegalArgumentException()
+                throw new IllegalArgumentException()
-			baos.write hash
+            baos.write hash
-		}
+        }
-		byte[] hashListBytes = baos.toByteArray()
+        byte[] hashListBytes = baos.toByteArray()
 
-		InfoHash ih = InfoHash.fromHashList(hashListBytes)
+        InfoHash ih = InfoHash.fromHashList(hashListBytes)
-		byte [] root = Base64.decode(json.infoHash.toString())
+        byte [] root = Base64.decode(json.infoHash.toString())
-		if (root == null)
+        if (root == null)
-			throw new IllegalArgumentException()
+            throw new IllegalArgumentException()
-		if (!Arrays.equals(root, ih.getRoot()))
+        if (!Arrays.equals(root, ih.getRoot()))
-			return null
+            return null
 
         int pieceSize = 0
         if (json.pieceSize != null)
             pieceSize = json.pieceSize
 
         if (json.sources != null) {
-			List sources = (List)json.sources
+            List sources = (List)json.sources
-			Set<Destination> sourceSet = sources.stream().map({d -> new Destination(d.toString())}).collect Collectors.toSet()
+            Set<Destination> sourceSet = sources.stream().map({d -> new Destination(d.toString())}).collect Collectors.toSet()
-			DownloadedFile df = new DownloadedFile(file, ih, pieceSize, sourceSet)
+            DownloadedFile df = new DownloadedFile(file, ih, pieceSize, sourceSet)
-			return new FileLoadedEvent(loadedFile : df)
+            df.setComment(json.comment)
-		}
+            return new FileLoadedEvent(loadedFile : df)
+        }
 
 
-		SharedFile sf = new SharedFile(file, ih, pieceSize)
+        SharedFile sf = new SharedFile(file, ih, pieceSize)
-		return new FileLoadedEvent(loadedFile: sf)
+        sf.setComment(json.comment)
+        return new FileLoadedEvent(loadedFile: sf)
 
-	}
+    }
 
-	private void persistFiles() {
+    private void persistFiles() {
-		def sharedFiles = fileManager.getSharedFiles()
+        persisterExecutor.submit( {
+            def sharedFiles = fileManager.getSharedFiles()
 
-        File tmp = File.createTempFile("muwire-files", "tmp")
+            File tmp = File.createTempFile("muwire-files", "tmp")
-        tmp.deleteOnExit()
+            tmp.deleteOnExit()
-		tmp.withPrintWriter { writer ->
+            tmp.withPrintWriter { writer ->
-			sharedFiles.each { k, v ->
+                sharedFiles.each { k, v ->
-				def json = toJson(k,v)
+                    def json = toJson(k,v)
-				json = JsonOutput.toJson(json)
+                    json = JsonOutput.toJson(json)
-				writer.println json
+                    writer.println json
-			}
+                }
-		}
+            }
-        Files.copy(tmp.toPath(), location.toPath(), StandardCopyOption.REPLACE_EXISTING)
+            Files.copy(tmp.toPath(), location.toPath(), StandardCopyOption.REPLACE_EXISTING)
-        tmp.delete()
+            tmp.delete()
-	}
+        } as Runnable)
+    }
 
-	private def toJson(File f, SharedFile sf) {
+    private def toJson(File f, SharedFile sf) {
-		def json = [:]
+        def json = [:]
-		json.file = Base64.encode DataUtil.encodei18nString(f.getCanonicalFile().toString())
+        json.file = sf.getB64EncodedFileName()
-		json.length = f.length()
+        json.length = sf.getCachedLength()
-		InfoHash ih = sf.getInfoHash()
+        InfoHash ih = sf.getInfoHash()
-		json.infoHash = Base64.encode ih.getRoot()
+        json.infoHash = sf.getB64EncodedHashRoot()
         json.pieceSize = sf.getPieceSize()
-		byte [] tmp = new byte [32]
+        json.hashList = sf.getB64EncodedHashList()
-		json.hashList = []
+        json.comment = sf.getComment()
-		for (int i = 0;i < ih.getHashList().length / 32; i++) {
-			System.arraycopy(ih.getHashList(), i * 32, tmp, 0, 32)
-			json.hashList.add Base64.encode(tmp)
-		}
 
-		if (sf instanceof DownloadedFile) {
+        if (sf instanceof DownloadedFile) {
-			json.sources = sf.sources.stream().map( {d -> d.toBase64()}).collect(Collectors.toList())
+            json.sources = sf.sources.stream().map( {d -> d.toBase64()}).collect(Collectors.toList())
-		}
+        }
 
-		json
+        json
-	}
+    }
 }

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

@@ -0,0 +1,9 @@
+package com.muwire.core.files
+
+import com.muwire.core.Event
+import com.muwire.core.SharedFile
+
+class UICommentEvent extends Event {
+    SharedFile sharedFile
+    String oldComment
+}

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

@@ -0,0 +1,6 @@
+package com.muwire.core.files
+
+import com.muwire.core.Event
+
+class UIPersistFilesEvent extends Event {
+}

core/src/main/groovy/com/muwire/core/hostcache/CacheClient.groovy

@@ -18,176 +18,176 @@ import net.i2p.data.Destination
 @Log
 class CacheClient {
 
-	private static final int CRAWLER_RETURN = 10
+    private static final int CRAWLER_RETURN = 10
 
-	final EventBus eventBus
+    final EventBus eventBus
-	final HostCache cache
+    final HostCache cache
-	final ConnectionManager manager
+    final ConnectionManager manager
-	final I2PSession session
+    final I2PSession session
-	final long interval
+    final long interval
-	final MuWireSettings settings
+    final MuWireSettings settings
-	final Timer timer
+    final Timer timer
 
-	public CacheClient(EventBus eventBus, HostCache cache, 
+    public CacheClient(EventBus eventBus, HostCache cache,
-		ConnectionManager manager, I2PSession session,
+        ConnectionManager manager, I2PSession session,
-		MuWireSettings settings, long interval) {
+        MuWireSettings settings, long interval) {
-		this.eventBus = eventBus
+        this.eventBus = eventBus
-		this.cache = cache
+        this.cache = cache
-		this.manager = manager
+        this.manager = manager
-		this.session = session
+        this.session = session
-		this.settings = settings
+        this.settings = settings
-		this.interval = interval
+        this.interval = interval
-		this.timer = new Timer("hostcache-client",true)
+        this.timer = new Timer("hostcache-client",true)
-	}
+    }
 
-	void start() {
+    void start() {
-		session.addMuxedSessionListener(new Listener(), I2PSession.PROTO_DATAGRAM, 0)
+        session.addMuxedSessionListener(new Listener(), I2PSession.PROTO_DATAGRAM, 0)
-		timer.schedule({queryIfNeeded()} as TimerTask, 1, interval)
+        timer.schedule({queryIfNeeded()} as TimerTask, 1, interval)
-	}
+    }
 
-	void stop() {
+    void stop() {
-		timer.cancel()
+        timer.cancel()
-	}
+    }
 
-	private void queryIfNeeded() {
+    private void queryIfNeeded() {
-		if (!manager.getConnections().isEmpty())
+        if (!manager.getConnections().isEmpty())
-			return
+            return
-		if (!cache.getHosts(1).isEmpty())
+        if (!cache.getHosts(1).isEmpty())
-			return
+            return
 
-		log.info "Will query hostcaches"	
+        log.info "Will query hostcaches"
 
-		def ping = [type: "Ping", version: 1, leaf: settings.isLeaf()]
+        def ping = [type: "Ping", version: 1, leaf: settings.isLeaf()]
-		ping = JsonOutput.toJson(ping)
+        ping = JsonOutput.toJson(ping)
-		def maker = new I2PDatagramMaker(session)
+        def maker = new I2PDatagramMaker(session)
-		ping = maker.makeI2PDatagram(ping.bytes)
+        ping = maker.makeI2PDatagram(ping.bytes)
-		def options = new SendMessageOptions()
+        def options = new SendMessageOptions()
-		options.setSendLeaseSet(true)
+        options.setSendLeaseSet(true)
-		CacheServers.getCacheServers().each {
+        CacheServers.getCacheServers().each {
-			log.info "Querying hostcache ${it.toBase32()}"
+            log.info "Querying hostcache ${it.toBase32()}"
-			session.sendMessage(it, ping, 0, ping.length, I2PSession.PROTO_DATAGRAM, 1, 0, options)
+            session.sendMessage(it, ping, 0, ping.length, I2PSession.PROTO_DATAGRAM, 1, 0, options)
-		}
+        }
-	}
+    }
 
-	class Listener implements I2PSessionMuxedListener {
+    class Listener implements I2PSessionMuxedListener {
 
-		private final JsonSlurper slurper = new JsonSlurper()
+        private final JsonSlurper slurper = new JsonSlurper()
 
-		@Override
+        @Override
-		public void messageAvailable(I2PSession session, int msgId, long size) {
+        public void messageAvailable(I2PSession session, int msgId, long size) {
-		}
+        }
 
-		@Override
+        @Override
-		public void messageAvailable(I2PSession session, int msgId, long size, int proto, int fromport, int toport) {
+        public void messageAvailable(I2PSession session, int msgId, long size, int proto, int fromport, int toport) {
 
-			if (proto != I2PSession.PROTO_DATAGRAM) {
+            if (proto != I2PSession.PROTO_DATAGRAM) {
-				log.warning "Received unexpected protocol $proto"
+                log.warning "Received unexpected protocol $proto"
-				return
+                return
-			}
+            }
 
-			def payload = session.receiveMessage(msgId)
+            def payload = session.receiveMessage(msgId)
-			def dissector = new I2PDatagramDissector()
+            def dissector = new I2PDatagramDissector()
-			try {
+            try {
-				dissector.loadI2PDatagram(payload)
+                dissector.loadI2PDatagram(payload)
-				def sender = dissector.getSender()
+                def sender = dissector.getSender()
-				log.info("Received something from ${sender.toBase32()}")
+                log.info("Received something from ${sender.toBase32()}")
 
-				payload = dissector.getPayload()
+                payload = dissector.getPayload()
-				payload = slurper.parse(payload)
+                payload = slurper.parse(payload)
 
-				if (payload.type == null) {
+                if (payload.type == null) {
-					log.warning("type missing")
+                    log.warning("type missing")
-					return
+                    return
-				}
+                }
 
-				switch(payload.type) {
+                switch(payload.type) {
-					case "Pong" : handlePong(sender, payload); break
+                    case "Pong" : handlePong(sender, payload); break
-					case "CrawlerPing": handleCrawlerPing(session, sender, payload); break
+                    case "CrawlerPing": handleCrawlerPing(session, sender, payload); break
-					default : log.warning("unknown type ${payload.type}")
+                    default : log.warning("unknown type ${payload.type}")
-				}
+                }
-			} catch (Exception e) {
+            } catch (Exception e) {
-				log.warning("Invalid datagram $e")
+                log.warning("Invalid datagram $e")
-			}
+            }
-		}
+        }
 
-		@Override
+        @Override
-		public void reportAbuse(I2PSession session, int severity) {
+        public void reportAbuse(I2PSession session, int severity) {
-		}
+        }
 
-		@Override
+        @Override
-		public void disconnected(I2PSession session) {
+        public void disconnected(I2PSession session) {
-			log.severe "I2P session disconnected"
+            log.severe "I2P session disconnected"
-		}
+        }
 
-		@Override
+        @Override
-		public void errorOccurred(I2PSession session, String message, Throwable error) {
+        public void errorOccurred(I2PSession session, String message, Throwable error) {
-			log.severe "I2P error occured $message $error"
+            log.severe "I2P error occured $message $error"
-		}
+        }
 
-	}
+    }
 
-	private void handlePong(Destination from, def pong) {
+    private void handlePong(Destination from, def pong) {
-		if (!CacheServers.isRegistered(from)) {
+        if (!CacheServers.isRegistered(from)) {
-			log.warning("received pong from non-registered destination")
+            log.warning("received pong from non-registered destination")
-			return
+            return
-		}
+        }
 
-		if (pong.pongs == null) {
+        if (pong.pongs == null) {
-			log.warning("malformed pong - no pongs")
+            log.warning("malformed pong - no pongs")
-			return
+            return
-		}
+        }
 
-		pong.pongs.asList().each { 
+        pong.pongs.asList().each {
-			Destination dest = new Destination(it)
+            Destination dest = new Destination(it)
-			if (!session.getMyDestination().equals(dest))
+            if (!session.getMyDestination().equals(dest))
-				eventBus.publish(new HostDiscoveredEvent(destination: dest, fromHostcache : true)) 
+                eventBus.publish(new HostDiscoveredEvent(destination: dest, fromHostcache : true))
-		}
+        }
 
-	}
+    }
 
-	private void handleCrawlerPing(I2PSession session, Destination from, def ping) {
+    private void handleCrawlerPing(I2PSession session, Destination from, def ping) {
-		if (settings.isLeaf()) {
+        if (settings.isLeaf()) {
-			log.warning("Received crawler ping but I'm a leaf")
+            log.warning("Received crawler ping but I'm a leaf")
-			return
+            return
-		}
+        }
 
-		switch(settings.getCrawlerResponse()) {
+        switch(settings.getCrawlerResponse()) {
-			case CrawlerResponse.NONE:
+            case CrawlerResponse.NONE:
-				log.info("Responding to crawlers is disabled by user")
+                log.info("Responding to crawlers is disabled by user")
-				break
+                break
-			case CrawlerResponse.ALL:
+            case CrawlerResponse.ALL:
-				respondToCrawler(session, from, ping)
+                respondToCrawler(session, from, ping)
-				break;
+                break;
-			case CrawlerResponse.REGISTERED:
+            case CrawlerResponse.REGISTERED:
-				if (CacheServers.isRegistered(from))
+                if (CacheServers.isRegistered(from))
-					respondToCrawler(session, from, ping)
+                    respondToCrawler(session, from, ping)
-				else
+                else
-					log.warning("Ignoring crawler ping from non-registered crawler")
+                    log.warning("Ignoring crawler ping from non-registered crawler")
-				break
+                break
-		}
+        }
-	}
+    }
 
-	private void respondToCrawler(I2PSession session, Destination from, def ping) {
+    private void respondToCrawler(I2PSession session, Destination from, def ping) {
-		log.info "responding to crawler ping"
+        log.info "responding to crawler ping"
 
-		def neighbors = manager.getConnections().collect { c -> c.endpoint.destination.toBase64() }
+        def neighbors = manager.getConnections().collect { c -> c.endpoint.destination.toBase64() }
-		Collections.shuffle(neighbors)
+        Collections.shuffle(neighbors)
-		if (neighbors.size() > CRAWLER_RETURN)
+        if (neighbors.size() > CRAWLER_RETURN)
-			neighbors = neighbors[0..CRAWLER_RETURN - 1]
+            neighbors = neighbors[0..CRAWLER_RETURN - 1]
 
-		def upManager = (UltrapeerConnectionManager) manager;
+        def upManager = (UltrapeerConnectionManager) manager;
-		def pong = [:]
+        def pong = [:]
-		pong.peers = neighbors
+        pong.peers = neighbors
-		pong.uuid = ping.uuid
+        pong.uuid = ping.uuid
-		pong.type = "CrawlerPong"
+        pong.type = "CrawlerPong"
-		pong.version = 1
+        pong.version = 1
-		pong.leafSlots = upManager.hasLeafSlots()
+        pong.leafSlots = upManager.hasLeafSlots()
-		pong.peerSlots = upManager.hasPeerSlots()
+        pong.peerSlots = upManager.hasPeerSlots()
-		pong = JsonOutput.toJson(pong)
+        pong = JsonOutput.toJson(pong)
 
-		def maker = new I2PDatagramMaker(session)
+        def maker = new I2PDatagramMaker(session)
-		pong = maker.makeI2PDatagram(pong.bytes)
+        pong = maker.makeI2PDatagram(pong.bytes)
-		session.sendMessage(from, pong, I2PSession.PROTO_DATAGRAM, 0, 0)
+        session.sendMessage(from, pong, I2PSession.PROTO_DATAGRAM, 0, 0)
-	}
+    }
 
 }

core/src/main/groovy/com/muwire/core/hostcache/CacheServers.groovy

@@ -4,20 +4,25 @@ import net.i2p.data.Destination
 
 class CacheServers {
 
-	private static final int TO_GIVE = 3
+    private static final int TO_GIVE = 3
-	private static Set<Destination> CACHES = [
+    private static Set<Destination> CACHES = [
-			new Destination("Wddh2E6FyyXBF7SvUYHKdN-vjf3~N6uqQWNeBDTM0P33YjiQCOsyedrjmDZmWFrXUJfJLWnCb5bnKezfk4uDaMyj~uvDG~yvLVcFgcPWSUd7BfGgym-zqcG1q1DcM8vfun-US7YamBlmtC6MZ2j-~Igqzmgshita8aLPCfNAA6S6e2UMjjtG7QIXlxpMec75dkHdJlVWbzrk9z8Qgru3YIk0UztYgEwDNBbm9wInsbHhr3HtAfa02QcgRVqRN2PnQXuqUJs7R7~09FZPEviiIcUpkY3FeyLlX1sgQFBeGeA96blaPvZNGd6KnNdgfLgMebx5SSxC-N4KZMSMBz5cgonQF3~m2HHFRSI85zqZNG5X9bJN85t80ltiv1W1es8ZnQW4es11r7MrvJNXz5bmSH641yJIvS6qI8OJJNpFVBIQSXLD-96TayrLQPaYw~uNZ-eXaE6G5dYhiuN8xHsFI1QkdaUaVZnvDGfsRbpS5GtpUbBDbyLkdPurG0i7dN1wAAAA")
+            // zlatinb
-		]
+            new Destination("Wddh2E6FyyXBF7SvUYHKdN-vjf3~N6uqQWNeBDTM0P33YjiQCOsyedrjmDZmWFrXUJfJLWnCb5bnKezfk4uDaMyj~uvDG~yvLVcFgcPWSUd7BfGgym-zqcG1q1DcM8vfun-US7YamBlmtC6MZ2j-~Igqzmgshita8aLPCfNAA6S6e2UMjjtG7QIXlxpMec75dkHdJlVWbzrk9z8Qgru3YIk0UztYgEwDNBbm9wInsbHhr3HtAfa02QcgRVqRN2PnQXuqUJs7R7~09FZPEviiIcUpkY3FeyLlX1sgQFBeGeA96blaPvZNGd6KnNdgfLgMebx5SSxC-N4KZMSMBz5cgonQF3~m2HHFRSI85zqZNG5X9bJN85t80ltiv1W1es8ZnQW4es11r7MrvJNXz5bmSH641yJIvS6qI8OJJNpFVBIQSXLD-96TayrLQPaYw~uNZ-eXaE6G5dYhiuN8xHsFI1QkdaUaVZnvDGfsRbpS5GtpUbBDbyLkdPurG0i7dN1wAAAA"),
+            // sNL
+            new Destination("JC63wJNOqSJmymkj4~UJWywBTvDGikKMoYP0HX2Wz9c5l3otXSkwnxWAFL4cKr~Ygh3BNNi2t93vuLIiI1W8AsE42kR~PwRx~Y-WvIHXR6KUejRmOp-n8WidtjKg9k4aDy428uSOedqXDxys5mpoeQXwDsv1CoPTTwnmb1GWFy~oTGIsCguCl~aJWGnqiKarPO3GJQ~ev-NbvAQzUfC3HeP1e6pdI5CGGjExahTCID5UjpJw8GaDXWlGmYWWH303Xu4x-vAHQy1dJLsOBCn8dZravsn5BKJk~j0POUon45CCx-~NYtaPe0Itt9cMdD2ciC76Rep1D0X0sm1SjlSs8sZ52KmF3oaLZ6OzgI9QLMIyBUrfi41sK5I0qTuUVBAkvW1xr~L-20dYJ9TrbOaOb2-vDIfKaxVi6xQOuhgQDiSBhd3qv2m0xGu-BM9DQYfNA0FdMjnZmqjmji9RMavzQSsVFIbQGLbrLepiEFlb7TseCK5UtRp8TxnG7L4gbYevBQAEAAcAAA=="),
+            // dark_trion
+            new Destination("Gec9L29FVcQvYDgpcYuEYdltJn06PPoOWAcAM8Af-gDm~ehlrJcwlLXXs0hidq~yP2A0X7QcDi6i6shAfuEofTchxGJl8LRNqj9lio7WnB7cIixXWL~uCkD7Np5LMX0~akNX34oOb9RcBYVT2U5rFGJmJ7OtBv~IBkGeLhsMrqaCjahd0jdBO~QJ-t82ZKZhh044d24~JEfF9zSJxdBoCdAcXzryGNy7sYtFVDFsPKJudAxSW-UsSQiGw2~k-TxyF0r-iAt1IdzfNu8Lu0WPqLdhDYJWcPldx2PR5uJorI~zo~z3I5RX3NwzarlbD4nEP5s65ahPSfVCEkzmaJUBgP8DvBqlFaX89K4nGRYc7jkEjJ8cX4L6YPXUpTPWcfKkW259WdQY3YFh6x7rzijrGZewpczOLCrt-bZRYgDrUibmZxKZmNhy~lQu4gYVVjkz1i4tL~DWlhIc4y0x2vItwkYLArPPi~ejTnt-~Lhb7oPMXRcWa3UrwGKpFvGZY4NXBQAEAAcAAA==")
+        ]
 
-	static List<Destination> getCacheServers() {
+    static List<Destination> getCacheServers() {
-		List<Destination> allCaches = new ArrayList<>(CACHES)
+        List<Destination> allCaches = new ArrayList<>(CACHES)
-		Collections.shuffle(allCaches)
+        Collections.shuffle(allCaches)
-		if (allCaches.size() <= TO_GIVE)
+        if (allCaches.size() <= TO_GIVE)
-			return allCaches
+            return allCaches
-		allCaches[0..TO_GIVE-1]
+        allCaches[0..TO_GIVE-1]
-	}
+    }
 
-	static boolean isRegistered(Destination d) {
+    static boolean isRegistered(Destination d) {
-		return CACHES.contains(d)
+        return CACHES.contains(d)
-	}
+    }
 }

core/src/main/groovy/com/muwire/core/hostcache/Host.groovy

@@ -4,43 +4,67 @@ import net.i2p.data.Destination
 
 class Host {
 
-	private static final int MAX_FAILURES = 3
+    private static final int MAX_FAILURES = 3
 
-	final Destination destination
+    final Destination destination
-    private final int clearInterval
+    private final int clearInterval, hopelessInterval, rejectionInterval
-	int failures,successes
+    int failures,successes
     long lastAttempt
+    long lastSuccessfulAttempt
+    long lastRejection
 
-	public Host(Destination destination, int clearInterval) {
+    public Host(Destination destination, int clearInterval, int hopelessInterval, int rejectionInterval) {
-		this.destination = destination
+        this.destination = destination
         this.clearInterval = clearInterval
-	}
+        this.hopelessInterval = hopelessInterval
+        this.rejectionInterval = rejectionInterval
+    }
     
-	synchronized void onConnect() {
+    private void connectSuccessful() {
-		failures = 0
+        failures = 0
-		successes++
+        successes++
         lastAttempt = System.currentTimeMillis()
-	}
+    }
 
-	synchronized void onFailure() {
+    synchronized void onConnect() {
-		failures++
+        connectSuccessful()
-		successes = 0
+        lastSuccessfulAttempt = lastAttempt
+    }
+    
+    synchronized void onReject() {
+        connectSuccessful()
+        lastRejection = lastAttempt;
+    }
+
+    synchronized void onFailure() {
+        failures++
+        successes = 0
         lastAttempt = System.currentTimeMillis()
-	}
+    }
 
-	synchronized boolean isFailed() {
+    synchronized boolean isFailed() {
-		failures >= MAX_FAILURES
+        failures >= MAX_FAILURES
-	}
+    }
 
-	synchronized boolean hasSucceeded() {
+    synchronized boolean hasSucceeded() {
-		successes > 0
+        successes > 0
-	}
+    }
 
     synchronized void clearFailures() {
         failures = 0
     }
 
-    synchronized void canTryAgain() {
+    synchronized boolean canTryAgain() {
-        System.currentTimeMillis() - lastAttempt > (clearInterval * 60 * 1000)
+        lastSuccessfulAttempt > 0 && 
+            System.currentTimeMillis() - lastAttempt > (clearInterval * 60 * 1000)
+    }
+    
+    synchronized boolean isHopeless() {
+        isFailed() && 
+            System.currentTimeMillis() - lastSuccessfulAttempt > (hopelessInterval * 60 * 1000)
+    }
+    
+    synchronized boolean isRecentlyRejected() {
+        System.currentTimeMillis() - lastRejection < (rejectionInterval * 60 * 1000)
     }
 }

core/src/main/groovy/com/muwire/core/hostcache/HostCache.groovy

@@ -15,141 +15,167 @@ import net.i2p.data.Destination
 
 class HostCache extends Service {
 
-	final TrustService trustService
+    final TrustService trustService
-	final File storage
+    final File storage
-	final int interval
+    final int interval
-	final Timer timer
+    final Timer timer
-	final MuWireSettings settings
+    final MuWireSettings settings
-	final Destination myself
+    final Destination myself
-	final Map<Destination, Host> hosts = new ConcurrentHashMap<>()
+    final Map<Destination, Host> hosts = new ConcurrentHashMap<>()
 
-	HostCache(){}
+    HostCache(){}
 
-	public HostCache(TrustService trustService, File storage, int interval, 
+    public HostCache(TrustService trustService, File storage, int interval,
-		MuWireSettings settings, Destination myself) {
+        MuWireSettings settings, Destination myself) {
-		this.trustService = trustService
+        this.trustService = trustService
-		this.storage = storage
+        this.storage = storage
-		this.interval = interval
+        this.interval = interval
-		this.settings = settings
+        this.settings = settings
-		this.myself = myself
+        this.myself = myself
-		this.timer = new Timer("host-persister",true)
+        this.timer = new Timer("host-persister",true)
-	}
+    }
 
-	void start() {
+    void start() {
-		timer.schedule({load()} as TimerTask, 1)
+        timer.schedule({load()} as TimerTask, 1)
-	}
+    }
 
-	void stop() {
+    void stop() {
-		timer.cancel()
+        timer.cancel()
-	}
+    }
 
-	void onHostDiscoveredEvent(HostDiscoveredEvent e) {
+    void onHostDiscoveredEvent(HostDiscoveredEvent e) {
-		if (myself == e.destination)
+        if (myself == e.destination)
-			return
+            return
-		if (hosts.containsKey(e.destination)) {
+        if (hosts.containsKey(e.destination)) {
             if (!e.fromHostcache)
                 return
             hosts.get(e.destination).clearFailures()
             return
-		}
+        }
-		Host host = new Host(e.destination, settings.hostClearInterval)
+        Host host = new Host(e.destination, settings.hostClearInterval, settings.hostHopelessInterval, settings.hostRejectInterval)
-		if (allowHost(host)) {
+        if (allowHost(host)) {
-			hosts.put(e.destination, host)
+            hosts.put(e.destination, host)
-		}
+        }
-	}
+    }
 
-	void onConnectionEvent(ConnectionEvent e) {
+    void onConnectionEvent(ConnectionEvent e) {
-		if (e.leaf)
+        if (e.leaf)
-			return
+            return
-		Destination dest = e.endpoint.destination
+        Destination dest = e.endpoint.destination
-		Host host = hosts.get(dest)
+        Host host = hosts.get(dest)
-		if (host == null) {
+        if (host == null) {
-			host = new Host(dest, settings.hostClearInterval)
+            host = new Host(dest, settings.hostClearInterval, settings.hostHopelessInterval, settings.hostRejectInterval)
-			hosts.put(dest, host)
+            hosts.put(dest, host)
-		}
+        }
 
-		switch(e.status) {
+        switch(e.status) {
-			case ConnectionAttemptStatus.SUCCESSFUL:
+            case ConnectionAttemptStatus.SUCCESSFUL:
-			case ConnectionAttemptStatus.REJECTED:
+                host.onConnect()
-				host.onConnect()
+                break
-				break
+            case ConnectionAttemptStatus.REJECTED:
-			case ConnectionAttemptStatus.FAILED:
+                host.onReject()
-				host.onFailure()
+                break
-				break
+            case ConnectionAttemptStatus.FAILED:
-		}
+                host.onFailure()
-	}
+                break
+        }
+    }
 
-	List<Destination> getHosts(int n) {
+    List<Destination> getHosts(int n) {
-		List<Destination> rv = new ArrayList<>(hosts.keySet())
+        List<Destination> rv = new ArrayList<>(hosts.keySet())
-		rv.retainAll {allowHost(hosts[it])}
+        rv.retainAll {allowHost(hosts[it])}
-		if (rv.size() <= n)
+        rv.removeAll {
-			return rv
+            def h = hosts[it]; 
-		Collections.shuffle(rv)
+            (h.isFailed() && !h.canTryAgain()) || h.isRecentlyRejected()
-		rv[0..n-1]
+        }
-	}
+        if (rv.size() <= n)
+            return rv
+        Collections.shuffle(rv)
+        rv[0..n-1]
+    }
 
-	List<Destination> getGoodHosts(int n) {
+    List<Destination> getGoodHosts(int n) {
-		List<Destination> rv = new ArrayList<>(hosts.keySet())
+        List<Destination> rv = new ArrayList<>(hosts.keySet())
-		rv.retainAll {
+        rv.retainAll {
-			Host host = hosts[it]
+            Host host = hosts[it]
-			allowHost(host) && host.hasSucceeded()
+            allowHost(host) && host.hasSucceeded()
-		}
+        }
-		if (rv.size() <= n)
+        if (rv.size() <= n)
-			return rv
+            return rv
-		Collections.shuffle(rv)
+        Collections.shuffle(rv)
-		rv[0..n-1]
+        rv[0..n-1]
-	}
+    }
     
-	void load() {
+    int countFailingHosts() {
-		if (storage.exists()) {
+        List<Destination> rv = new ArrayList<>(hosts.keySet())
-			JsonSlurper slurper = new JsonSlurper()
+        rv.retainAll { 
-			storage.eachLine {
+            hosts[it].isFailed()
-				def entry = slurper.parseText(it)
+        }
-				Destination dest = new Destination(entry.destination)
+        rv.size()
-				Host host = new Host(dest, settings.hostClearInterval)
+    }
-				host.failures = Integer.valueOf(String.valueOf(entry.failures))
+    
-				host.successes = Integer.valueOf(String.valueOf(entry.successes))
+    int countHopelessHosts() {
+        List<Destination> rv = new ArrayList<>(hosts.keySet())
+        rv.retainAll {
+            hosts[it].isHopeless()
+        }
+        rv.size()
+    }
+
+    void load() {
+        if (storage.exists()) {
+            JsonSlurper slurper = new JsonSlurper()
+            storage.eachLine {
+                def entry = slurper.parseText(it)
+                Destination dest = new Destination(entry.destination)
+                Host host = new Host(dest, settings.hostClearInterval, settings.hostHopelessInterval, settings.hostRejectInterval)
+                host.failures = Integer.valueOf(String.valueOf(entry.failures))
+                host.successes = Integer.valueOf(String.valueOf(entry.successes))
                 if (entry.lastAttempt != null)
                     host.lastAttempt = entry.lastAttempt
-				if (allowHost(host))
+                if (entry.lastSuccessfulAttempt != null)
-					hosts.put(dest, host)
+                    host.lastSuccessfulAttempt = entry.lastSuccessfulAttempt
-			}
+                if (entry.lastRejection != null)
-		}
+                    host.lastRejection = entry.lastRejection
-		timer.schedule({save()} as TimerTask, interval, interval)
+                if (allowHost(host)) 
-		loaded = true
+                    hosts.put(dest, host)
-	}
+            }
+        }
+        timer.schedule({save()} as TimerTask, interval, interval)
+        loaded = true
+    }
 
-	private boolean allowHost(Host host) {
+    private boolean allowHost(Host host) {
-		if (host.isFailed() && !host.canTryAgain())
+        if (host.destination == myself)
-			return false
+            return false
-		if (host.destination == myself)
+        TrustLevel trust = trustService.getLevel(host.destination)
-			return false
+        switch(trust) {
-		TrustLevel trust = trustService.getLevel(host.destination)
+            case TrustLevel.DISTRUSTED :
-		switch(trust) {
+                return false
-			case TrustLevel.DISTRUSTED :
+            case TrustLevel.TRUSTED :
-				return false
+                return true
-			case TrustLevel.TRUSTED :
+            case TrustLevel.NEUTRAL :
-				return true
+                return settings.allowUntrusted()
-			case TrustLevel.NEUTRAL :
+        }
-				return settings.allowUntrusted()
+        false
-		}
+    }
-		false
-	}
 
-	private void save() {
+    private void save() {
-		storage.delete()
+        storage.delete()
-		storage.withPrintWriter { writer ->
+        storage.withPrintWriter { writer ->
-			hosts.each { dest, host ->
+            hosts.each { dest, host ->
-				if (allowHost(host)) {
+                if (allowHost(host) && !host.isHopeless()) {
-					def map = [:]
+                    def map = [:]
-					map.destination = dest.toBase64()
+                    map.destination = dest.toBase64()
-					map.failures = host.failures
+                    map.failures = host.failures
-					map.successes = host.successes
+                    map.successes = host.successes
                     map.lastAttempt = host.lastAttempt
-					def json = JsonOutput.toJson(map)
+                    map.lastSuccessfulAttempt = host.lastSuccessfulAttempt
-					writer.println json
+                    map.lastRejection = host.lastRejection
-				}
+                    def json = JsonOutput.toJson(map)
-			}
+                    writer.println json
-		}
+                }
-	}
+            }
+        }
+    }
 }

core/src/main/groovy/com/muwire/core/hostcache/HostDiscoveredEvent.groovy

@@ -6,11 +6,11 @@ import net.i2p.data.Destination
 
 class HostDiscoveredEvent extends Event {
 
-	Destination destination
+    Destination destination
     boolean fromHostcache
 
-	@Override
+    @Override
-	public String toString() {
+    public String toString() {
-		"HostDiscoveredEvent ${super.toString()} destination:${destination.toBase32()} from hostcache $fromHostcache"
+        "HostDiscoveredEvent ${super.toString()} destination:${destination.toBase32()} from hostcache $fromHostcache"
-	}
+    }
 }

core/src/main/groovy/com/muwire/core/mesh/MeshManager.groovy

@@ -33,11 +33,12 @@ class MeshManager {
         meshes.get(infoHash)
     }
 
-    Mesh getOrCreate(InfoHash infoHash, int nPieces) {
+    Mesh getOrCreate(InfoHash infoHash, int nPieces, boolean sequential) {
         synchronized(meshes) {
             if (meshes.containsKey(infoHash))
                 return meshes.get(infoHash)
-            Pieces pieces = new Pieces(nPieces, settings.downloadSequentialRatio)
+            float ratio = sequential ? 0f : settings.downloadSequentialRatio
+            Pieces pieces = new Pieces(nPieces, ratio)
             if (fileManager.rootToFiles.containsKey(infoHash)) {
                 for (int i = 0; i < nPieces; i++)
                     pieces.markDownloaded(i)

core/src/main/groovy/com/muwire/core/search/BrowseManager.groovy

@@ -0,0 +1,87 @@
+package com.muwire.core.search
+
+import com.muwire.core.Constants
+import com.muwire.core.EventBus
+import com.muwire.core.connection.Endpoint
+import com.muwire.core.connection.I2PConnector
+import com.muwire.core.util.DataUtil
+
+import groovy.json.JsonSlurper
+import groovy.util.logging.Log
+
+import java.nio.charset.StandardCharsets
+import java.util.concurrent.Executor
+import java.util.concurrent.Executors
+import java.util.logging.Level
+import java.util.zip.GZIPInputStream
+
+@Log
+class BrowseManager {
+    
+    private final I2PConnector connector
+    private final EventBus eventBus
+    
+    private final Executor browserThread = Executors.newSingleThreadExecutor()
+    
+    BrowseManager(I2PConnector connector, EventBus eventBus) {
+        this.connector = connector
+        this.eventBus = eventBus
+    }
+    
+    void onUIBrowseEvent(UIBrowseEvent e) {
+        browserThread.execute({
+            Endpoint endpoint = null
+            try {
+                eventBus.publish(new BrowseStatusEvent(status : BrowseStatus.CONNECTING))
+                endpoint = connector.connect(e.host.destination)
+                OutputStream os = endpoint.getOutputStream()
+                os.write("BROWSE\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
+             
+                InputStream is = endpoint.getInputStream()
+                String code = DataUtil.readTillRN(is)
+                if (!code.startsWith("200"))
+                    throw new IOException("Invalid code $code")
+                    
+                // parse all headers
+                Map<String,String> headers = new HashMap<>()
+                String header
+                while((header = DataUtil.readTillRN(is)) != "" && headers.size() < Constants.MAX_HEADERS) {
+                    int colon = header.indexOf(':')
+                    if (colon == -1 || colon == header.length() - 1)
+                        throw new IOException("invalid header $header")
+                    String key = header.substring(0, colon)
+                    String value = header.substring(colon + 1)
+                    headers[key] = value.trim()
+                }
+                
+                if (!headers.containsKey("Count"))
+                    throw new IOException("No count header")
+                
+                int results = Integer.parseInt(headers['Count'])
+                
+                // at this stage, start pulling the results
+                eventBus.publish(new BrowseStatusEvent(status : BrowseStatus.FETCHING, totalResults : results))
+                
+                JsonSlurper slurper = new JsonSlurper()
+                DataInputStream dis = new DataInputStream(new GZIPInputStream(is))
+                UUID uuid = UUID.randomUUID()
+                for (int i = 0; i < results; i++) {
+                    int size = dis.readUnsignedShort()
+                    byte [] tmp = new byte[size]
+                    dis.readFully(tmp)
+                    def json = slurper.parse(tmp)
+                    UIResultEvent result = ResultsParser.parse(e.host, uuid, json)
+                    eventBus.publish(result)
+                }
+                
+                eventBus.publish(new BrowseStatusEvent(status : BrowseStatus.FINISHED))
+                
+            } catch (Exception bad) {
+                log.log(Level.WARNING, "browse failed", bad)
+                eventBus.publish(new BrowseStatusEvent(status : BrowseStatus.FAILED))
+            } finally {
+                endpoint?.close()
+            }
+        } as Runnable)
+    }
+}

core/src/main/groovy/com/muwire/core/search/BrowseStatus.java

@@ -0,0 +1,5 @@
+package com.muwire.core.search;
+
+public enum BrowseStatus {
+    CONNECTING, FETCHING, FINISHED, FAILED
+}

core/src/main/groovy/com/muwire/core/search/BrowseStatusEvent.groovy

@@ -0,0 +1,8 @@
+package com.muwire.core.search
+
+import com.muwire.core.Event
+
+class BrowseStatusEvent extends Event {
+    BrowseStatus status
+    int totalResults
+}

core/src/main/groovy/com/muwire/core/search/DeleteEvent.groovy

@@ -6,11 +6,11 @@ import net.i2p.data.Base32
 import net.i2p.data.Destination
 
 class DeleteEvent extends Event {
-	byte [] infoHash
+    byte [] infoHash
-	Destination leaf
+    Destination leaf
 
-	@Override
+    @Override
-	public String toString() {
+    public String toString() {
-		"DeleteEvent ${super.toString()} infoHash:${Base32.encode(infoHash)} leaf:${leaf.toBase32()}"
+        "DeleteEvent ${super.toString()} infoHash:${Base32.encode(infoHash)} leaf:${leaf.toBase32()}"
-	}
+    }
 }

core/src/main/groovy/com/muwire/core/search/LeafSearcher.groovy

@@ -7,32 +7,32 @@ import net.i2p.data.Destination
 
 class LeafSearcher {
 
-	final UltrapeerConnectionManager connectionManager
+    final UltrapeerConnectionManager connectionManager
-	final SearchIndex searchIndex = new SearchIndex()
+    final SearchIndex searchIndex = new SearchIndex()
 
-	final Map<String, Set<byte[]>> fileNameToHashes = new HashMap<>()
+    final Map<String, Set<byte[]>> fileNameToHashes = new HashMap<>()
-	final Map<byte[], Set<Destination>> hashToLeafs = new HashMap<>()
+    final Map<byte[], Set<Destination>> hashToLeafs = new HashMap<>()
 
-	final Map<Destination, Map<byte[], Set<String>>> leafToFiles = new HashMap<>()
+    final Map<Destination, Map<byte[], Set<String>>> leafToFiles = new HashMap<>()
 
-	LeafSearcher(UltrapeerConnectionManager connectionManager) {
+    LeafSearcher(UltrapeerConnectionManager connectionManager) {
-		this.connectionManager = connectionManager
+        this.connectionManager = connectionManager
-	}
+    }
 
-	void onUpsertEvent(UpsertEvent e) {
+    void onUpsertEvent(UpsertEvent e) {
-		// TODO: implement
+        // TODO: implement
-	}
+    }
 
-	void onDeleteEvent(DeleteEvent e) {
+    void onDeleteEvent(DeleteEvent e) {
-		// TODO: implement
+        // TODO: implement
-	}
+    }
 
-	void onDisconnectionEvent(DisconnectionEvent e) {
+    void onDisconnectionEvent(DisconnectionEvent e) {
-		// TODO: implement
+        // TODO: implement
-	}
+    }
 
-	void onQueryEvent(QueryEvent e) {
+    void onQueryEvent(QueryEvent e) {
-		// TODO: implement
+        // TODO: implement
-	}
+    }
 
 }

core/src/main/groovy/com/muwire/core/search/QueryEvent.groovy

@@ -8,10 +8,10 @@ import net.i2p.data.Destination
 class QueryEvent extends Event {
 
     SearchEvent searchEvent
-	boolean firstHop
+    boolean firstHop
-	Destination replyTo
+    Destination replyTo
     Persona originator
-	Destination receivedOn
+    Destination receivedOn
 
     String toString() {
         "searchEvent: $searchEvent firstHop:$firstHop, replyTo:${replyTo.toBase32()}" +

core/src/main/groovy/com/muwire/core/search/ResultsEvent.groovy

@@ -6,6 +6,6 @@ import com.muwire.core.SharedFile
 class ResultsEvent extends Event {
 
     SearchEvent searchEvent
-	SharedFile[] results
+    SharedFile[] results
-	UUID uuid
+    UUID uuid
 }

core/src/main/groovy/com/muwire/core/search/ResultsParser.groovy

@@ -91,12 +91,22 @@ class ResultsParser {
             if (json.sources != null)
                 sources = json.sources.stream().map({new Destination(it)}).collect(Collectors.toSet())
                 
+            String comment = null
+            if (json.comment != null)
+                comment = DataUtil.readi18nString(Base64.decode(json.comment))
+                
+            boolean browse = false
+            if (json.browse != null)
+                browse = json.browse
+
             return new UIResultEvent( sender : p,
                 name : name,
                 size : size,
                 infohash : new InfoHash(infoHash),
                 pieceSize : pieceSize,
                 sources : sources,
+                comment : comment,
+                browse : browse,
                 uuid: uuid)
         } catch (Exception e) {
             throw new InvalidSearchResultException("parsing search result failed",e)

core/src/main/groovy/com/muwire/core/search/ResultsSender.groovy

@@ -4,6 +4,7 @@ import com.muwire.core.SharedFile
 import com.muwire.core.connection.Endpoint
 import com.muwire.core.connection.I2PConnector
 import com.muwire.core.files.FileHasher
+import com.muwire.core.util.DataUtil
 import com.muwire.core.Persona
 
 import java.nio.charset.StandardCharsets
@@ -13,10 +14,12 @@ import java.util.concurrent.ThreadFactory
 import java.util.concurrent.atomic.AtomicInteger
 import java.util.logging.Level
 import java.util.stream.Collectors
+import java.util.zip.GZIPOutputStream
 
 import com.muwire.core.DownloadedFile
 import com.muwire.core.EventBus
 import com.muwire.core.InfoHash
+import com.muwire.core.MuWireSettings
 
 import groovy.json.JsonOutput
 import groovy.util.logging.Log
@@ -42,16 +45,19 @@ class ResultsSender {
     private final I2PConnector connector
     private final Persona me
     private final EventBus eventBus
+    private final MuWireSettings settings
 
-    ResultsSender(EventBus eventBus, I2PConnector connector, Persona me) {
+    ResultsSender(EventBus eventBus, I2PConnector connector, Persona me, MuWireSettings settings) {
         this.connector = connector;
         this.eventBus = eventBus
         this.me = me
+        this.settings = settings
     }
 
-    void sendResults(UUID uuid, SharedFile[] results, Destination target, boolean oobInfohash) {
+    void sendResults(UUID uuid, SharedFile[] results, Destination target, boolean oobInfohash, boolean compressedResults) {
         log.info("Sending $results.length results for uuid $uuid to ${target.toBase32()} oobInfohash : $oobInfohash")
         if (target.equals(me.destination)) {
+            def uiResultEvents = []
             results.each {
                 long length = it.getFile().length()
                 int pieceSize = it.getPieceSize()
@@ -60,19 +66,25 @@ class ResultsSender {
                 Set<Destination> suggested = Collections.emptySet()
                 if (it instanceof DownloadedFile)
                     suggested = it.sources
+                def comment = null
+                if (it.getComment() != null) {
+                    comment = DataUtil.readi18nString(Base64.decode(it.getComment()))
+                }
                 def uiResultEvent = new UIResultEvent( sender : me,
                     name : it.getFile().getName(),
                     size : length,
                     infohash : it.getInfoHash(),
                     pieceSize : pieceSize,
                     uuid : uuid,
-                    sources : suggested
+                    sources : suggested,
+                    comment : comment
                     )
-                    eventBus.publish(uiResultEvent)
+                uiResultEvents << uiResultEvent
             }
+            eventBus.publish(new UIResultBatchEvent(uuid : uuid, results : uiResultEvents))
         } else {
             executor.execute(new ResultSendJob(uuid : uuid, results : results,
-                target: target, oobInfohash : oobInfohash))
+                target: target, oobInfohash : oobInfohash, compressedResults : compressedResults))
         }
     }
 
@@ -81,58 +93,79 @@ class ResultsSender {
         SharedFile [] results
         Destination target
         boolean oobInfohash
+        boolean compressedResults
 
         @Override
         public void run() {
             try {
-                byte [] tmp = new byte[InfoHash.SIZE]
                 JsonOutput jsonOutput = new JsonOutput()
                 Endpoint endpoint = null;
-                try {
+                if (!compressedResults) {
-                    endpoint = connector.connect(target)
+                    try {
-                    DataOutputStream os = new DataOutputStream(endpoint.getOutputStream())
+                        endpoint = connector.connect(target)
-                    os.write("POST $uuid\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
+                        DataOutputStream os = new DataOutputStream(endpoint.getOutputStream())
-                    me.write(os)
+                        os.write("POST $uuid\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
-                    os.writeShort((short)results.length)
+                        me.write(os)
-                    results.each {
+                        os.writeShort((short)results.length)
-                        byte [] name = it.getFile().getName().getBytes(StandardCharsets.UTF_8)
+                        results.each {
-                        def baos = new ByteArrayOutputStream()
+                            def obj = sharedFileToObj(it, settings.browseFiles)
-                        def daos = new DataOutputStream(baos)
+                            def json = jsonOutput.toJson(obj)
-                        daos.writeShort((short) name.length)
+                            os.writeShort((short)json.length())
-                        daos.write(name)
+                            os.write(json.getBytes(StandardCharsets.US_ASCII))
-                        daos.flush()
-                        String encodedName = Base64.encode(baos.toByteArray())
-                        def obj = [:]
-                        obj.type = "Result"
-                        obj.version = oobInfohash ? 2 : 1
-                        obj.name = encodedName
-                        obj.infohash = Base64.encode(it.getInfoHash().getRoot())
-                        obj.size = it.getFile().length()
-                        obj.pieceSize = it.getPieceSize()
-                        if (!oobInfohash) {
-                            byte [] hashList = it.getInfoHash().getHashList()
-                            def hashListB64 = []
-                            for (int i = 0; i < hashList.length / InfoHash.SIZE; i++) {
-                                System.arraycopy(hashList, InfoHash.SIZE * i, tmp, 0, InfoHash.SIZE)
-                                hashListB64 << Base64.encode(tmp)
-                            }
-                            obj.hashList = hashListB64
                         }
-
+                        os.flush()
-                        if (it instanceof DownloadedFile)
+                    } finally {
-                            obj.sources = it.sources.stream().map({dest -> dest.toBase64()}).collect(Collectors.toSet())
+                        endpoint?.close()
-
+                    }
-                        def json = jsonOutput.toJson(obj)
+                } else {
-                        os.writeShort((short)json.length())
+                    try {
-                        os.write(json.getBytes(StandardCharsets.US_ASCII))
+                        endpoint = connector.connect(target)
+                        OutputStream os = endpoint.getOutputStream()
+                        os.write("RESULTS $uuid\r\n".getBytes(StandardCharsets.US_ASCII))
+                        os.write("Sender: ${me.toBase64()}\r\n".getBytes(StandardCharsets.US_ASCII))
+                        os.write("Count: $results.length\r\n".getBytes(StandardCharsets.US_ASCII))
+                        os.write("\r\n".getBytes(StandardCharsets.US_ASCII))
+                        DataOutputStream dos = new DataOutputStream(new GZIPOutputStream(os))
+                        results.each { 
+                            def obj = sharedFileToObj(it, settings.browseFiles)
+                            def json = jsonOutput.toJson(obj)
+                            dos.writeShort((short)json.length())
+                            dos.write(json.getBytes(StandardCharsets.US_ASCII))
+                        }
+                        dos.close()
+                    } finally {
+                        endpoint?.close()
                     }
-                    os.flush()
-                } finally {
-                    endpoint?.close()
                 }
             } catch (Exception e) {
                 log.log(Level.WARNING, "problem sending results",e)
             }
         }
     }
+    
+    public static def sharedFileToObj(SharedFile sf, boolean browseFiles) {
+        byte [] name = sf.getFile().getName().getBytes(StandardCharsets.UTF_8)
+        def baos = new ByteArrayOutputStream()
+        def daos = new DataOutputStream(baos)
+        daos.writeShort((short) name.length)
+        daos.write(name)
+        daos.flush()
+        String encodedName = Base64.encode(baos.toByteArray())
+        def obj = [:]
+        obj.type = "Result"
+        obj.version = 2
+        obj.name = encodedName
+        obj.infohash = Base64.encode(sf.getInfoHash().getRoot())
+        obj.size = sf.getCachedLength()
+        obj.pieceSize = sf.getPieceSize()
+
+        if (sf instanceof DownloadedFile)
+            obj.sources = sf.sources.stream().map({dest -> dest.toBase64()}).collect(Collectors.toSet())
+
+        if (sf.getComment() != null)
+            obj.comment = sf.getComment()
+
+        obj.browse = browseFiles 
+        obj
+    }
 }

core/src/main/groovy/com/muwire/core/search/SearchEvent.groovy

@@ -5,15 +5,17 @@ import com.muwire.core.InfoHash
 
 class SearchEvent extends Event {
 
-	List<String> searchTerms
+    List<String> searchTerms
-	byte [] searchHash
+    byte [] searchHash
-	UUID uuid
+    UUID uuid
     boolean oobInfohash
+    boolean searchComments
+    boolean compressedResults
 
     String toString() {
         def infoHash = null
         if (searchHash != null)
             infoHash = new InfoHash(searchHash)
-        "searchTerms: $searchTerms searchHash:$infoHash, uuid:$uuid oobInfohash:$oobInfohash"
+        "searchTerms: $searchTerms searchHash:$infoHash, uuid:$uuid oobInfohash:$oobInfohash searchComments:$searchComments compressedResults:$compressedResults"
     }
 }

core/src/main/groovy/com/muwire/core/search/SearchIndex.groovy

@@ -1,59 +1,59 @@
 package com.muwire.core.search
 
-import com.muwire.core.Constants
+import com.muwire.core.SplitPattern
 
 class SearchIndex {
 
-	final Map<String, Set<String>> keywords = new HashMap<>()
+    final Map<String, Set<String>> keywords = new HashMap<>()
 
-	void add(String string) {
+    void add(String string) {
-		String [] split = split(string)
+        String [] split = split(string)
-		split.each {
+        split.each {
-			Set<String> existing = keywords.get(it)
+            Set<String> existing = keywords.get(it)
-			if (existing == null) {
+            if (existing == null) {
-				existing = new HashSet<>()
+                existing = new HashSet<>()
-				keywords.put(it, existing)
+                keywords.put(it, existing)
-			}
+            }
-			existing.add(string)
+            existing.add(string)
-		}
+        }
-	}
+    }
 
-	void remove(String string) {
+    void remove(String string) {
-		String [] split = split(string)
+        String [] split = split(string)
-		split.each {
+        split.each {
-			Set<String> existing = keywords.get it
+            Set<String> existing = keywords.get it
-			if (existing != null) {
+            if (existing != null) {
-				existing.remove(string)
+                existing.remove(string)
-				if (existing.isEmpty()) {
+                if (existing.isEmpty()) {
-					keywords.remove(it)
+                    keywords.remove(it)
-				}
+                }
-			}
+            }
-		}
+        }
-	}
+    }
 
-	private static String[] split(String source) {
+    private static String[] split(String source) {
-		source = source.replaceAll(Constants.SPLIT_PATTERN, " ").toLowerCase()
+        source = source.replaceAll(SplitPattern.SPLIT_PATTERN, " ").toLowerCase()
-		String [] split = source.split(" ")
+        String [] split = source.split(" ")
         def rv = []
         split.each { if (it.length() > 0) rv << it }
         rv.toArray(new String[0])
-	}
+    }
 
-	String[] search(List<String> terms) {
+    String[] search(List<String> terms) {
-		Set<String> rv = null;
+        Set<String> rv = null;
 
-		terms.each {
+        terms.each {
-			Set<String> forWord = keywords.getOrDefault(it,[])
+            Set<String> forWord = keywords.getOrDefault(it,[])
-			if (rv == null) {
+            if (rv == null) {
-				rv = new HashSet<>(forWord)
+                rv = new HashSet<>(forWord)
-			} else {
+            } else {
-				rv.retainAll(forWord)
+                rv.retainAll(forWord)
-			}
+            }
 
-		}
+        }
 
-		if (rv != null)
+        if (rv != null)
-			return rv.asList()
+            return rv.asList()
-		[]
+        []
-	}
+    }
 }

core/src/main/groovy/com/muwire/core/search/SearchManager.groovy

@@ -44,7 +44,7 @@ public class SearchManager {
             log.info("No results for search uuid $event.uuid")
             return
         }
-        resultsSender.sendResults(event.uuid, event.results, target, event.searchEvent.oobInfohash)
+        resultsSender.sendResults(event.uuid, event.results, target, event.searchEvent.oobInfohash, event.searchEvent.compressedResults)
     }
 
     boolean hasLocalSearch(UUID uuid) {

core/src/main/groovy/com/muwire/core/search/UIBrowseEvent.groovy

@@ -0,0 +1,8 @@
+package com.muwire.core.search
+
+import com.muwire.core.Event
+import com.muwire.core.Persona
+
+class UIBrowseEvent extends Event {
+    Persona host
+}

core/src/main/groovy/com/muwire/core/search/UIResultEvent.groovy

@@ -14,6 +14,8 @@ class UIResultEvent extends Event {
     long size
     InfoHash infohash
     int pieceSize
+    String comment
+    boolean browse
 
     @Override
     public String toString() {

core/src/main/groovy/com/muwire/core/search/UpsertEvent.groovy

@@ -7,12 +7,12 @@ import net.i2p.data.Destination
 
 class UpsertEvent extends Event {
 
-	Set<String> names
+    Set<String> names
-	byte [] infoHash
+    byte [] infoHash
-	Destination leaf
+    Destination leaf
 
-	@Override
+    @Override
-	public String toString() {
+    public String toString() {
-		"UpsertEvent ${super.toString()} names:$names infoHash:${Base32.encode(infoHash)} leaf:${leaf.toBase32()}"
+        "UpsertEvent ${super.toString()} names:$names infoHash:${Base32.encode(infoHash)} leaf:${leaf.toBase32()}"
-	}
+    }
 }

core/src/main/groovy/com/muwire/core/trust/RemoteTrustList.groovy

@@ -7,7 +7,7 @@ import com.muwire.core.Persona
 import net.i2p.util.ConcurrentHashSet
 
 class RemoteTrustList {
-    public enum Status { NEW, UPDATING, UPDATED }
+    public enum Status { NEW, UPDATING, UPDATED, UPDATE_FAILED }
 
     private final Persona persona
     private final Set<Persona> good, bad

core/src/main/groovy/com/muwire/core/trust/TrustEvent.groovy

@@ -5,6 +5,6 @@ import com.muwire.core.Persona
 
 class TrustEvent extends Event {
 
-	Persona persona
+    Persona persona
-	TrustLevel level
+    TrustLevel level
 }

core/src/main/groovy/com/muwire/core/trust/TrustService.groovy

@@ -11,87 +11,87 @@ import net.i2p.util.ConcurrentHashSet
 
 class TrustService extends Service {
 
-	final File persistGood, persistBad
+    final File persistGood, persistBad
-	final long persistInterval
+    final long persistInterval
 
-	final Map<Destination, Persona> good = new ConcurrentHashMap<>()
+    final Map<Destination, Persona> good = new ConcurrentHashMap<>()
-	final Map<Destination, Persona> bad = new ConcurrentHashMap<>()
+    final Map<Destination, Persona> bad = new ConcurrentHashMap<>()
 
-	final Timer timer
+    final Timer timer
 
-	TrustService() {}
+    TrustService() {}
 
-	TrustService(File persistGood, File persistBad, long persistInterval) {
+    TrustService(File persistGood, File persistBad, long persistInterval) {
-		this.persistBad = persistBad
+        this.persistBad = persistBad
-		this.persistGood = persistGood
+        this.persistGood = persistGood
-		this.persistInterval = persistInterval
+        this.persistInterval = persistInterval
-		this.timer = new Timer("trust-persister",true)
+        this.timer = new Timer("trust-persister",true)
-	}
+    }
 
-	void start() {
+    void start() {
-		timer.schedule({load()} as TimerTask, 1)
+        timer.schedule({load()} as TimerTask, 1)
-	}
+    }
 
-	void stop() {
+    void stop() {
-		timer.cancel()
+        timer.cancel()
-	}
+    }
 
-	void load() {
+    void load() {
-		if (persistGood.exists()) {
+        if (persistGood.exists()) {
-			persistGood.eachLine {
+            persistGood.eachLine {
                 byte [] decoded = Base64.decode(it)
                 Persona persona = new Persona(new ByteArrayInputStream(decoded))
-				good.put(persona.destination, persona)
+                good.put(persona.destination, persona)
-			}
+            }
-		}
+        }
-		if (persistBad.exists()) {
+        if (persistBad.exists()) {
-			persistBad.eachLine {
+            persistBad.eachLine {
                 byte [] decoded = Base64.decode(it)
                 Persona persona = new Persona(new ByteArrayInputStream(decoded))
                 bad.put(persona.destination, persona)
-			}
+            }
-		}
+        }
-		timer.schedule({persist()} as TimerTask, persistInterval, persistInterval)
+        timer.schedule({persist()} as TimerTask, persistInterval, persistInterval)
-		loaded = true
+        loaded = true
-	}
+    }
 
-	private void persist() {
+    private void persist() {
-		persistGood.delete()
+        persistGood.delete()
-		persistGood.withPrintWriter { writer ->
+        persistGood.withPrintWriter { writer ->
-			good.each {k,v ->
+            good.each {k,v ->
-				writer.println v.toBase64()
+                writer.println v.toBase64()
-			}
+            }
-		}
+        }
-		persistBad.delete()
+        persistBad.delete()
-		persistBad.withPrintWriter { writer ->
+        persistBad.withPrintWriter { writer ->
-			bad.each { k,v ->
+            bad.each { k,v ->
-				writer.println v.toBase64()
+                writer.println v.toBase64()
-			}
+            }
-		}
+        }
-	}
+    }
 
-	TrustLevel getLevel(Destination dest) {
+    TrustLevel getLevel(Destination dest) {
-		if (good.containsKey(dest))
+        if (good.containsKey(dest))
-			return TrustLevel.TRUSTED
+            return TrustLevel.TRUSTED
-		else if (bad.containsKey(dest))
+        else if (bad.containsKey(dest))
-			return TrustLevel.DISTRUSTED
+            return TrustLevel.DISTRUSTED
-		TrustLevel.NEUTRAL
+        TrustLevel.NEUTRAL
-	}
+    }
 
-	void onTrustEvent(TrustEvent e) {
+    void onTrustEvent(TrustEvent e) {
-		switch(e.level) {
+        switch(e.level) {
-			case TrustLevel.TRUSTED:
+            case TrustLevel.TRUSTED:
-				bad.remove(e.persona.destination)
+                bad.remove(e.persona.destination)
-				good.put(e.persona.destination, e.persona)
+                good.put(e.persona.destination, e.persona)
-				break
+                break
-			case TrustLevel.DISTRUSTED:
+            case TrustLevel.DISTRUSTED:
-				good.remove(e.persona.destination)
+                good.remove(e.persona.destination)
-				bad.put(e.persona.destination, e.persona)
+                bad.put(e.persona.destination, e.persona)
-				break
+                break
-			case TrustLevel.NEUTRAL:
+            case TrustLevel.NEUTRAL:
-				good.remove(e.persona.destination)
+                good.remove(e.persona.destination)
-				bad.remove(e.persona.destination)
+                bad.remove(e.persona.destination)
-				break
+                break
-		}
+        }
-	}
+    }
 }

core/src/main/groovy/com/muwire/core/trust/TrustSubscriber.groovy

@@ -94,13 +94,15 @@ class TrustSubscriber {
         public void run() {
             trustList.status = RemoteTrustList.Status.UPDATING
             eventBus.publish(new TrustSubscriptionUpdatedEvent(trustList : trustList))
-            check(trustList, System.currentTimeMillis())
+            if (check(trustList, System.currentTimeMillis()))
-            trustList.status = RemoteTrustList.Status.UPDATED
+                trustList.status = RemoteTrustList.Status.UPDATED
+            else
+                trustList.status = RemoteTrustList.Status.UPDATE_FAILED
             eventBus.publish(new TrustSubscriptionUpdatedEvent(trustList : trustList))
         }
     }
 
-    private void check(RemoteTrustList trustList, long now) {
+    private boolean check(RemoteTrustList trustList, long now) {
         log.info("fetching trust list from ${trustList.persona.getHumanReadableName()}")
         Endpoint endpoint = null
         try {
@@ -118,7 +120,7 @@ class TrustSubscriber {
 
             if (code != 200) {
                 log.info("couldn't fetch trust list, code $code")
-                return
+                return false
             }
 
             // swallow any headers
@@ -147,8 +149,10 @@ class TrustSubscriber {
             trustList.bad.clear()
             trustList.bad.addAll(bad)
 
+            return true
         } catch (Exception e) {
             log.log(Level.WARNING,"exception fetching trust list from ${trustList.persona.getHumanReadableName()}",e)
+            return false
         } finally {
             endpoint?.close()
         }

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

@@ -3,5 +3,5 @@ package com.muwire.core.update
 import net.i2p.data.Destination
 
 class UpdateServers {
-    static final Destination UPDATE_SERVER = new Destination("pSWieSRB3czCl3Zz4WpKp4Z8tjv-05zbogRDS7SEnKcSdWOupVwjzQ92GsgQh1VqgoSRk1F8dpZOnHxxz5HFy9D7ri0uFdkMyXdSKoB7IgkkvCfTAyEmeaPwSYnurF3Zk7u286E7YG2rZkQZgJ77tow7ZS0mxFB7Z0Ti-VkZ9~GeGePW~howwNm4iSQACZA0DyTpI8iv5j4I0itPCQRgaGziob~Vfvjk49nd8N4jtaDGo9cEcafikVzQ2OgBgYWL6LRbrrItwuGqsDvITUHWaElUYIDhRQYUq8gYiUA6rwAJputfhFU0J7lIxFR9vVY7YzRvcFckfr0DNI4VQVVlPnRPkUxQa--BlldMaCIppWugjgKLwqiSiHywKpSMlBWgY2z1ry4ueEBo1WEP-mEf88wRk4cFQBCKtctCQnIG2GsnATqTl-VGUAsuzeNWZiFSwXiTy~gQ094yWx-K06fFZUDt4CMiLZVhGlixiInD~34FCRC9LVMtFcqiFB2M-Ql2AAAA")
+    static final Destination UPDATE_SERVER = new Destination("VJYAiCPZHNLraWvLkeRLxRiT4PHAqNqRO1nH240r7u1noBw8Pa~-lJOhKR7CccPkEN8ejSi4H6XjqKYLC8BKLVLeOgnAbedUVx81MV7DETPDdPEGV4RVu6YDFri7-tJOeqauGHxtlXT44YWuR69xKrTG3u4~iTWgxKnlBDht9Q3aVpSPFD2KqEizfVxolqXI0zmAZ2xMi8jfl0oe4GbgHrD9hR2FYj6yKfdqcUgHVobY4kDdJt-u31QqwWdsQMEj8Y3tR2XcNaITEVPiAjoKgBrYwB4jddWPNaT4XdHz76d9p9Iqes7dhOKq3OKpk6kg-bfIKiEOiA1mY49fn5h8pNShTqV7QBhh4CE4EDT3Szl~WsLdrlHUKJufSi7erEMh3coF7HORpF1wah2Xw7q470t~b8dKGKi7N7xQsqhGruDm66PH9oE9Kt9WBVBq2zORdPRtRM61I7EnrwDlbOkL0y~XpvQ3JKUQKdBQ3QsOJt8CHlhHHXMMbvqhntR61RSDBQAEAAcAAA==")
 }

core/src/main/groovy/com/muwire/core/upload/ContentUploader.groovy

@@ -83,7 +83,7 @@ class ContentUploader extends Uploader {
         String xHave = DataUtil.encodeXHave(mesh.pieces.getDownloaded(), mesh.pieces.nPieces)
         endpoint.getOutputStream().write("X-Have: $xHave\r\n".getBytes(StandardCharsets.US_ASCII))
 
-        Set<Persona> sources = mesh.getRandom(3, toExclude)
+        Set<Persona> sources = mesh.getRandom(9, toExclude)
         if (!sources.isEmpty()) {
             String xAlts = sources.stream().map({ it.toBase64() }).collect(Collectors.joining(","))
             endpoint.getOutputStream().write("X-Alt: $xAlts\r\n".getBytes(StandardCharsets.US_ASCII))
@@ -119,4 +119,8 @@ class ContentUploader extends Uploader {
         return mesh.pieces.nPieces;
     }
 
+    @Override
+    public long getTotalSize() {
+        return file.length();
+    }
 }

core/src/main/groovy/com/muwire/core/upload/HashListUploader.groovy

@@ -61,5 +61,8 @@ class HashListUploader extends Uploader {
         return 1;
     }
 
-    
+    @Override
+    public long getTotalSize() {
+        return -1;
+    }
 }

core/src/main/groovy/com/muwire/core/upload/UploadManager.groovy

@@ -92,7 +92,7 @@ public class UploadManager {
                 pieceSize = downloader.pieceSizePow2
             } else {
                 SharedFile sharedFile = sharedFiles.iterator().next();
-                mesh = meshManager.getOrCreate(request.infoHash, sharedFile.NPieces)
+                mesh = meshManager.getOrCreate(request.infoHash, sharedFile.NPieces, false)
                 file = sharedFile.file
                 pieceSize = sharedFile.pieceSize
             }
@@ -217,7 +217,7 @@ public class UploadManager {
                 pieceSize = downloader.pieceSizePow2
             } else {
                 SharedFile sharedFile = sharedFiles.iterator().next();
-                mesh = meshManager.getOrCreate(request.infoHash, sharedFile.NPieces)
+                mesh = meshManager.getOrCreate(request.infoHash, sharedFile.NPieces, false)
                 file = sharedFile.file
                 pieceSize = sharedFile.pieceSize
             }

core/src/main/groovy/com/muwire/core/upload/Uploader.groovy

@@ -35,5 +35,7 @@ abstract class Uploader {
 
     abstract int getDonePieces();
 
-    abstract int getTotalPieces()
+    abstract int getTotalPieces();
+
+    abstract long getTotalSize();
 }

core/src/main/groovy/com/muwire/core/util/DataUtil.groovy

@@ -1,156 +0,0 @@
-package com.muwire.core.util
-
-import java.lang.reflect.Field
-import java.lang.reflect.Method
-import java.nio.ByteBuffer
-import java.nio.charset.StandardCharsets
-
-import com.muwire.core.Constants
-
-import net.i2p.data.Base64
-
-class DataUtil {
-	
-	private final static int MAX_SHORT = (0x1 << 16) - 1
-
-	static void writeUnsignedShort(int value, OutputStream os) {
-		if (value > MAX_SHORT || value < 0)
-			throw new IllegalArgumentException("$value invalid")
-		
-		byte lsb = (byte) (value & 0xFF)
-		byte msb = (byte) (value >> 8)
-		
-		os.write(msb)
-		os.write(lsb)	
-	}
-	
-	private final static int MAX_HEADER = 0x7FFFFF
-	
-	static void packHeader(int length, byte [] header) {
-		if (header.length != 3)
-			throw new IllegalArgumentException("header length $header.length")
-		if (length < 0 || length > MAX_HEADER)
-			throw new IllegalArgumentException("length $length")
-		
-		header[2] = (byte) (length & 0xFF)
-		header[1] = (byte) ((length >> 8) & 0xFF)
-		header[0] = (byte) ((length >> 16) & 0x7F)
-	}
-	
-	static int readLength(byte [] header) {
-		if (header.length != 3)
-			throw new IllegalArgumentException("header length $header.length")
-			
-		return (((int)(header[0] & 0x7F)) << 16) |
-				(((int)(header[1] & 0xFF) << 8)) |
-				((int)header[2] & 0xFF)
-	}
-    
-    static String readi18nString(byte [] encoded) {
-        if (encoded.length < 2)
-            throw new IllegalArgumentException("encoding too short $encoded.length")
-        int length = ((encoded[0] & 0xFF) << 8) | (encoded[1] & 0xFF)
-        if (encoded.length != length + 2)
-            throw new IllegalArgumentException("encoding doesn't match length, expected $length found $encoded.length")
-        byte [] string = new byte[length]
-        System.arraycopy(encoded, 2, string, 0, length)
-        new String(string, StandardCharsets.UTF_8) 
-    }
-    
-    static byte[] encodei18nString(String string) {
-        byte [] utf8 = string.getBytes(StandardCharsets.UTF_8)
-        if (utf8.length > Short.MAX_VALUE)
-            throw new IllegalArgumentException("String in utf8 too long $utf8.length")
-        def baos = new ByteArrayOutputStream()
-        def daos = new DataOutputStream(baos)
-        daos.writeShort((short) utf8.length)
-        daos.write(utf8) 
-        daos.close()
-        baos.toByteArray()
-    }
-    
-    public static String readTillRN(InputStream is) {
-        def baos = new ByteArrayOutputStream()
-        while(baos.size() < (Constants.MAX_HEADER_SIZE)) {
-            byte read = is.read()
-            if (read == -1)
-                throw new IOException()
-            if (read == '\r') {
-                if (is.read() != '\n')
-                    throw new IOException("invalid header")
-                break
-            }
-            baos.write(read)
-        }
-        new String(baos.toByteArray(), StandardCharsets.US_ASCII)
-    }
-    
-    public static String encodeXHave(List<Integer> pieces, int totalPieces) {
-        int bytes = totalPieces / 8
-        if (totalPieces % 8 != 0)
-            bytes++
-        byte[] raw = new byte[bytes]
-        pieces.each {
-            int byteIdx = it / 8
-            int offset = it % 8
-            int mask = 0x80 >>> offset
-            raw[byteIdx] |= mask
-        }
-        Base64.encode(raw)
-    }
-    
-    public static List<Integer> decodeXHave(String xHave) {
-        byte [] availablePieces = Base64.decode(xHave)
-        List<Integer> available = new ArrayList<>()
-        availablePieces.eachWithIndex {b, i ->
-            for (int j = 0; j < 8 ; j++) {
-                byte mask = 0x80 >>> j
-                if ((b & mask) == mask) {
-                    available.add(i * 8 + j)
-                }
-            }
-        }
-        available
-    }
-    
-    public static Exception findRoot(Exception e) {
-        while(e.getCause() != null)
-            e = e.getCause()
-        e
-    }
-    
-    public static void tryUnmap(ByteBuffer cb) {
-        if (cb==null || !cb.isDirect()) return;
-        // we could use this type cast and call functions without reflection code,
-        // but static import from sun.* package is risky for non-SUN virtual machine.
-        //try { ((sun.nio.ch.DirectBuffer)cb).cleaner().clean(); } catch (Exception ex) { }
-    
-        // JavaSpecVer: 1.6, 1.7, 1.8, 9, 10
-        boolean isOldJDK = System.getProperty("java.specification.version","99").startsWith("1.");
-        try {
-            if (isOldJDK) {
-                Method cleaner = cb.getClass().getMethod("cleaner");
-                cleaner.setAccessible(true);
-                Method clean = Class.forName("sun.misc.Cleaner").getMethod("clean");
-                clean.setAccessible(true);
-                clean.invoke(cleaner.invoke(cb));
-            } else {
-                Class unsafeClass;
-                try {
-                    unsafeClass = Class.forName("sun.misc.Unsafe");
-                } catch(Exception ex) {
-                    // jdk.internal.misc.Unsafe doesn't yet have an invokeCleaner() method,
-                    // but that method should be added if sun.misc.Unsafe is removed.
-                    unsafeClass = Class.forName("jdk.internal.misc.Unsafe");
-                }
-                Method clean = unsafeClass.getMethod("invokeCleaner", ByteBuffer.class);
-                clean.setAccessible(true);
-                Field theUnsafeField = unsafeClass.getDeclaredField("theUnsafe");
-                theUnsafeField.setAccessible(true);
-                Object theUnsafe = theUnsafeField.get(null);
-                clean.invoke(theUnsafe, cb);
-            }
-        } catch(Exception ex) { }
-        cb = null;
-    }
-}

core/src/main/java/com/muwire/core/Constants.java

@@ -0,0 +1,13 @@
+package com.muwire.core;
+
+import net.i2p.crypto.SigType;
+
+public class Constants {
+    public static final byte PERSONA_VERSION = (byte)1;
+    public static final SigType SIG_TYPE = SigType.EdDSA_SHA512_Ed25519;
+
+    public static final int MAX_HEADER_SIZE = 0x1 << 14;
+    public static final int MAX_HEADERS = 16;
+    
+    public static final int MAX_RESULTS = 0x1 << 16;
+}

core/src/main/java/com/muwire/core/DownloadedFile.java

@@ -8,16 +8,16 @@ import net.i2p.data.Destination;
 
 public class DownloadedFile extends SharedFile {
 
-	private final Set<Destination> sources;
+    private final Set<Destination> sources;
 
-	public DownloadedFile(File file, InfoHash infoHash, int pieceSize, Set<Destination> sources) 
+    public DownloadedFile(File file, InfoHash infoHash, int pieceSize, Set<Destination> sources)
-	throws IOException {
+    throws IOException {
-		super(file, infoHash, pieceSize);
+        super(file, infoHash, pieceSize);
-		this.sources = sources;
+        this.sources = sources;
-	}
+    }
 
-	public Set<Destination> getSources() {
+    public Set<Destination> getSources() {
-		return sources;
+        return sources;
-	}
+    }
 
 }

core/src/main/java/com/muwire/core/InfoHash.java

@@ -11,83 +11,83 @@ import net.i2p.data.Base64;
 
 public class InfoHash {
 
-	public static final int SIZE = 0x1 << 5;
+    public static final int SIZE = 0x1 << 5;
 
-	private final byte[] root;
+    private final byte[] root;
-	private final byte[] hashList;
+    private final byte[] hashList;
 
-	private final int hashCode;
+    private final int hashCode;
 
-	public InfoHash(byte[] root, byte[] hashList) {
+    public InfoHash(byte[] root, byte[] hashList) {
-		if (root.length != SIZE)
+        if (root.length != SIZE)
-			throw new IllegalArgumentException("invalid root size "+root.length);
+            throw new IllegalArgumentException("invalid root size "+root.length);
-		if (hashList != null && hashList.length % SIZE != 0) 
+        if (hashList != null && hashList.length % SIZE != 0)
-			throw new IllegalArgumentException("invalid hashList size " + hashList.length);
+            throw new IllegalArgumentException("invalid hashList size " + hashList.length);
-		this.root = root;
+        this.root = root;
-		this.hashList = hashList;
+        this.hashList = hashList;
-		hashCode = root[0] << 24 |
+        hashCode = root[0] << 24 |
-				root[1] << 16 |
+                root[1] << 16 |
-				root[2] << 8 |
+                root[2] << 8 |
-				root[3];
+                root[3];
-	}
+    }
 
-	public InfoHash(byte[] root) {
+    public InfoHash(byte[] root) {
-		this(root, null);
+        this(root, null);
-	}
+    }
 
-	public InfoHash(String base32) {
+    public InfoHash(String base32) {
-		this(Base32.decode(base32));
+        this(Base32.decode(base32));
-	}
+    }
 
-	public static InfoHash fromHashList(byte []hashList) {
+    public static InfoHash fromHashList(byte []hashList) {
-		try {
+        try {
-			MessageDigest sha256 = MessageDigest.getInstance("SHA-256");
+            MessageDigest sha256 = MessageDigest.getInstance("SHA-256");
-			byte[] root = sha256.digest(hashList);
+            byte[] root = sha256.digest(hashList);
-			return new InfoHash(root, hashList);
+            return new InfoHash(root, hashList);
-		} catch (NoSuchAlgorithmException impossible) {
+        } catch (NoSuchAlgorithmException impossible) {
-			impossible.printStackTrace();
+            impossible.printStackTrace();
-			System.exit(1);
+            System.exit(1);
-		}
+        }
-		return null;
+        return null;
-	}
+    }
 
-	public byte[] getRoot() {
+    public byte[] getRoot() {
-		return root;
+        return root;
-	}
+    }
 
-	public byte[] getHashList() {
+    public byte[] getHashList() {
-		return hashList;
+        return hashList;
-	}
+    }
 
-	@Override
+    @Override
-	public int hashCode() {
+    public int hashCode() {
-		return hashCode;
+        return hashCode;
-	}
+    }
 
-	@Override
+    @Override
-	public boolean equals(Object o) {
+    public boolean equals(Object o) {
-		if (this == o) {
+        if (this == o) {
-			return true;
+            return true;
-		}
+        }
-		if (!(o instanceof InfoHash)) {
+        if (!(o instanceof InfoHash)) {
-			return false;
+            return false;
-		}
+        }
-		InfoHash other = (InfoHash) o;
+        InfoHash other = (InfoHash) o;
-		return Arrays.equals(root, other.root);
+        return Arrays.equals(root, other.root);
-	}
+    }
 
-	public String toString() {
+    public String toString() {
-		String rv = "InfoHash[root:"+Base64.encode(root) + " hashList:";
+        String rv = "InfoHash[root:"+Base64.encode(root) + " hashList:";
-		List<String> b64HashList = new ArrayList<>();
+        List<String> b64HashList = new ArrayList<>();
-		if (hashList != null) {       
+        if (hashList != null) {
-		    byte [] tmp = new byte[SIZE];
+            byte [] tmp = new byte[SIZE];
-		    for (int i = 0; i < hashList.length / SIZE; i++) {
+            for (int i = 0; i < hashList.length / SIZE; i++) {
-		        System.arraycopy(hashList, SIZE * i, tmp, 0, SIZE);
+                System.arraycopy(hashList, SIZE * i, tmp, 0, SIZE);
-		        b64HashList.add(Base64.encode(tmp));
+                b64HashList.add(Base64.encode(tmp));
-		    }
+            }
-		}
+        }
-		rv += b64HashList.toString();
+        rv += b64HashList.toString();
-		rv += "]";
+        rv += "]";
-		return rv;
+        return rv;
-	}
+    }
 }

core/src/main/java/com/muwire/core/SharedFile.java

@@ -2,63 +2,105 @@ package com.muwire.core;
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.muwire.core.util.DataUtil;
+
+import net.i2p.data.Base64;
 
 public class SharedFile {
 
-	private final File file;
+    private final File file;
-	private final InfoHash infoHash;
+    private final InfoHash infoHash;
-	private final int pieceSize;
+    private final int pieceSize;
 
-	private final String cachedPath;
+    private final String cachedPath;
-	private final long cachedLength;
+    private final long cachedLength;
     
-	public SharedFile(File file, InfoHash infoHash, int pieceSize) throws IOException {
+    private final String b64EncodedFileName;
-		this.file = file;
+    private final String b64EncodedHashRoot;
-		this.infoHash = infoHash;
+    private final List<String> b64EncodedHashList;
-		this.pieceSize = pieceSize;
-		this.cachedPath = file.getAbsolutePath();
-		this.cachedLength = file.length();
-	}
     
-	public File getFile() {
+    private volatile String comment;
-		return file;
-	}
 
-	public InfoHash getInfoHash() {
+    public SharedFile(File file, InfoHash infoHash, int pieceSize) throws IOException {
-		return infoHash;
+        this.file = file;
-	}
+        this.infoHash = infoHash;
+        this.pieceSize = pieceSize;
+        this.cachedPath = file.getAbsolutePath();
+        this.cachedLength = file.length();
+        this.b64EncodedFileName = Base64.encode(DataUtil.encodei18nString(file.toString()));
+        this.b64EncodedHashRoot = Base64.encode(infoHash.getRoot());
         
-	public int getPieceSize() {
+        List<String> b64List = new ArrayList<String>();
-	    return pieceSize;
+        byte[] tmp = new byte[32];
-	}
+        for (int i = 0; i < infoHash.getHashList().length / 32; i++) {
+            System.arraycopy(infoHash.getHashList(), i * 32, tmp, 0, 32);
+            b64List.add(Base64.encode(tmp));
+        }
+        this.b64EncodedHashList = b64List;
+    }
 
-	public int getNPieces() {
+    public File getFile() {
-	    long length = file.length();
+        return file;
-	    int rawPieceSize = 0x1 << pieceSize;
+    }
-	    int rv = (int) (length / rawPieceSize);
-	    if (length % rawPieceSize != 0)
-	        rv++;
-	    return rv;
-	}
 
-	public String getCachedPath() {
+    public InfoHash getInfoHash() {
-	    return cachedPath;
+        return infoHash;
-	}
+    }
 
-	public long getCachedLength() {
+    public int getPieceSize() {
-	    return cachedLength;
+        return pieceSize;
-	}
+    }
 
-	@Override
+    public int getNPieces() {
-	public int hashCode() {
+        long length = file.length();
-	    return file.hashCode() ^ infoHash.hashCode();
+        int rawPieceSize = 0x1 << pieceSize;
-	}
+        int rv = (int) (length / rawPieceSize);
+        if (length % rawPieceSize != 0)
+            rv++;
+        return rv;
+    }
     
-	@Override
+    public String getB64EncodedFileName() {
-	public boolean equals(Object o) {
+        return b64EncodedFileName;
-	    if (!(o instanceof SharedFile))
+    }
-	        return false;
+    
-	    SharedFile other = (SharedFile)o;
+    public String getB64EncodedHashRoot() {
-	    return file.equals(other.file) && infoHash.equals(other.infoHash);
+        return b64EncodedHashRoot;
-	}
+    }
+    
+    public List<String> getB64EncodedHashList() {
+        return b64EncodedHashList;
+    }
+
+    public String getCachedPath() {
+        return cachedPath;
+    }
+
+    public long getCachedLength() {
+        return cachedLength;
+    }
+    
+    public void setComment(String comment) {
+        this.comment = comment;
+    }
+    
+    public String getComment() {
+        return comment;
+    }
+
+    @Override
+    public int hashCode() {
+        return file.hashCode() ^ infoHash.hashCode();
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (!(o instanceof SharedFile))
+            return false;
+        SharedFile other = (SharedFile)o;
+        return file.equals(other.file) && infoHash.equals(other.infoHash);
+    }
 }

core/src/main/java/com/muwire/core/connection/ConnectionAttemptStatus.java

@@ -1,5 +1,5 @@
 package com.muwire.core.connection;
 
 public enum ConnectionAttemptStatus {
-	SUCCESSFUL, REJECTED, FAILED
+    SUCCESSFUL, REJECTED, FAILED
 }

core/src/main/java/com/muwire/core/hostcache/CrawlerResponse.java

@@ -6,5 +6,5 @@ package com.muwire.core.hostcache;
  *
  */
 public enum CrawlerResponse {
-	ALL, REGISTERED, NONE
+    ALL, REGISTERED, NONE
 }

core/src/main/java/com/muwire/core/trust/TrustLevel.java

@@ -1,5 +1,5 @@
 package com.muwire.core.trust;
 
 public enum TrustLevel {
-	TRUSTED, NEUTRAL, DISTRUSTED
+    TRUSTED, NEUTRAL, DISTRUSTED
 }

core/src/main/java/com/muwire/core/util/DataUtil.java

@@ -0,0 +1,168 @@
+package com.muwire.core.util;
+
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.nio.ByteBuffer;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+
+import com.muwire.core.Constants;
+
+import net.i2p.data.Base64;
+
+public class DataUtil {
+
+    private final static int MAX_SHORT = (0x1 << 16) - 1;
+
+    static void writeUnsignedShort(int value, OutputStream os) throws IOException {
+        if (value > MAX_SHORT || value < 0)
+            throw new IllegalArgumentException("$value invalid");
+
+        byte lsb = (byte) (value & 0xFF);
+        byte msb = (byte) (value >> 8);
+
+        os.write(msb);
+        os.write(lsb);
+    }
+
+    private final static int MAX_HEADER = 0x7FFFFF;
+
+    static void packHeader(int length, byte [] header) {
+        if (header.length != 3)
+            throw new IllegalArgumentException("header length $header.length");
+        if (length < 0 || length > MAX_HEADER)
+            throw new IllegalArgumentException("length $length");
+
+        header[2] = (byte) (length & 0xFF);
+        header[1] = (byte) ((length >> 8) & 0xFF);
+        header[0] = (byte) ((length >> 16) & 0x7F);
+    }
+
+    static int readLength(byte [] header) {
+        if (header.length != 3)
+            throw new IllegalArgumentException("header length $header.length");
+
+        return (((int)(header[0] & 0x7F)) << 16) |
+                (((int)(header[1] & 0xFF) << 8)) |
+                ((int)header[2] & 0xFF);
+    }
+
+    static String readi18nString(byte [] encoded) {
+        if (encoded.length < 2)
+            throw new IllegalArgumentException("encoding too short $encoded.length");
+        int length = ((encoded[0] & 0xFF) << 8) | (encoded[1] & 0xFF);
+        if (encoded.length != length + 2)
+            throw new IllegalArgumentException("encoding doesn't match length, expected $length found $encoded.length");
+        byte [] string = new byte[length];
+        System.arraycopy(encoded, 2, string, 0, length);
+        return new String(string, StandardCharsets.UTF_8);
+    }
+
+    public static byte[] encodei18nString(String string) {
+        byte [] utf8 = string.getBytes(StandardCharsets.UTF_8);
+        if (utf8.length > Short.MAX_VALUE)
+            throw new IllegalArgumentException("String in utf8 too long $utf8.length");
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        DataOutputStream daos = new DataOutputStream(baos);
+        try {
+            daos.writeShort((short) utf8.length);
+            daos.write(utf8);
+            daos.close();
+        } catch (IOException impossible) {
+            throw new IllegalStateException(impossible);
+        }
+        return baos.toByteArray();
+    }
+
+    public static String readTillRN(InputStream is) throws IOException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        while(baos.size() < (Constants.MAX_HEADER_SIZE)) {
+            int read = is.read();
+            if (read == -1)
+                throw new IOException();
+            if (read == '\r') {
+                if (is.read() != '\n')
+                    throw new IOException("invalid header");
+                break;
+            }
+            baos.write(read);
+        }
+        return new String(baos.toByteArray(), StandardCharsets.US_ASCII);
+    }
+
+    public static String encodeXHave(List<Integer> pieces, int totalPieces) {
+        int bytes = totalPieces / 8;
+        if (totalPieces % 8 != 0)
+            bytes++;
+        byte[] raw = new byte[bytes];
+        for (int it : pieces) {
+            int byteIdx = it / 8;
+            int offset = it % 8;
+            int mask = 0x80 >>> offset;
+            raw[byteIdx] |= mask;
+        }
+        return Base64.encode(raw);
+    }
+
+    public static List<Integer> decodeXHave(String xHave) {
+        byte [] availablePieces = Base64.decode(xHave);
+        List<Integer> available = new ArrayList<>();
+        for (int i = 0; i < availablePieces.length; i ++) {
+            byte b = availablePieces[i];
+            for (int j = 0; j < 8 ; j++) {
+                byte mask = (byte) (0x80 >>> j);
+                if ((b & mask) == mask) {
+                    available.add(i * 8 + j);
+                }
+            }
+        }
+        return available;
+    }
+
+    public static Throwable findRoot(Throwable e) {
+        while(e.getCause() != null)
+            e = e.getCause();
+        return e;
+    }
+
+    public static void tryUnmap(ByteBuffer cb) {
+        if (cb==null || !cb.isDirect()) return;
+        // we could use this type cast and call functions without reflection code,
+        // but static import from sun.* package is risky for non-SUN virtual machine.
+        //try { ((sun.nio.ch.DirectBuffer)cb).cleaner().clean(); } catch (Exception ex) { }
+
+        // JavaSpecVer: 1.6, 1.7, 1.8, 9, 10
+        boolean isOldJDK = System.getProperty("java.specification.version","99").startsWith("1.");
+        try {
+            if (isOldJDK) {
+                Method cleaner = cb.getClass().getMethod("cleaner");
+                cleaner.setAccessible(true);
+                Method clean = Class.forName("sun.misc.Cleaner").getMethod("clean");
+                clean.setAccessible(true);
+                clean.invoke(cleaner.invoke(cb));
+            } else {
+                Class unsafeClass;
+                try {
+                    unsafeClass = Class.forName("sun.misc.Unsafe");
+                } catch(Exception ex) {
+                    // jdk.internal.misc.Unsafe doesn't yet have an invokeCleaner() method,
+                    // but that method should be added if sun.misc.Unsafe is removed.
+                    unsafeClass = Class.forName("jdk.internal.misc.Unsafe");
+                }
+                Method clean = unsafeClass.getMethod("invokeCleaner", ByteBuffer.class);
+                clean.setAccessible(true);
+                Field theUnsafeField = unsafeClass.getDeclaredField("theUnsafe");
+                theUnsafeField.setAccessible(true);
+                Object theUnsafe = theUnsafeField.get(null);
+                clean.invoke(theUnsafe, cb);
+            }
+        } catch(Exception ex) { }
+        cb = null;
+    }
+}

core/src/test/groovy/com/muwire/core/Destinations.groovy

@@ -4,6 +4,6 @@ import net.i2p.data.Destination
 
 class Destinations {
 
-	Destination dest1 = new Destination("KvwWPKMSAtzf7Yruj8TQaHi2jaQpSNsXJskbpmSBTxkcYlDB2GllH~QBu-cs4FSYdaRmKDUUx7793jjnYJgTMbrjqeIL5-BTORZ09n6PUfhSejDpJjdkUxaV1OHRatfYs70RNBv7rvdj1-nXUow5tMfOJtoWVocUoKefUGFQFbJLDDkBqjm1kFyKFZv6m6S6YqXxBgVB1qYicooy67cNQF5HLUFtP15pk5fMDNGz5eNCjPfC~2Gp8FF~OpSy92HT0XN7uAMJykPcbdnWfcvVwqD7eS0K4XEnsqnMPLEiMAhqsugEFiFqtB3Wmm7UHVc03lcAfRhr1e2uZBNFTtM2Uol4MD5sCCKRZVHGcH-WGPSEz0BM5YO~Xi~dQ~N3NVud32PVzhh8xoGcAlhTqMqAbRJndCv-H6NflX90pYmbirCTIDOaR9758mThrqX0d4CwCn4jFXer52l8Qe8CErGoLuB-4LL~Gwrn7R1k7ZQc2PthkqeW8MfigyiN7hZVkul9AAAA")
+    Destination dest1 = new Destination("KvwWPKMSAtzf7Yruj8TQaHi2jaQpSNsXJskbpmSBTxkcYlDB2GllH~QBu-cs4FSYdaRmKDUUx7793jjnYJgTMbrjqeIL5-BTORZ09n6PUfhSejDpJjdkUxaV1OHRatfYs70RNBv7rvdj1-nXUow5tMfOJtoWVocUoKefUGFQFbJLDDkBqjm1kFyKFZv6m6S6YqXxBgVB1qYicooy67cNQF5HLUFtP15pk5fMDNGz5eNCjPfC~2Gp8FF~OpSy92HT0XN7uAMJykPcbdnWfcvVwqD7eS0K4XEnsqnMPLEiMAhqsugEFiFqtB3Wmm7UHVc03lcAfRhr1e2uZBNFTtM2Uol4MD5sCCKRZVHGcH-WGPSEz0BM5YO~Xi~dQ~N3NVud32PVzhh8xoGcAlhTqMqAbRJndCv-H6NflX90pYmbirCTIDOaR9758mThrqX0d4CwCn4jFXer52l8Qe8CErGoLuB-4LL~Gwrn7R1k7ZQc2PthkqeW8MfigyiN7hZVkul9AAAA")
-	Destination dest2 = new Destination("KvwWPKMSAtzf7Yruj8TQaHi2jaQpSNsXJskbpmSBTxkcYlDB2GllH~QBu-cs4FSYdaRmKDUUx7793jjnYJgTMbrjqeIL5-BTORZ09n6PUfhSejDpJjdkUxaV1OHRatfYs70RNBv7rvdj1-nXUow5tMfOJtoWVocUoKefUGFQFbJLDDkBqjm1kFyKFZv6m6S6YqXxBgVB1qYicooy67cNQF5HLUFtP15pk5fMDNGz5eNCjPfC~2Gp8FF~OpSy92HT0XN7uAMJykPcbdnWfcvVwqD7eS0K4XEnsqnMPLEiMAhqsugEFiFqtB3Wmm7UHVc03lcAfRhr1e2uZBNFTtM2Uol4MD5sCCKRZVHGcH-WGPSEz0BM5YO~Xi~dQ~N3NVud32PVzhh8xoGcAlhTqMqAbRJndCv-H6NflX90pYmbirCTIDOaR9758mThrqX0d4CwCn4jFXer52l8Qe8CErGoLuB-4LL~Gwrn7R1k7ZQc2PthkqeW8MfigyiN7hZVkul8AAAA")
+    Destination dest2 = new Destination("KvwWPKMSAtzf7Yruj8TQaHi2jaQpSNsXJskbpmSBTxkcYlDB2GllH~QBu-cs4FSYdaRmKDUUx7793jjnYJgTMbrjqeIL5-BTORZ09n6PUfhSejDpJjdkUxaV1OHRatfYs70RNBv7rvdj1-nXUow5tMfOJtoWVocUoKefUGFQFbJLDDkBqjm1kFyKFZv6m6S6YqXxBgVB1qYicooy67cNQF5HLUFtP15pk5fMDNGz5eNCjPfC~2Gp8FF~OpSy92HT0XN7uAMJykPcbdnWfcvVwqD7eS0K4XEnsqnMPLEiMAhqsugEFiFqtB3Wmm7UHVc03lcAfRhr1e2uZBNFTtM2Uol4MD5sCCKRZVHGcH-WGPSEz0BM5YO~Xi~dQ~N3NVud32PVzhh8xoGcAlhTqMqAbRJndCv-H6NflX90pYmbirCTIDOaR9758mThrqX0d4CwCn4jFXer52l8Qe8CErGoLuB-4LL~Gwrn7R1k7ZQc2PthkqeW8MfigyiN7hZVkul8AAAA")
 }

core/src/test/groovy/com/muwire/core/EventBusTest.groovy

@@ -4,23 +4,23 @@ import org.junit.Test
 
 class EventBusTest {
 
-	class FakeEvent extends Event {}
+    class FakeEvent extends Event {}
 
-	class FakeEventHandler {
+    class FakeEventHandler {
-		def onFakeEvent(FakeEvent e) {
+        def onFakeEvent(FakeEvent e) {
-			assert e == fakeEvent
+            assert e == fakeEvent
-		}
+        }
-	}
+    }
 
-	FakeEvent fakeEvent = new FakeEvent()
+    FakeEvent fakeEvent = new FakeEvent()
 
-	EventBus bus = new EventBus()
+    EventBus bus = new EventBus()
-	def handler = new FakeEventHandler()
+    def handler = new FakeEventHandler()
 
-	@Test
+    @Test
-	void testDynamicEvent() {
+    void testDynamicEvent() {
-		bus.register(FakeEvent.class, handler)
+        bus.register(FakeEvent.class, handler)
-		bus.publish(fakeEvent)
+        bus.publish(fakeEvent)
-	}
+    }
 
 }

core/src/test/groovy/com/muwire/core/InfoHashTest.groovy

@@ -6,11 +6,11 @@ import org.junit.Test
 
 class InfoHashTest {
 
-	@Test
+    @Test
-	void testEmpty() {
+    void testEmpty() {
-		byte [] empty = new byte[0x1 << 6];
+        byte [] empty = new byte[0x1 << 6];
-		def ih = InfoHash.fromHashList(empty)
+        def ih = InfoHash.fromHashList(empty)
-		def ih2 = new InfoHash("6ws72qwrniqdaj4y55xngcmxtnbqapjdedm7b2hktay2sj2z7nfq");
+        def ih2 = new InfoHash("6ws72qwrniqdaj4y55xngcmxtnbqapjdedm7b2hktay2sj2z7nfq");
-		assertEquals(ih, ih2);
+        assertEquals(ih, ih2);
-	}
+    }
 }

core/src/test/groovy/com/muwire/core/connection/ConnectionAcceptorTest.groovy

@@ -22,21 +22,21 @@ import groovy.mock.interceptor.MockFor
 
 class ConnectionAcceptorTest {
 
-	EventBus eventBus
+    EventBus eventBus
-	final Destinations destinations = new Destinations()
+    final Destinations destinations = new Destinations()
-	def settings
+    def settings
 
-	def connectionManagerMock
+    def connectionManagerMock
-	UltrapeerConnectionManager connectionManager
+    UltrapeerConnectionManager connectionManager
 
-	def i2pAcceptorMock
+    def i2pAcceptorMock
-	I2PAcceptor i2pAcceptor
+    I2PAcceptor i2pAcceptor
 
-	def hostCacheMock
+    def hostCacheMock
-	HostCache hostCache
+    HostCache hostCache
 
-	def trustServiceMock
+    def trustServiceMock
-	TrustService trustService
+    TrustService trustService
 
     def searchManagerMock
     SearchManager searchManager
@@ -47,361 +47,361 @@ class ConnectionAcceptorTest {
     def connectionEstablisherMock
     ConnectionEstablisher connectionEstablisher
 
-	ConnectionAcceptor acceptor
+    ConnectionAcceptor acceptor
-	List<ConnectionEvent> connectionEvents
+    List<ConnectionEvent> connectionEvents
-	InputStream inputStream
+    InputStream inputStream
-	OutputStream outputStream
+    OutputStream outputStream
 
-	@Before
+    @Before
-	void before() {
+    void before() {
-		connectionManagerMock = new MockFor(UltrapeerConnectionManager.class)
+        connectionManagerMock = new MockFor(UltrapeerConnectionManager.class)
-		i2pAcceptorMock = new MockFor(I2PAcceptor.class)
+        i2pAcceptorMock = new MockFor(I2PAcceptor.class)
-		hostCacheMock = new MockFor(HostCache.class)
+        hostCacheMock = new MockFor(HostCache.class)
-		trustServiceMock = new MockFor(TrustService.class)
+        trustServiceMock = new MockFor(TrustService.class)
         searchManagerMock = new MockFor(SearchManager.class)
         uploadManagerMock = new MockFor(UploadManager.class)
         connectionEstablisherMock = new MockFor(ConnectionEstablisher.class)
-	}
+    }
 
-	@After
+    @After
-	void after() {
+    void after() {
-		acceptor?.stop()
+        acceptor?.stop()
-		connectionManagerMock.verify connectionManager
+        connectionManagerMock.verify connectionManager
-		i2pAcceptorMock.verify i2pAcceptor
+        i2pAcceptorMock.verify i2pAcceptor
-		hostCacheMock.verify hostCache
+        hostCacheMock.verify hostCache
-		trustServiceMock.verify trustService
+        trustServiceMock.verify trustService
         searchManagerMock.verify searchManager
         uploadManagerMock.verify uploadManager
         connectionEstablisherMock.verify connectionEstablisher
-		Thread.sleep(100)
+        Thread.sleep(100)
-	}
+    }
 
-	private void initMocks() {
+    private void initMocks() {
-		connectionEvents = new CopyOnWriteArrayList()
+        connectionEvents = new CopyOnWriteArrayList()
-		eventBus = new EventBus()
+        eventBus = new EventBus()
-		def listener = new Object() {
+        def listener = new Object() {
-			void onConnectionEvent(ConnectionEvent e) {
+            void onConnectionEvent(ConnectionEvent e) {
-				connectionEvents.add e
+                connectionEvents.add e
-			}
+            }
-		}
+        }
-		eventBus.register(ConnectionEvent.class, listener)
+        eventBus.register(ConnectionEvent.class, listener)
 
-		connectionManager = connectionManagerMock.proxyInstance()
+        connectionManager = connectionManagerMock.proxyInstance()
-		i2pAcceptor = i2pAcceptorMock.proxyInstance()
+        i2pAcceptor = i2pAcceptorMock.proxyInstance()
-		hostCache = hostCacheMock.proxyInstance()
+        hostCache = hostCacheMock.proxyInstance()
-		trustService = trustServiceMock.proxyInstance()
+        trustService = trustServiceMock.proxyInstance()
         searchManager = searchManagerMock.proxyInstance()
         uploadManager = uploadManagerMock.proxyInstance()
         connectionEstablisher = connectionEstablisherMock.proxyInstance()
 
-		acceptor = new ConnectionAcceptor(eventBus, connectionManager, settings, i2pAcceptor, 
+        acceptor = new ConnectionAcceptor(eventBus, connectionManager, settings, i2pAcceptor,
             hostCache, trustService, searchManager, uploadManager, connectionEstablisher)
-		acceptor.start()
+        acceptor.start()
-		Thread.sleep(100)
+        Thread.sleep(100)
-	}
+    }
 
-	@Test
+    @Test
-	void testSuccessfulLeaf() {
+    void testSuccessfulLeaf() {
-		settings = new MuWireSettings() {
+        settings = new MuWireSettings() {
-			boolean isLeaf() {
+            boolean isLeaf() {
-				false
+                false
-			}
+            }
-		}
+        }
-		i2pAcceptorMock.demand.accept {
+        i2pAcceptorMock.demand.accept {
-			def is = new PipedInputStream()
+            def is = new PipedInputStream()
-			outputStream = new PipedOutputStream(is)
+            outputStream = new PipedOutputStream(is)
-			def os = new PipedOutputStream()
+            def os = new PipedOutputStream()
-			inputStream = new PipedInputStream(os)
+            inputStream = new PipedInputStream(os)
-			new Endpoint(destinations.dest1, is, os, null)
+            new Endpoint(destinations.dest1, is, os, null)
-		}
+        }
-		i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
+        i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
         connectionEstablisherMock.demand.isInProgress(destinations.dest1) { false }
         connectionManagerMock.demand.isConnected { dest ->
             assert dest == destinations.dest1
             false
         }
         connectionManagerMock.demand.hasLeafSlots() { true }
-		trustServiceMock.demand.getLevel { dest ->
+        trustServiceMock.demand.getLevel { dest ->
-			assert dest == destinations.dest1
+            assert dest == destinations.dest1
-			TrustLevel.TRUSTED
+            TrustLevel.TRUSTED
-		}
+        }
 
-		initMocks()
+        initMocks()
 
-		outputStream.write("MuWire leaf".bytes)
+        outputStream.write("MuWire leaf".bytes)
-		byte [] OK = new byte[2]
+        byte [] OK = new byte[2]
-		def dis = new DataInputStream(inputStream)
+        def dis = new DataInputStream(inputStream)
-		dis.readFully(OK)
+        dis.readFully(OK)
-		assert OK == "OK".bytes
+        assert OK == "OK".bytes
 
-		Thread.sleep(50)
+        Thread.sleep(50)
-		assert connectionEvents.size() == 1
+        assert connectionEvents.size() == 1
-		def event = connectionEvents[0]
+        def event = connectionEvents[0]
-		assert event.endpoint.destination == destinations.dest1
+        assert event.endpoint.destination == destinations.dest1
-		assert event.status == ConnectionAttemptStatus.SUCCESSFUL
+        assert event.status == ConnectionAttemptStatus.SUCCESSFUL
-		assert event.incoming == true
+        assert event.incoming == true
-		assert event.leaf == true
+        assert event.leaf == true
-	}
+    }
 
-	@Test
+    @Test
-	void testSuccessfulPeer() {
+    void testSuccessfulPeer() {
-		settings = new MuWireSettings() {
+        settings = new MuWireSettings() {
-			boolean isLeaf() {
+            boolean isLeaf() {
-				false
+                false
-			}
+            }
-		}
+        }
-		i2pAcceptorMock.demand.accept {
+        i2pAcceptorMock.demand.accept {
-			def is = new PipedInputStream()
+            def is = new PipedInputStream()
-			outputStream = new PipedOutputStream(is)
+            outputStream = new PipedOutputStream(is)
-			def os = new PipedOutputStream()
+            def os = new PipedOutputStream()
-			inputStream = new PipedInputStream(os)
+            inputStream = new PipedInputStream(os)
-			new Endpoint(destinations.dest1, is, os, null)
+            new Endpoint(destinations.dest1, is, os, null)
-		}
+        }
-		i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
+        i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
         connectionEstablisherMock.demand.isInProgress(destinations.dest1) { false }
         connectionManagerMock.demand.isConnected { dest ->
             assert dest == destinations.dest1
             false
         }
         connectionManagerMock.demand.hasPeerSlots() { true }
-		trustServiceMock.demand.getLevel { dest ->
+        trustServiceMock.demand.getLevel { dest ->
-			assert dest == destinations.dest1
+            assert dest == destinations.dest1
-			TrustLevel.TRUSTED
+            TrustLevel.TRUSTED
-		}
+        }
 
-		initMocks()
+        initMocks()
 
-		outputStream.write("MuWire peer".bytes)
+        outputStream.write("MuWire peer".bytes)
-		byte [] OK = new byte[2]
+        byte [] OK = new byte[2]
-		def dis = new DataInputStream(inputStream)
+        def dis = new DataInputStream(inputStream)
-		dis.readFully(OK)
+        dis.readFully(OK)
-		assert OK == "OK".bytes
+        assert OK == "OK".bytes
 
-		Thread.sleep(50)
+        Thread.sleep(50)
-		assert connectionEvents.size() == 1
+        assert connectionEvents.size() == 1
-		def event = connectionEvents[0]
+        def event = connectionEvents[0]
-		assert event.endpoint.destination == destinations.dest1
+        assert event.endpoint.destination == destinations.dest1
-		assert event.status == ConnectionAttemptStatus.SUCCESSFUL
+        assert event.status == ConnectionAttemptStatus.SUCCESSFUL
-		assert event.incoming == true
+        assert event.incoming == true
-		assert event.leaf == false
+        assert event.leaf == false
-	}
+    }
 
-	@Test
+    @Test
-	void testLeafRejectsLeaf() {
+    void testLeafRejectsLeaf() {
-		settings = new MuWireSettings() {
+        settings = new MuWireSettings() {
-			boolean isLeaf() {
+            boolean isLeaf() {
-				true
+                true
-			}
+            }
-		}
+        }
-		i2pAcceptorMock.demand.accept {
+        i2pAcceptorMock.demand.accept {
-			def is = new PipedInputStream()
+            def is = new PipedInputStream()
-			outputStream = new PipedOutputStream(is)
+            outputStream = new PipedOutputStream(is)
-			def os = new PipedOutputStream()
+            def os = new PipedOutputStream()
-			inputStream = new PipedInputStream(os)
+            inputStream = new PipedInputStream(os)
-			new Endpoint(destinations.dest1, is, os, null)
+            new Endpoint(destinations.dest1, is, os, null)
-		}
+        }
-		i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
+        i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
-		trustServiceMock.demand.getLevel { dest ->
+        trustServiceMock.demand.getLevel { dest ->
-			assert dest == destinations.dest1
+            assert dest == destinations.dest1
-			TrustLevel.TRUSTED
+            TrustLevel.TRUSTED
-		}
+        }
 
-		initMocks()
+        initMocks()
 
-		outputStream.write("MuWire leaf".bytes)
+        outputStream.write("MuWire leaf".bytes)
-		outputStream.flush()
+        outputStream.flush()
-		Thread.sleep(50)
+        Thread.sleep(50)
-		assert inputStream.read() == -1
+        assert inputStream.read() == -1
 
-		Thread.sleep(50)
+        Thread.sleep(50)
-		assert connectionEvents.size() == 1
+        assert connectionEvents.size() == 1
-		def event = connectionEvents[0]
+        def event = connectionEvents[0]
-		assert event.endpoint.destination == destinations.dest1
+        assert event.endpoint.destination == destinations.dest1
-		assert event.status == ConnectionAttemptStatus.FAILED
+        assert event.status == ConnectionAttemptStatus.FAILED
-		assert event.incoming == true
+        assert event.incoming == true
-		assert event.leaf == null
+        assert event.leaf == null
-	}
+    }
 
-	@Test
+    @Test
-	void testLeafRejectsPeer() {
+    void testLeafRejectsPeer() {
-		settings = new MuWireSettings() {
+        settings = new MuWireSettings() {
-			boolean isLeaf() {
+            boolean isLeaf() {
-				true
+                true
-			}
+            }
-		}
+        }
-		i2pAcceptorMock.demand.accept {
+        i2pAcceptorMock.demand.accept {
-			def is = new PipedInputStream()
+            def is = new PipedInputStream()
-			outputStream = new PipedOutputStream(is)
+            outputStream = new PipedOutputStream(is)
-			def os = new PipedOutputStream()
+            def os = new PipedOutputStream()
-			inputStream = new PipedInputStream(os)
+            inputStream = new PipedInputStream(os)
-			new Endpoint(destinations.dest1, is, os, null)
+            new Endpoint(destinations.dest1, is, os, null)
-		}
+        }
-		i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
+        i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
-		trustServiceMock.demand.getLevel { dest ->
+        trustServiceMock.demand.getLevel { dest ->
-			assert dest == destinations.dest1
+            assert dest == destinations.dest1
-			TrustLevel.TRUSTED
+            TrustLevel.TRUSTED
-		}
+        }
 
-		initMocks()
+        initMocks()
 
-		outputStream.write("MuWire peer".bytes)
+        outputStream.write("MuWire peer".bytes)
-		outputStream.flush()
+        outputStream.flush()
-		Thread.sleep(50)
+        Thread.sleep(50)
-		assert inputStream.read() == -1
+        assert inputStream.read() == -1
 
-		Thread.sleep(50)
+        Thread.sleep(50)
-		assert connectionEvents.size() == 1
+        assert connectionEvents.size() == 1
-		def event = connectionEvents[0]
+        def event = connectionEvents[0]
-		assert event.endpoint.destination == destinations.dest1
+        assert event.endpoint.destination == destinations.dest1
-		assert event.status == ConnectionAttemptStatus.FAILED
+        assert event.status == ConnectionAttemptStatus.FAILED
-		assert event.incoming == true
+        assert event.incoming == true
-		assert event.leaf == null
+        assert event.leaf == null
-	}
+    }
 
-	@Test
+    @Test
-	void testPeerRejectsPeerSlots() {
+    void testPeerRejectsPeerSlots() {
-		settings = new MuWireSettings() {
+        settings = new MuWireSettings() {
-			boolean isLeaf() {
+            boolean isLeaf() {
-				false
+                false
-			}
+            }
-		}
+        }
-		i2pAcceptorMock.demand.accept {
+        i2pAcceptorMock.demand.accept {
-			def is = new PipedInputStream()
+            def is = new PipedInputStream()
-			outputStream = new PipedOutputStream(is)
+            outputStream = new PipedOutputStream(is)
-			def os = new PipedOutputStream()
+            def os = new PipedOutputStream()
-			inputStream = new PipedInputStream(os)
+            inputStream = new PipedInputStream(os)
-			new Endpoint(destinations.dest1, is, os, null)
+            new Endpoint(destinations.dest1, is, os, null)
-		}
+        }
-		i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
+        i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
         connectionEstablisherMock.demand.isInProgress(destinations.dest1) { false }
         connectionManagerMock.demand.isConnected { dest ->
             assert dest == destinations.dest1
             false
         }
         connectionManagerMock.demand.hasPeerSlots() { false }
-		trustServiceMock.demand.getLevel { dest ->
+        trustServiceMock.demand.getLevel { dest ->
-			assert dest == destinations.dest1
+            assert dest == destinations.dest1
-			TrustLevel.TRUSTED
+            TrustLevel.TRUSTED
-		}
+        }
-		hostCacheMock.ignore.getGoodHosts { n -> [] }
+        hostCacheMock.ignore.getGoodHosts { n -> [] }
 
-		initMocks()
+        initMocks()
 
-		outputStream.write("MuWire peer".bytes)
+        outputStream.write("MuWire peer".bytes)
-		byte [] OK = new byte[6]
+        byte [] OK = new byte[6]
-		def dis = new DataInputStream(inputStream)
+        def dis = new DataInputStream(inputStream)
-		dis.readFully(OK)
+        dis.readFully(OK)
-		assert OK == "REJECT".bytes
+        assert OK == "REJECT".bytes
 
-		Thread.sleep(50)
+        Thread.sleep(50)
-		assert dis.read() == -1
+        assert dis.read() == -1
 
-		Thread.sleep(50)
+        Thread.sleep(50)
-		assert connectionEvents.size() == 1
+        assert connectionEvents.size() == 1
-		def event = connectionEvents[0]
+        def event = connectionEvents[0]
-		assert event.endpoint.destination == destinations.dest1
+        assert event.endpoint.destination == destinations.dest1
-		assert event.status == ConnectionAttemptStatus.REJECTED
+        assert event.status == ConnectionAttemptStatus.REJECTED
-		assert event.incoming == true
+        assert event.incoming == true
-		assert event.leaf == false
+        assert event.leaf == false
-	}
+    }
 
-	@Test
+    @Test
-	void testPeerRejectsLeafSlots() {
+    void testPeerRejectsLeafSlots() {
-		settings = new MuWireSettings() {
+        settings = new MuWireSettings() {
-			boolean isLeaf() {
+            boolean isLeaf() {
-				false
+                false
-			}
+            }
-		}
+        }
-		i2pAcceptorMock.demand.accept {
+        i2pAcceptorMock.demand.accept {
-			def is = new PipedInputStream()
+            def is = new PipedInputStream()
-			outputStream = new PipedOutputStream(is)
+            outputStream = new PipedOutputStream(is)
-			def os = new PipedOutputStream()
+            def os = new PipedOutputStream()
-			inputStream = new PipedInputStream(os)
+            inputStream = new PipedInputStream(os)
-			new Endpoint(destinations.dest1, is, os, null)
+            new Endpoint(destinations.dest1, is, os, null)
-		}
+        }
-		i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
+        i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
         connectionEstablisherMock.demand.isInProgress(destinations.dest1) { false }
         connectionManagerMock.demand.isConnected { dest ->
             assert dest == destinations.dest1
             false
         }
         connectionManagerMock.demand.hasLeafSlots() { false }
-		trustServiceMock.demand.getLevel { dest ->
+        trustServiceMock.demand.getLevel { dest ->
-			assert dest == destinations.dest1
+            assert dest == destinations.dest1
-			TrustLevel.TRUSTED
+            TrustLevel.TRUSTED
-		}
+        }
-		hostCacheMock.ignore.getGoodHosts { n -> [] }
+        hostCacheMock.ignore.getGoodHosts { n -> [] }
 
-		initMocks()
+        initMocks()
 
-		outputStream.write("MuWire leaf".bytes)
+        outputStream.write("MuWire leaf".bytes)
-		byte [] OK = new byte[6]
+        byte [] OK = new byte[6]
-		def dis = new DataInputStream(inputStream)
+        def dis = new DataInputStream(inputStream)
-		dis.readFully(OK)
+        dis.readFully(OK)
-		assert OK == "REJECT".bytes
+        assert OK == "REJECT".bytes
 
-		Thread.sleep(50)
+        Thread.sleep(50)
-		assert dis.read() == -1
+        assert dis.read() == -1
 
-		Thread.sleep(50)
+        Thread.sleep(50)
-		assert connectionEvents.size() == 1
+        assert connectionEvents.size() == 1
-		def event = connectionEvents[0]
+        def event = connectionEvents[0]
-		assert event.endpoint.destination == destinations.dest1
+        assert event.endpoint.destination == destinations.dest1
-		assert event.status == ConnectionAttemptStatus.REJECTED
+        assert event.status == ConnectionAttemptStatus.REJECTED
-		assert event.incoming == true
+        assert event.incoming == true
-		assert event.leaf == true
+        assert event.leaf == true
-	}
+    }
 
-	@Test
+    @Test
-	void testPeerRejectsPeerSuggests() {
+    void testPeerRejectsPeerSuggests() {
-		settings = new MuWireSettings() {
+        settings = new MuWireSettings() {
-			boolean isLeaf() {
+            boolean isLeaf() {
-				false
+                false
-			}
+            }
-		}
+        }
-		i2pAcceptorMock.demand.accept {
+        i2pAcceptorMock.demand.accept {
-			def is = new PipedInputStream()
+            def is = new PipedInputStream()
-			outputStream = new PipedOutputStream(is)
+            outputStream = new PipedOutputStream(is)
-			def os = new PipedOutputStream()
+            def os = new PipedOutputStream()
-			inputStream = new PipedInputStream(os)
+            inputStream = new PipedInputStream(os)
-			new Endpoint(destinations.dest1, is, os, null)
+            new Endpoint(destinations.dest1, is, os, null)
-		}
+        }
-		i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
+        i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
         connectionEstablisherMock.demand.isInProgress(destinations.dest1) { false }
         connectionManagerMock.demand.isConnected { dest ->
             assert dest == destinations.dest1
             false
         }
         connectionManagerMock.demand.hasPeerSlots() { false }
-		trustServiceMock.demand.getLevel { dest ->
+        trustServiceMock.demand.getLevel { dest ->
-			assert dest == destinations.dest1
+            assert dest == destinations.dest1
-			TrustLevel.TRUSTED
+            TrustLevel.TRUSTED
-		}
+        }
-		hostCacheMock.ignore.getGoodHosts { n -> [destinations.dest2] }
+        hostCacheMock.ignore.getGoodHosts { n -> [destinations.dest2] }
 
-		initMocks()
+        initMocks()
 
-		outputStream.write("MuWire peer".bytes)
+        outputStream.write("MuWire peer".bytes)
-		byte [] OK = new byte[6]
+        byte [] OK = new byte[6]
-		def dis = new DataInputStream(inputStream)
+        def dis = new DataInputStream(inputStream)
-		dis.readFully(OK)
+        dis.readFully(OK)
-		assert OK == "REJECT".bytes
+        assert OK == "REJECT".bytes
 
-		short payloadSize = dis.readUnsignedShort()
+        short payloadSize = dis.readUnsignedShort()
-		byte[] payload = new byte[payloadSize]
+        byte[] payload = new byte[payloadSize]
-		dis.readFully(payload)
+        dis.readFully(payload)
-		assert dis.read() == -1
+        assert dis.read() == -1
 
-		def json = new JsonSlurper()
+        def json = new JsonSlurper()
-		json = json.parse(payload)
+        json = json.parse(payload)
-		assert json.tryHosts != null
+        assert json.tryHosts != null
-		assert json.tryHosts.size() == 1
+        assert json.tryHosts.size() == 1
-		assert json.tryHosts.contains(destinations.dest2.toBase64())
+        assert json.tryHosts.contains(destinations.dest2.toBase64())
 
-		Thread.sleep(50)
+        Thread.sleep(50)
-		assert connectionEvents.size() == 1
+        assert connectionEvents.size() == 1
-		def event = connectionEvents[0]
+        def event = connectionEvents[0]
-		assert event.endpoint.destination == destinations.dest1
+        assert event.endpoint.destination == destinations.dest1
-		assert event.status == ConnectionAttemptStatus.REJECTED
+        assert event.status == ConnectionAttemptStatus.REJECTED
-	}
+    }
 }

core/src/test/groovy/com/muwire/core/connection/ConnectionEstablisherTest.groovy

@@ -17,271 +17,271 @@ import groovy.mock.interceptor.MockFor
 
 class ConnectionEstablisherTest {
 
-	EventBus eventBus
+    EventBus eventBus
-	final Destinations destinations = new Destinations()
+    final Destinations destinations = new Destinations()
-	List<ConnectionEvent> connectionEvents
+    List<ConnectionEvent> connectionEvents
-	List<HostDiscoveredEvent> discoveredEvents
+    List<HostDiscoveredEvent> discoveredEvents
-	DataInputStream inputStream
+    DataInputStream inputStream
-	DataOutputStream outputStream
+    DataOutputStream outputStream
 
-	def i2pConnectorMock
+    def i2pConnectorMock
-	I2PConnector i2pConnector
+    I2PConnector i2pConnector
 
-	MuWireSettings settings
+    MuWireSettings settings
 
-	def connectionManagerMock
+    def connectionManagerMock
-	ConnectionManager connectionManager
+    ConnectionManager connectionManager
 
-	def hostCacheMock
+    def hostCacheMock
-	HostCache hostCache
+    HostCache hostCache
 
-	ConnectionEstablisher establisher
+    ConnectionEstablisher establisher
 
 
-	@Before
+    @Before
-	void before() {
+    void before() {
-		connectionEvents = new CopyOnWriteArrayList()
+        connectionEvents = new CopyOnWriteArrayList()
-		discoveredEvents = new CopyOnWriteArrayList()
+        discoveredEvents = new CopyOnWriteArrayList()
-		def listener = new Object() {
+        def listener = new Object() {
-			void onConnectionEvent(ConnectionEvent e) {
+            void onConnectionEvent(ConnectionEvent e) {
-				connectionEvents.add(e)
+                connectionEvents.add(e)
-			}
+            }
-			void onHostDiscoveredEvent(HostDiscoveredEvent e) {
+            void onHostDiscoveredEvent(HostDiscoveredEvent e) {
-				discoveredEvents.add e
+                discoveredEvents.add e
-			}
+            }
-		}
+        }
-		eventBus = new EventBus()
+        eventBus = new EventBus()
-		eventBus.register(ConnectionEvent.class, listener)
+        eventBus.register(ConnectionEvent.class, listener)
-		eventBus.register(HostDiscoveredEvent.class, listener)
+        eventBus.register(HostDiscoveredEvent.class, listener)
-		i2pConnectorMock = new MockFor(I2PConnector.class)
+        i2pConnectorMock = new MockFor(I2PConnector.class)
-		connectionManagerMock = new MockFor(ConnectionManager.class)
+        connectionManagerMock = new MockFor(ConnectionManager.class)
-		hostCacheMock = new MockFor(HostCache.class)
+        hostCacheMock = new MockFor(HostCache.class)
-	}
+    }
 
-	@After
+    @After
-	void after() {
+    void after() {
-		establisher?.stop()
+        establisher?.stop()
-		i2pConnectorMock.verify i2pConnector
+        i2pConnectorMock.verify i2pConnector
-		connectionManagerMock.verify connectionManager
+        connectionManagerMock.verify connectionManager
-		hostCacheMock.verify hostCache
+        hostCacheMock.verify hostCache
-		Thread.sleep(100)
+        Thread.sleep(100)
-	}
+    }
 
-	private void initMocks() {
+    private void initMocks() {
-		i2pConnector = i2pConnectorMock.proxyInstance()
+        i2pConnector = i2pConnectorMock.proxyInstance()
-		connectionManager = connectionManagerMock.proxyInstance()
+        connectionManager = connectionManagerMock.proxyInstance()
-		hostCache = hostCacheMock.proxyInstance()
+        hostCache = hostCacheMock.proxyInstance()
-		establisher = new ConnectionEstablisher(eventBus, i2pConnector, settings, connectionManager, hostCache)
+        establisher = new ConnectionEstablisher(eventBus, i2pConnector, settings, connectionManager, hostCache)
-		establisher.start()
+        establisher.start()
-		Thread.sleep(250)
+        Thread.sleep(250)
-	}
+    }
 
 
-	@Test
+    @Test
-	void testConnectFails() {
+    void testConnectFails() {
-		settings = new MuWireSettings()
+        settings = new MuWireSettings()
-		connectionManagerMock.ignore.needsConnections {
+        connectionManagerMock.ignore.needsConnections {
-			true 
+            true
-		}
+        }
-		hostCacheMock.ignore.getHosts { num ->
+        hostCacheMock.ignore.getHosts { num ->
-			assert num == 1
+            assert num == 1
-			[destinations.dest1]
+            [destinations.dest1]
-		}
+        }
-		connectionManagerMock.ignore.isConnected { dest ->
+        connectionManagerMock.ignore.isConnected { dest ->
-			assert dest == destinations.dest1
+            assert dest == destinations.dest1
-			false
+            false
-		}
+        }
-		i2pConnectorMock.demand.connect { dest ->
+        i2pConnectorMock.demand.connect { dest ->
-			assert dest == destinations.dest1
+            assert dest == destinations.dest1
-			throw new IOException()
+            throw new IOException()
-		}
+        }
 
-		initMocks()
+        initMocks()
 
-		assert connectionEvents.size() == 1
+        assert connectionEvents.size() == 1
-		def event = connectionEvents[0]
+        def event = connectionEvents[0]
-		assert event.endpoint.destination == destinations.dest1
+        assert event.endpoint.destination == destinations.dest1
-		assert event.incoming == false
+        assert event.incoming == false
-		assert event.status == ConnectionAttemptStatus.FAILED
+        assert event.status == ConnectionAttemptStatus.FAILED
-	}
+    }
 
-	@Test
+    @Test
-	void testConnectionSucceedsPeer() {
+    void testConnectionSucceedsPeer() {
-		settings = new MuWireSettings() {
+        settings = new MuWireSettings() {
-			boolean isLeaf() {false}
+            boolean isLeaf() {false}
-		}
+        }
-		connectionManagerMock.ignore.needsConnections {
+        connectionManagerMock.ignore.needsConnections {
-			true
+            true
-		}
+        }
-		hostCacheMock.ignore.getHosts { num ->
+        hostCacheMock.ignore.getHosts { num ->
-			assert num == 1
+            assert num == 1
-			[destinations.dest1]
+            [destinations.dest1]
-		}
+        }
-		connectionManagerMock.ignore.isConnected { dest ->
+        connectionManagerMock.ignore.isConnected { dest ->
-			assert dest == destinations.dest1
+            assert dest == destinations.dest1
-			false
+            false
-		}
+        }
-		i2pConnectorMock.demand.connect { dest ->
+        i2pConnectorMock.demand.connect { dest ->
-			PipedOutputStream os = new PipedOutputStream()
+            PipedOutputStream os = new PipedOutputStream()
-			inputStream = new DataInputStream(new PipedInputStream(os))
+            inputStream = new DataInputStream(new PipedInputStream(os))
-			PipedInputStream is = new PipedInputStream()
+            PipedInputStream is = new PipedInputStream()
-			outputStream = new DataOutputStream(new PipedOutputStream(is))
+            outputStream = new DataOutputStream(new PipedOutputStream(is))
-			new Endpoint(dest, is, os, null)
+            new Endpoint(dest, is, os, null)
-		}
+        }
 
-		initMocks()
+        initMocks()
 
-		byte [] header = new byte[11]
+        byte [] header = new byte[11]
-		inputStream.readFully(header)
+        inputStream.readFully(header)
-		assert header == "MuWire peer".bytes
+        assert header == "MuWire peer".bytes
 
-		outputStream.write("OK".bytes)
+        outputStream.write("OK".bytes)
-		outputStream.flush()
+        outputStream.flush()
 
-		Thread.sleep(100)
+        Thread.sleep(100)
 
-		assert connectionEvents.size() == 1
+        assert connectionEvents.size() == 1
-		def event = connectionEvents[0]
+        def event = connectionEvents[0]
-		assert event.endpoint.destination == destinations.dest1
+        assert event.endpoint.destination == destinations.dest1
-		assert event.incoming == false
+        assert event.incoming == false
-		assert event.status == ConnectionAttemptStatus.SUCCESSFUL
+        assert event.status == ConnectionAttemptStatus.SUCCESSFUL
 
-	}
+    }
 
-	@Test
+    @Test
-	void testConnectionSucceedsLeaf() {
+    void testConnectionSucceedsLeaf() {
-		settings = new MuWireSettings() {
+        settings = new MuWireSettings() {
-			boolean isLeaf() {true}
+            boolean isLeaf() {true}
-		}
+        }
-		connectionManagerMock.ignore.needsConnections {
+        connectionManagerMock.ignore.needsConnections {
-			true
+            true
-		}
+        }
-		hostCacheMock.ignore.getHosts { num ->
+        hostCacheMock.ignore.getHosts { num ->
-			assert num == 1
+            assert num == 1
-			[destinations.dest1]
+            [destinations.dest1]
-		}
+        }
-		connectionManagerMock.ignore.isConnected { dest ->
+        connectionManagerMock.ignore.isConnected { dest ->
-			assert dest == destinations.dest1
+            assert dest == destinations.dest1
-			false
+            false
-		}
+        }
-		i2pConnectorMock.demand.connect { dest ->
+        i2pConnectorMock.demand.connect { dest ->
-			PipedOutputStream os = new PipedOutputStream()
+            PipedOutputStream os = new PipedOutputStream()
-			inputStream = new DataInputStream(new PipedInputStream(os))
+            inputStream = new DataInputStream(new PipedInputStream(os))
-			PipedInputStream is = new PipedInputStream()
+            PipedInputStream is = new PipedInputStream()
-			outputStream = new DataOutputStream(new PipedOutputStream(is))
+            outputStream = new DataOutputStream(new PipedOutputStream(is))
-			new Endpoint(dest, is, os, null)
+            new Endpoint(dest, is, os, null)
-		}
+        }
 
-		initMocks()
+        initMocks()
 
-		byte [] header = new byte[11]
+        byte [] header = new byte[11]
-		inputStream.readFully(header)
+        inputStream.readFully(header)
-		assert header == "MuWire leaf".bytes
+        assert header == "MuWire leaf".bytes
 
-		outputStream.write("OK".bytes)
+        outputStream.write("OK".bytes)
-		outputStream.flush()
+        outputStream.flush()
 
-		Thread.sleep(100)
+        Thread.sleep(100)
 
-		assert connectionEvents.size() == 1
+        assert connectionEvents.size() == 1
-		def event = connectionEvents[0]
+        def event = connectionEvents[0]
-		assert event.endpoint.destination == destinations.dest1
+        assert event.endpoint.destination == destinations.dest1
-		assert event.incoming == false
+        assert event.incoming == false
-		assert event.status == ConnectionAttemptStatus.SUCCESSFUL
+        assert event.status == ConnectionAttemptStatus.SUCCESSFUL
-	}
+    }
 
-	@Test
+    @Test
-	void testConnectionRejected() {
+    void testConnectionRejected() {
-		settings = new MuWireSettings() {
+        settings = new MuWireSettings() {
-			boolean isLeaf() {false}
+            boolean isLeaf() {false}
-		}
+        }
-		connectionManagerMock.ignore.needsConnections {
+        connectionManagerMock.ignore.needsConnections {
-			true
+            true
-		}
+        }
-		hostCacheMock.ignore.getHosts { num ->
+        hostCacheMock.ignore.getHosts { num ->
-			assert num == 1
+            assert num == 1
-			[destinations.dest1]
+            [destinations.dest1]
-		}
+        }
-		connectionManagerMock.ignore.isConnected { dest ->
+        connectionManagerMock.ignore.isConnected { dest ->
-			assert dest == destinations.dest1
+            assert dest == destinations.dest1
-			false
+            false
-		}
+        }
-		i2pConnectorMock.demand.connect { dest ->
+        i2pConnectorMock.demand.connect { dest ->
-			PipedOutputStream os = new PipedOutputStream()
+            PipedOutputStream os = new PipedOutputStream()
-			inputStream = new DataInputStream(new PipedInputStream(os))
+            inputStream = new DataInputStream(new PipedInputStream(os))
-			PipedInputStream is = new PipedInputStream()
+            PipedInputStream is = new PipedInputStream()
-			outputStream = new DataOutputStream(new PipedOutputStream(is))
+            outputStream = new DataOutputStream(new PipedOutputStream(is))
-			new Endpoint(dest, is, os, null)
+            new Endpoint(dest, is, os, null)
-		}
+        }
 
-		initMocks()
+        initMocks()
 
-		byte [] header = new byte[11]
+        byte [] header = new byte[11]
-		inputStream.readFully(header)
+        inputStream.readFully(header)
-		assert header == "MuWire peer".bytes
+        assert header == "MuWire peer".bytes
 
-		outputStream.write("REJECT".bytes)
+        outputStream.write("REJECT".bytes)
-		outputStream.flush()
+        outputStream.flush()
 
-		Thread.sleep(100)
+        Thread.sleep(100)
 
-		assert connectionEvents.size() == 1
+        assert connectionEvents.size() == 1
-		def event = connectionEvents[0]
+        def event = connectionEvents[0]
-		assert event.endpoint.destination == destinations.dest1
+        assert event.endpoint.destination == destinations.dest1
-		assert event.incoming == false
+        assert event.incoming == false
-		assert event.status == ConnectionAttemptStatus.REJECTED
+        assert event.status == ConnectionAttemptStatus.REJECTED
-		assert discoveredEvents.isEmpty()
+        assert discoveredEvents.isEmpty()
-	}
+    }
 
-	@Test
+    @Test
-	void testConnectionRejectedSuggestions() {
+    void testConnectionRejectedSuggestions() {
-		settings = new MuWireSettings() {
+        settings = new MuWireSettings() {
-			boolean isLeaf() {false}
+            boolean isLeaf() {false}
-		}
+        }
-		connectionManagerMock.ignore.needsConnections {
+        connectionManagerMock.ignore.needsConnections {
-			true
+            true
-		}
+        }
-		hostCacheMock.ignore.getHosts { num ->
+        hostCacheMock.ignore.getHosts { num ->
-			assert num == 1
+            assert num == 1
-			[destinations.dest1]
+            [destinations.dest1]
-		}
+        }
-		connectionManagerMock.ignore.isConnected { dest ->
+        connectionManagerMock.ignore.isConnected { dest ->
-			assert dest == destinations.dest1
+            assert dest == destinations.dest1
-			false
+            false
-		}
+        }
-		i2pConnectorMock.demand.connect { dest ->
+        i2pConnectorMock.demand.connect { dest ->
-			PipedOutputStream os = new PipedOutputStream()
+            PipedOutputStream os = new PipedOutputStream()
-			inputStream = new DataInputStream(new PipedInputStream(os))
+            inputStream = new DataInputStream(new PipedInputStream(os))
-			PipedInputStream is = new PipedInputStream()
+            PipedInputStream is = new PipedInputStream()
-			outputStream = new DataOutputStream(new PipedOutputStream(is))
+            outputStream = new DataOutputStream(new PipedOutputStream(is))
-			new Endpoint(dest, is, os, null)
+            new Endpoint(dest, is, os, null)
-		}
+        }
 
-		initMocks()
+        initMocks()
 
-		byte [] header = new byte[11]
+        byte [] header = new byte[11]
-		inputStream.readFully(header)
+        inputStream.readFully(header)
-		assert header == "MuWire peer".bytes
+        assert header == "MuWire peer".bytes
 
-		outputStream.write("REJECT".bytes)
+        outputStream.write("REJECT".bytes)
-		outputStream.flush()
+        outputStream.flush()
 
-		def json = [:]
+        def json = [:]
-		json.tryHosts = [destinations.dest2.toBase64()]
+        json.tryHosts = [destinations.dest2.toBase64()]
-		json = JsonOutput.toJson(json)
+        json = JsonOutput.toJson(json)
-		outputStream.writeShort(json.bytes.length)
+        outputStream.writeShort(json.bytes.length)
-		outputStream.write(json.bytes)
+        outputStream.write(json.bytes)
-		outputStream.flush()
+        outputStream.flush()
-		Thread.sleep(100)
+        Thread.sleep(100)
 
-		assert connectionEvents.size() == 1
+        assert connectionEvents.size() == 1
-		def event = connectionEvents[0]
+        def event = connectionEvents[0]
-		assert event.endpoint.destination == destinations.dest1
+        assert event.endpoint.destination == destinations.dest1
-		assert event.incoming == false
+        assert event.incoming == false
-		assert event.status == ConnectionAttemptStatus.REJECTED
+        assert event.status == ConnectionAttemptStatus.REJECTED
 
-		assert discoveredEvents.size() == 1
+        assert discoveredEvents.size() == 1
-		event = discoveredEvents[0]
+        event = discoveredEvents[0]
-		assert event.destination == destinations.dest2
+        assert event.destination == destinations.dest2
-	}
+    }
 }

core/src/test/groovy/com/muwire/core/download/DownloadSessionTest.groovy

@@ -4,6 +4,7 @@ import static org.junit.Assert.fail
 
 import org.junit.After
 import org.junit.Before
+import org.junit.Ignore
 import org.junit.Test
 
 import com.muwire.core.EventBus
@@ -180,10 +181,11 @@ class DownloadSessionTest {
     }
 
     @Test
+    @Ignore // this needs to be rewritten with stealing in mind
     public void testSmallFileClaimed() {
         initSession(20, [0])
         long now = System.currentTimeMillis()
-        downloadThread.join(100)
+        downloadThread.join(150)
         assert 100 >= (System.currentTimeMillis() - now)
         assert !performed
         assert available.isEmpty()

core/src/test/groovy/com/muwire/core/download/PiecesTest.groovy

@@ -16,7 +16,7 @@ class PiecesTest {
     public void testSinglePiece() {
         pieces = new Pieces(1)
         assert !pieces.isComplete()
-        assert pieces.claim() == 0
+        assert pieces.claim() == [0,0,0]
         pieces.markDownloaded(0)
         assert pieces.isComplete()
     }
@@ -25,28 +25,28 @@ class PiecesTest {
     public void testTwoPieces() {
         pieces = new Pieces(2)
         assert !pieces.isComplete()
-        int piece = pieces.claim()
+        int[] piece = pieces.claim()
-        assert piece == 0 || piece == 1
+        assert piece[0] == 0 || piece[0] == 1
-        pieces.markDownloaded(piece)
+        pieces.markDownloaded(piece[0])
         assert !pieces.isComplete()
-        int piece2 = pieces.claim()
+        int[] piece2 = pieces.claim()
-        assert piece != piece2
+        assert piece[0] != piece2[0]
-        pieces.markDownloaded(piece2)
+        pieces.markDownloaded(piece2[0])
         assert pieces.isComplete()
     }
 
     @Test
     public void testClaimAvailable() {
         pieces = new Pieces(2)
-        int claimed = pieces.claim([0].toSet())
+        int[] claimed = pieces.claim([0].toSet())
-        assert claimed == 0
+        assert claimed == [0,0,0]
-        assert -1 == pieces.claim([0].toSet())
+        assert [0,0,1] == pieces.claim([0].toSet())
     }
 
     @Test
     public void testClaimNoneAvailable() {
         pieces = new Pieces(20)
-        int claimed = pieces.claim()
+        int[] claimed = pieces.claim()
-        assert -1 == pieces.claim([claimed].toSet())
+        assert [0,0,0] == pieces.claim(claimed.toSet())
     }
 }

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

@@ -8,76 +8,76 @@ import org.junit.Test
 
 class FileHasherTest extends GroovyTestCase {
 
-	def hasher = new FileHasher()
+    def hasher = new FileHasher()
-	File tmp
+    File tmp
 
-	@Before
+    @Before
-	void setUp() {
+    void setUp() {
-		tmp = File.createTempFile("testFile", "test")
+        tmp = File.createTempFile("testFile", "test")
-		tmp.deleteOnExit()
+        tmp.deleteOnExit()
-	}
+    }
 
-	@After
+    @After
-	void tearDown() {
+    void tearDown() {
-		tmp?.delete()
+        tmp?.delete()
-	}
+    }
 
-	@Test
+    @Test
-	void testPieceSize() {
+    void testPieceSize() {
-		assert 17 == FileHasher.getPieceSize(1000000)
+        assert 17 == FileHasher.getPieceSize(1000000)
-		assert 17 == FileHasher.getPieceSize(100000000)
+        assert 17 == FileHasher.getPieceSize(100000000)
-		assert 24 == FileHasher.getPieceSize(FileHasher.MAX_SIZE)
+        assert 24 == FileHasher.getPieceSize(FileHasher.MAX_SIZE)
-		shouldFail IllegalArgumentException, {
+        shouldFail IllegalArgumentException, {
-			FileHasher.getPieceSize(Long.MAX_VALUE)
+            FileHasher.getPieceSize(Long.MAX_VALUE)
-		}
+        }
-	}
+    }
 
-	@Test
+    @Test
-	void testHash1Byte() {
+    void testHash1Byte() {
-		def fos = new FileOutputStream(tmp)
+        def fos = new FileOutputStream(tmp)
-		fos.write(0)
+        fos.write(0)
-		fos.close()
+        fos.close()
-		def ih = hasher.hashFile(tmp)
+        def ih = hasher.hashFile(tmp)
-		assert ih.getHashList().length == 32
+        assert ih.getHashList().length == 32
-	}
+    }
 
-	@Test
+    @Test
-	void testHash1PieceExact() {
+    void testHash1PieceExact() {
-		def fos = new FileOutputStream(tmp)
+        def fos = new FileOutputStream(tmp)
-		byte [] b = new byte[ 0x1 << 18]
+        byte [] b = new byte[ 0x1 << 18]
-		fos.write b
+        fos.write b
-		fos.close()
+        fos.close()
-		def ih = hasher.hashFile tmp
+        def ih = hasher.hashFile tmp
-		assert ih.getHashList().length == 64
+        assert ih.getHashList().length == 64
-	}
+    }
 
-	@Test
+    @Test
-	void testHash1Piece1Byte() {
+    void testHash1Piece1Byte() {
-		def fos = new FileOutputStream(tmp)
+        def fos = new FileOutputStream(tmp)
-		byte [] b = new byte[ (0x1 << 18) + 1]
+        byte [] b = new byte[ (0x1 << 18) + 1]
-		fos.write b
+        fos.write b
-		fos.close()
+        fos.close()
-		def ih = hasher.hashFile tmp
+        def ih = hasher.hashFile tmp
-		assert ih.getHashList().length == 96
+        assert ih.getHashList().length == 96
-	}
+    }
 
-	@Test
+    @Test
-	void testHash2Pieces() {
+    void testHash2Pieces() {
-		def fos = new FileOutputStream(tmp)
+        def fos = new FileOutputStream(tmp)
-		byte [] b = new byte[ (0x1 << 19)]
+        byte [] b = new byte[ (0x1 << 19)]
-		fos.write b
+        fos.write b
-		fos.close()
+        fos.close()
-		def ih = hasher.hashFile tmp
+        def ih = hasher.hashFile tmp
-		assert ih.getHashList().length == 128
+        assert ih.getHashList().length == 128
-	}
+    }
 
-	@Test
+    @Test
-	void testHash2Pieces2Bytes() {
+    void testHash2Pieces2Bytes() {
-		def fos = new FileOutputStream(tmp)
+        def fos = new FileOutputStream(tmp)
-		byte [] b = new byte[ (0x1 << 19) + 2]
+        byte [] b = new byte[ (0x1 << 19) + 2]
-		fos.write b
+        fos.write b
-		fos.close()
+        fos.close()
-		def ih = hasher.hashFile tmp
+        def ih = hasher.hashFile tmp
-		assert ih.getHashList().length == 160
+        assert ih.getHashList().length == 160
-	}
+    }
 }

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

@@ -12,177 +12,177 @@ import com.muwire.core.search.SearchEvent
 
 class FileManagerTest {
 
-	EventBus eventBus
+    EventBus eventBus
 
-	FileManager manager
+    FileManager manager
-	volatile ResultsEvent results
+    volatile ResultsEvent results
 
-	def listener = new Object() {
+    def listener = new Object() {
-		void onResultsEvent(ResultsEvent e) {
+        void onResultsEvent(ResultsEvent e) {
-			results = e
+            results = e
-		}
+        }
-	}
+    }
 
-	@Before
+    @Before
-	void before() {
+    void before() {
-		eventBus = new EventBus()
+        eventBus = new EventBus()
-		eventBus.register(ResultsEvent.class, listener)
+        eventBus.register(ResultsEvent.class, listener)
-		manager = new FileManager(eventBus, new MuWireSettings())
+        manager = new FileManager(eventBus, new MuWireSettings())
-		results = null
+        results = null
-	}
+    }
 
-	@Test
+    @Test
-	void testHash1Result() {
+    void testHash1Result() {
-		File f = new File("a b.c")
+        File f = new File("a b.c")
-		InfoHash ih = InfoHash.fromHashList(new byte[32])
+        InfoHash ih = InfoHash.fromHashList(new byte[32])
-		SharedFile sf = new SharedFile(f,ih, 0)
+        SharedFile sf = new SharedFile(f,ih, 0)
-		FileHashedEvent fhe = new FileHashedEvent(sharedFile: sf)
+        FileHashedEvent fhe = new FileHashedEvent(sharedFile: sf)
-		manager.onFileHashedEvent(fhe)
+        manager.onFileHashedEvent(fhe)
 
-		UUID uuid = UUID.randomUUID()
+        UUID uuid = UUID.randomUUID()
-		SearchEvent se = new SearchEvent(searchHash: ih.getRoot(), uuid: uuid)
+        SearchEvent se = new SearchEvent(searchHash: ih.getRoot(), uuid: uuid)
 
-		manager.onSearchEvent(se)
+        manager.onSearchEvent(se)
-		Thread.sleep(20)
+        Thread.sleep(20)
 
-		assert results != null
+        assert results != null
-		assert results.results.size() == 1
+        assert results.results.size() == 1
-		assert results.results.contains(sf)
+        assert results.results.contains(sf)
-		assert results.uuid == uuid
+        assert results.uuid == uuid
-	}
+    }
 
-	@Test
+    @Test
-	void testHash2Results() {
+    void testHash2Results() {
-		InfoHash ih = InfoHash.fromHashList(new byte[32])
+        InfoHash ih = InfoHash.fromHashList(new byte[32])
-		SharedFile sf1 = new SharedFile(new File("a b.c"), ih, 0)
+        SharedFile sf1 = new SharedFile(new File("a b.c"), ih, 0)
-		SharedFile sf2 = new SharedFile(new File("d e.f"), ih, 0)
+        SharedFile sf2 = new SharedFile(new File("d e.f"), ih, 0)
-		manager.onFileLoadedEvent new FileLoadedEvent(loadedFile : sf1)
+        manager.onFileLoadedEvent new FileLoadedEvent(loadedFile : sf1)
-		manager.onFileLoadedEvent new FileLoadedEvent(loadedFile : sf2)
+        manager.onFileLoadedEvent new FileLoadedEvent(loadedFile : sf2)
 
-		UUID uuid = UUID.randomUUID()
+        UUID uuid = UUID.randomUUID()
-		SearchEvent se = new SearchEvent(searchHash: ih.getRoot(), uuid: uuid)
+        SearchEvent se = new SearchEvent(searchHash: ih.getRoot(), uuid: uuid)
 
-		manager.onSearchEvent(se)
+        manager.onSearchEvent(se)
-		Thread.sleep(20)
+        Thread.sleep(20)
 
-		assert results != null
+        assert results != null
-		assert results.results.size() == 2
+        assert results.results.size() == 2
-		assert results.results.contains(sf1)
+        assert results.results.contains(sf1)
-		assert results.results.contains(sf2)
+        assert results.results.contains(sf2)
-		assert results.uuid == uuid
+        assert results.uuid == uuid
-	}
+    }
 
-	@Test
+    @Test
-	void testHash0Results() {
+    void testHash0Results() {
-		File f = new File("a b.c")
+        File f = new File("a b.c")
-		InfoHash ih = InfoHash.fromHashList(new byte[32])
+        InfoHash ih = InfoHash.fromHashList(new byte[32])
-		SharedFile sf = new SharedFile(f,ih, 0)
+        SharedFile sf = new SharedFile(f,ih, 0)
-		FileHashedEvent fhe = new FileHashedEvent(sharedFile: sf)
+        FileHashedEvent fhe = new FileHashedEvent(sharedFile: sf)
-		manager.onFileHashedEvent(fhe)
+        manager.onFileHashedEvent(fhe)
 
-		manager.onSearchEvent new SearchEvent(searchHash: new byte[32], uuid: UUID.randomUUID())
+        manager.onSearchEvent new SearchEvent(searchHash: new byte[32], uuid: UUID.randomUUID())
-		Thread.sleep(20)
+        Thread.sleep(20)
 
-		assert results == null
+        assert results == null
-	}
+    }
 
-	@Test
+    @Test
-	void testKeyword1Result() {
+    void testKeyword1Result() {
-		File f = new File("a b.c")
+        File f = new File("a b.c")
-		InfoHash ih = InfoHash.fromHashList(new byte[32])
+        InfoHash ih = InfoHash.fromHashList(new byte[32])
-		SharedFile sf = new SharedFile(f,ih,0)
+        SharedFile sf = new SharedFile(f,ih,0)
-		FileHashedEvent fhe = new FileHashedEvent(sharedFile: sf)
+        FileHashedEvent fhe = new FileHashedEvent(sharedFile: sf)
-		manager.onFileHashedEvent(fhe)
+        manager.onFileHashedEvent(fhe)
 
-		UUID uuid = UUID.randomUUID()
+        UUID uuid = UUID.randomUUID()
-		manager.onSearchEvent new SearchEvent(searchTerms: ["a"], uuid:uuid)
+        manager.onSearchEvent new SearchEvent(searchTerms: ["a"], uuid:uuid)
-		Thread.sleep(20)
+        Thread.sleep(20)
 
-		assert results != null
+        assert results != null
-		assert results.results.size() == 1
+        assert results.results.size() == 1
-		assert results.results.contains(sf)
+        assert results.results.contains(sf)
-		assert results.uuid == uuid		
+        assert results.uuid == uuid
-	}
+    }
 
-	@Test
+    @Test
-	void testKeyword2Results() {
+    void testKeyword2Results() {
-		File f1 = new File("a b.c")
+        File f1 = new File("a b.c")
-		InfoHash ih1 = InfoHash.fromHashList(new byte[32])
+        InfoHash ih1 = InfoHash.fromHashList(new byte[32])
-		SharedFile sf1 = new SharedFile(f1, ih1, 0)
+        SharedFile sf1 = new SharedFile(f1, ih1, 0)
-		manager.onFileLoadedEvent new FileLoadedEvent(loadedFile: sf1)
+        manager.onFileLoadedEvent new FileLoadedEvent(loadedFile: sf1)
 
-		File f2 = new File("c d.e")
+        File f2 = new File("c d.e")
-		InfoHash ih2 = InfoHash.fromHashList(new byte[64])
+        InfoHash ih2 = InfoHash.fromHashList(new byte[64])
-		SharedFile sf2 = new SharedFile(f2, ih2, 0)
+        SharedFile sf2 = new SharedFile(f2, ih2, 0)
-		manager.onFileLoadedEvent new FileLoadedEvent(loadedFile: sf2)
+        manager.onFileLoadedEvent new FileLoadedEvent(loadedFile: sf2)
 
-		UUID uuid = UUID.randomUUID()
+        UUID uuid = UUID.randomUUID()
-		manager.onSearchEvent new SearchEvent(searchTerms: ["c"], uuid:uuid)
+        manager.onSearchEvent new SearchEvent(searchTerms: ["c"], uuid:uuid)
-		Thread.sleep(20)
+        Thread.sleep(20)
 
-		assert results != null
+        assert results != null
-		assert results.results.size() == 2
+        assert results.results.size() == 2
-		assert results.results.contains(sf1)
+        assert results.results.contains(sf1)
-		assert results.results.contains(sf2)
+        assert results.results.contains(sf2)
-		assert results.uuid == uuid
+        assert results.uuid == uuid
-	}
+    }
 
-	@Test
+    @Test
-	void testKeyword0Results() {
+    void testKeyword0Results() {
-		File f = new File("a b.c")
+        File f = new File("a b.c")
-		InfoHash ih = InfoHash.fromHashList(new byte[32])
+        InfoHash ih = InfoHash.fromHashList(new byte[32])
-		SharedFile sf = new SharedFile(f,ih,0)
+        SharedFile sf = new SharedFile(f,ih,0)
-		FileHashedEvent fhe = new FileHashedEvent(sharedFile: sf)
+        FileHashedEvent fhe = new FileHashedEvent(sharedFile: sf)
-		manager.onFileHashedEvent(fhe)
+        manager.onFileHashedEvent(fhe)
 
-		manager.onSearchEvent new SearchEvent(searchTerms: ["d"], uuid: UUID.randomUUID())
+        manager.onSearchEvent new SearchEvent(searchTerms: ["d"], uuid: UUID.randomUUID())
-		Thread.sleep(20)
+        Thread.sleep(20)
 
-		assert results == null
+        assert results == null
-	}
+    }
 
-	@Test
+    @Test
-	void testRemoveFileExistingHash() {
+    void testRemoveFileExistingHash() {
-		InfoHash ih = InfoHash.fromHashList(new byte[32])
+        InfoHash ih = InfoHash.fromHashList(new byte[32])
-		SharedFile sf1 = new SharedFile(new File("a b.c"), ih, 0)
+        SharedFile sf1 = new SharedFile(new File("a b.c"), ih, 0)
-		SharedFile sf2 = new SharedFile(new File("d e.f"), ih, 0)
+        SharedFile sf2 = new SharedFile(new File("d e.f"), ih, 0)
-		manager.onFileLoadedEvent new FileLoadedEvent(loadedFile : sf1)
+        manager.onFileLoadedEvent new FileLoadedEvent(loadedFile : sf1)
-		manager.onFileLoadedEvent new FileLoadedEvent(loadedFile : sf2)
+        manager.onFileLoadedEvent new FileLoadedEvent(loadedFile : sf2)
 
-		manager.onFileUnsharedEvent new FileUnsharedEvent(unsharedFile: sf2)
+        manager.onFileUnsharedEvent new FileUnsharedEvent(unsharedFile: sf2)
 
-		manager.onSearchEvent new SearchEvent(searchHash : ih.getRoot())
+        manager.onSearchEvent new SearchEvent(searchHash : ih.getRoot())
-		Thread.sleep(20)
+        Thread.sleep(20)
-		assert results != null
+        assert results != null
-		assert results.results.size() == 1
+        assert results.results.size() == 1
-		assert results.results.contains(sf1)
+        assert results.results.contains(sf1)
-	}
+    }
 
-	@Test
+    @Test
-	void testRemoveFile() {
+    void testRemoveFile() {
-		File f1 = new File("a b.c")
+        File f1 = new File("a b.c")
-		InfoHash ih1 = InfoHash.fromHashList(new byte[32])
+        InfoHash ih1 = InfoHash.fromHashList(new byte[32])
-		SharedFile sf1 = new SharedFile(f1, ih1, 0)
+        SharedFile sf1 = new SharedFile(f1, ih1, 0)
-		manager.onFileLoadedEvent new FileLoadedEvent(loadedFile: sf1)
+        manager.onFileLoadedEvent new FileLoadedEvent(loadedFile: sf1)
 
-		File f2 = new File("c d.e")
+        File f2 = new File("c d.e")
-		InfoHash ih2 = InfoHash.fromHashList(new byte[64])
+        InfoHash ih2 = InfoHash.fromHashList(new byte[64])
-		SharedFile sf2 = new SharedFile(f2, ih2, 0)
+        SharedFile sf2 = new SharedFile(f2, ih2, 0)
-		manager.onFileLoadedEvent new FileLoadedEvent(loadedFile: sf2)
+        manager.onFileLoadedEvent new FileLoadedEvent(loadedFile: sf2)
 
-		manager.onFileUnsharedEvent new FileUnsharedEvent(unsharedFile: sf2)
+        manager.onFileUnsharedEvent new FileUnsharedEvent(unsharedFile: sf2)
 
-		// 1 match left
+        // 1 match left
-		manager.onSearchEvent new SearchEvent(searchTerms: ["c"])
+        manager.onSearchEvent new SearchEvent(searchTerms: ["c"])
-		Thread.sleep(20)
+        Thread.sleep(20)
-		assert results != null
+        assert results != null
-		assert results.results.size() == 1
+        assert results.results.size() == 1
-		assert results.results.contains(sf1)
+        assert results.results.contains(sf1)
 
-		// no match
+        // no match
-		results = null
+        results = null
-		manager.onSearchEvent new SearchEvent(searchTerms: ["d"])
+        manager.onSearchEvent new SearchEvent(searchTerms: ["d"])
-		assert results == null
+        assert results == null
 
-	}
+    }
 }

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

@@ -12,54 +12,55 @@ import com.muwire.core.MuWireSettings
 
 class HasherServiceTest {
 
-	HasherService service
+    HasherService service
-	FileHasher hasher
+    FileHasher hasher
     EventBus eventBus
-	def listener = new ArrayBlockingQueue(100) {
+    def listener = new ArrayBlockingQueue(100) {
-		void onFileHashedEvent(FileHashedEvent evt) {
+        void onFileHashedEvent(FileHashedEvent evt) {
-			offer evt
+            offer evt
-		}
+        }
-	}
+    }
 
-	@Before
+    @Before
-	void before() {
+    void before() {
         eventBus = new EventBus()
-		hasher = new FileHasher()
+        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()
+        service.start()
-	}
+    }
 
-	@After
+    @After
-	void after() {
+    void after() {
-		listener.clear()
+        listener.clear()
-	}
+    }
 
-	@Test
+    @Test
-	void testSingleFile() {
+    void testSingleFile() {
-		File f = new File("build.gradle")
+        File f = new File("build.gradle")
-		service.onFileSharedEvent new FileSharedEvent(file: f)
+        service.onFileSharedEvent new FileSharedEvent(file: f)
-		Thread.sleep(100)
+        Thread.sleep(100)
-		def hashed = listener.poll()
+        def hashed = listener.poll()
-		assert hashed instanceof FileHashedEvent
+        assert hashed instanceof FileHashedEvent
-		assert hashed.sharedFile.file == f.getCanonicalFile()
+        assert hashed.sharedFile.file == f.getCanonicalFile()
-		assert hashed.sharedFile.infoHash != null
+        assert hashed.sharedFile.infoHash != null
-		assert listener.isEmpty()
+        assert listener.isEmpty()
-	}
+    }
 
-	@Test
+    @Test
-	void testDirectory() {
+    void testDirectory() {
-		File f = new File(".")
+        File f = new File(".")
-		service.onFileSharedEvent new FileSharedEvent(file: f)
+        service.onFileSharedEvent new FileSharedEvent(file: f)
-		Set<String> fileNames = new HashSet<>()
+        Set<String> fileNames = new HashSet<>()
-		while (true) {
+        while (true) {
-			def hashed = listener.poll(1000, TimeUnit.MILLISECONDS)
+            def hashed = listener.poll(1000, TimeUnit.MILLISECONDS)
-			if (hashed == null)
+            if (hashed == null)
-				break
+                break
-			fileNames.add(hashed.sharedFile?.file?.getName())
+            fileNames.add(hashed.sharedFile?.file?.getName())
-		}
+        }
-		assert fileNames.contains("build.gradle")
+        assert fileNames.contains("build.gradle")
-		assert fileNames.contains("HasherServiceTest.groovy")
+        assert fileNames.contains("HasherServiceTest.groovy")
-	}
+    }
 }