force UTF8 for json serialization

README.md

@@ -4,38 +4,30 @@ 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.15 is avaiable for download at https://muwire.com.  You can find technical documentation in the "doc" folder.
+The current stable release - 0.1.5 is avaiable for download at http://muwire.com.  You can find technical documentation in the "doc" folder.
 
 ### Building
 
-You need JDK 8 or newer.  After installing that and setting up the appropriate paths, just type
+You need JRE 8 or newer.  After installing that and setting up the appropriate paths, just type
 
 ```
-./gradlew clean assemble
+./gradlew assemble 
 ```
 
 If you want to run the unit tests, type
 ```
-./gradlew clean build
+./gradlew build
 ```
 
-If you want to build binary bundles that do not depend on Java or I2P, see the https://github.com/zlatinb/muwire-pkg project
+Some of the UI tests will fail because they haven't been written yet :-/
 
 ### Running
 
-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.
+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.post=<port>" in there.
 
-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
+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.
 
 
-[Default I2CP port]: https://geti2p.net/en/docs/ports
+### Known bugs and limitations
+
+* Many UI features you would expect are not there yet

TODO.md

@@ -4,6 +4,10 @@ Not in any particular order yet
 
 ### Big Items
 
+##### Alternate Locations
+
+This helps peers discover new sources for a file while the download is in progress.  Also makes sharing of partial files possible.
+
 ##### Bloom Filters
 
 This reduces query traffic by not sending last hop queries to peers that definitely do not have the file
@@ -12,15 +16,27 @@ 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
+
+##### Packaging With JRE, Embedded Router
+
+For ease of deployment for new users, and so that users do not need to run a separate I2P router
+
 ##### Web UI, REST Interface, etc.
 
 Basically any non-gui non-cli user interface
 
-##### Metadata editing and search
-
-To enable parsing of metadata from known file types and the user editing it or adding manual metadata
-
 ### Small Items
 
+* Detect if router is dead and show warning or exit
 * Wrapper of some kind for in-place upgrades
-* Automatic adjustment of number of I2P tunnels
+* Download file sequentially
+* Unsharing of files
+* Multiple-selection download, Ctrl-A
+* Automatic sharing of new files in shared directories (more like medium item)

build.gradle

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

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

@@ -4,7 +4,6 @@ import java.util.concurrent.CountDownLatch
 
 import com.muwire.core.Core
 import com.muwire.core.MuWireSettings
-import com.muwire.core.UILoadedEvent
 import com.muwire.core.connection.ConnectionAttemptStatus
 import com.muwire.core.connection.ConnectionEvent
 import com.muwire.core.connection.DisconnectionEvent
@@ -16,66 +15,66 @@ import com.muwire.core.upload.UploadEvent
 import com.muwire.core.upload.UploadFinishedEvent
 
 class Cli {
-
+    
     public static void main(String[] args) {
         def home = System.getProperty("user.home") + File.separator + ".MuWire"
         home = new File(home)
         if (!home.exists())
             home.mkdirs()
-
+        
         def propsFile = new File(home,"MuWire.properties")
         if (!propsFile.exists()) {
             println "create props file ${propsFile.getAbsoluteFile()} before launching MuWire"
             System.exit(1)
         }
-
+        
         def props = new Properties()
         propsFile.withInputStream { props.load(it) }
         props = new MuWireSettings(props)
-
-        Core core
+        
+        Core core 
         try {
-            core = new Core(props, home, "0.5.2")
+            core = new Core(props, home, "0.2.1")
         } catch (Exception bad) {
             bad.printStackTrace(System.out)
             println "Failed to initialize core, exiting"
             System.exit(1)
         }
 
-
-
-
+                
+        
+        
         def filesList
         if (args.length == 0) {
             println "Enter a file containing list of files to share"
             def reader = new BufferedReader(new InputStreamReader(System.in))
             filesList = reader.readLine()
-        } else
+        } else 
             filesList = args[0]
-
+        
         Thread.sleep(1000)
         println "loading shared files from $filesList"
-
+        
         // listener for shared files
         def sharedListener = new SharedListener()
         core.eventBus.register(FileHashedEvent.class, sharedListener)
         core.eventBus.register(FileLoadedEvent.class, sharedListener)
-
+        
         // for connections
         def connectionsListener = new ConnectionListener()
         core.eventBus.register(ConnectionEvent.class, connectionsListener)
         core.eventBus.register(DisconnectionEvent.class, connectionsListener)
-
+        
         // for uploads
         def uploadsListener = new UploadsListener()
         core.eventBus.register(UploadEvent.class, uploadsListener)
         core.eventBus.register(UploadFinishedEvent.class, uploadsListener)
-
+        
         Timer timer = new Timer("status-printer", true)
         timer.schedule({
-            println String.valueOf(new Date()) + " Connections $connectionsListener.connections Uploads $uploadsListener.uploads Shared $sharedListener.shared"
+            println "Connections $connectionsListener.connections Uploads $uploadsListener.uploads Shared $sharedListener.shared"
         } as TimerTask, 60000, 60000)
-
+        
         def latch = new CountDownLatch(1)
         def fileLoader = new Object() {
             public void onAllFilesLoadedEvent(AllFilesLoadedEvent e) {
@@ -84,15 +83,14 @@ class Cli {
         }
         core.eventBus.register(AllFilesLoadedEvent.class, fileLoader)
         core.startServices()
-
-        core.eventBus.publish(new UILoadedEvent())
+        
         println "waiting for files to load"
         latch.await()
         // now we begin
         println "MuWire is ready"
-
+        
         filesList = new File(filesList)
-        filesList.withReader {
+        filesList.withReader { 
             def toShare = it.readLine()
             core.eventBus.publish(new FileSharedEvent(file : new File(toShare)))
         }
@@ -103,7 +101,7 @@ class Cli {
         })
         Thread.sleep(Integer.MAX_VALUE)
     }
-
+    
     static class ConnectionListener {
         volatile int connections
         public void onConnectionEvent(ConnectionEvent e) {
@@ -114,19 +112,19 @@ class Cli {
             connections--
         }
     }
-
+    
     static class UploadsListener {
         volatile int uploads
         public void onUploadEvent(UploadEvent e) {
             uploads++
-            println String.valueOf(new Date()) + " Starting upload of ${e.uploader.file.getName()} to ${e.uploader.request.downloader.getHumanReadableName()}"
+            println "Starting upload of ${e.uploader.file.getName()} to ${e.uploader.request.downloader.getHumanReadableName()}"
         }
         public void onUploadFinishedEvent(UploadFinishedEvent e) {
             uploads--
-            println String.valueOf(new Date()) + " Finished upload of ${e.uploader.file.getName()} to ${e.uploader.request.downloader.getHumanReadableName()}"
+            println "Finished upload of ${e.uploader.file.getName()} to ${e.uploader.request.downloader.getHumanReadableName()}"
         }
     }
-
+    
     static class SharedListener {
         volatile int shared
         void onFileHashedEvent(FileHashedEvent e) {

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

@@ -17,31 +17,31 @@ import com.muwire.core.search.UIResultEvent
 import net.i2p.data.Base64
 
 class CliDownloader {
-
+    
     private static final List<Downloader> downloaders = Collections.synchronizedList(new ArrayList<>())
     private static final Map<UUID,ResultsHolder> resultsListeners = new ConcurrentHashMap<>()
-
+    
     public static void main(String []args) {
         def home = System.getProperty("user.home") + File.separator + ".MuWire"
         home = new File(home)
         if (!home.exists())
             home.mkdirs()
-
+        
         def propsFile = new File(home,"MuWire.properties")
         if (!propsFile.exists()) {
             println "create props file ${propsFile.getAbsoluteFile()} before launching MuWire"
             System.exit(1)
         }
-
+        
         def props = new Properties()
         propsFile.withInputStream { props.load(it) }
         props = new MuWireSettings(props)
-
+        
         def filesList
         int connections
         int resultWait
         if (args.length != 3) {
-            println "Enter a file containing list of hashes of files to download, " +
+            println "Enter a file containing list of hashes of files to download, " + 
                 "how many connections you want before searching" +
                 "and how long to wait for results to arrive"
                 System.exit(1)
@@ -53,24 +53,24 @@ class CliDownloader {
 
         Core core
         try {
-            core = new Core(props, home, "0.5.2")
+            core = new Core(props, home, "0.2.1")
         } catch (Exception bad) {
             bad.printStackTrace(System.out)
             println "Failed to initialize core, exiting"
             System.exit(1)
         }
-
-
+        
+        
         def latch = new CountDownLatch(connections)
         def connectionListener = new ConnectionWaiter(latch : latch)
         core.eventBus.register(ConnectionEvent.class, connectionListener)
-
+        
         core.startServices()
         println "starting to wait until there are $connections connections"
         latch.await()
-
+        
         println "connected, searching for files"
-
+        
         def file = new File(filesList)
         file.eachLine {
             String[] split = it.split(",")
@@ -79,22 +79,22 @@ class CliDownloader {
             def hash = Base64.decode(split[0])
             def searchEvent = new SearchEvent(searchHash : hash, uuid : uuid)
             core.eventBus.publish(new QueryEvent(searchEvent : searchEvent, firstHop:true,
-                replyTo: core.me.destination, receivedOn : core.me.destination, originator: core.me))
+                replyTo: core.me.destination, receivedOn : core.me.destination, originator: core.me)) 
         }
-
+        
         println "waiting for results to arrive"
         Thread.sleep(resultWait * 1000)
-
+        
         core.eventBus.register(DownloadStartedEvent.class, new DownloadListener())
         resultsListeners.each { uuid, resultsListener ->
             println "starting download of $resultsListener.fileName from ${resultsListener.getResults().size()} hosts"
             File target = new File(resultsListener.fileName)
-
+            
             core.eventBus.publish(new UIDownloadEvent(target : target, result : resultsListener.getResults()))
         }
-
+        
         Thread.sleep(1000)
-
+        
         Timer timer = new Timer("stats-printer")
         timer.schedule({
             println "==== STATUS UPDATE ==="
@@ -109,7 +109,7 @@ class CliDownloader {
             }
             println "==== END ==="
         } as TimerTask, 60000, 60000)
-
+        
         println "waiting for downloads to finish"
         while(true) {
             boolean allFinished = true
@@ -120,10 +120,10 @@ class CliDownloader {
                 break
             Thread.sleep(1000)
         }
-
+        
         println "all downloads finished"
     }
-
+    
     static class ResultsHolder {
         final List<UIResultEvent> results = Collections.synchronizedList(new ArrayList<>())
         String fileName
@@ -134,7 +134,7 @@ class CliDownloader {
             results
         }
     }
-
+    
     static class ResultsListener {
         UUID uuid
         String fileName
@@ -148,7 +148,7 @@ class CliDownloader {
             listener.add(e)
         }
     }
-
+    
     static class ConnectionWaiter {
         CountDownLatch latch
         public void onConnectionEvent(ConnectionEvent e) {
@@ -156,7 +156,7 @@ class CliDownloader {
                 latch.countDown()
         }
     }
-
+    
 
     static class DownloadListener {
         public void onDownloadStartedEvent(DownloadStartedEvent e) {

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

@@ -1,23 +0,0 @@
-package com.muwire.cli
-
-import com.muwire.core.util.DataUtil
-
-import groovy.json.JsonSlurper
-import net.i2p.data.Base64
-
-class FileList {
-    public static void main(String [] args) {
-        if (args.length < 1) {
-            println "pass files.json as argument"
-            System.exit(1)
-        }
-
-        def slurper = new JsonSlurper()
-        File filesJson = new File(args[0])
-        filesJson.eachLine {
-            def json = slurper.parseText(it)
-            String name = DataUtil.readi18nString(Base64.decode(json.file))
-            println "$name,$json.length,$json.pieceSize,$json.infoHash"
-        }
-    }
-}

core/build.gradle

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

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

@@ -0,0 +1,15 @@
+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 float DOWNLOAD_SEQUENTIAL_RATIO = 0.8f
+    
+    public static final String SPLIT_PATTERN = "[\\.,_-]"
+}

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

@@ -1,7 +1,6 @@
 package com.muwire.core
 
 import java.nio.charset.StandardCharsets
-import java.util.concurrent.atomic.AtomicBoolean
 
 import com.muwire.core.connection.ConnectionAcceptor
 import com.muwire.core.connection.ConnectionEstablisher
@@ -13,14 +12,10 @@ import com.muwire.core.connection.I2PConnector
 import com.muwire.core.connection.LeafConnectionManager
 import com.muwire.core.connection.UltrapeerConnectionManager
 import com.muwire.core.download.DownloadManager
-import com.muwire.core.download.SourceDiscoveredEvent
 import com.muwire.core.download.UIDownloadCancelledEvent
 import com.muwire.core.download.UIDownloadEvent
-import com.muwire.core.download.UIDownloadPausedEvent
-import com.muwire.core.download.UIDownloadResumedEvent
 import com.muwire.core.files.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
@@ -28,32 +23,19 @@ 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
 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
-import com.muwire.core.trust.TrustSubscriber
-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
@@ -62,7 +44,6 @@ import net.i2p.client.I2PSession
 import net.i2p.client.streaming.I2PSocketManager
 import net.i2p.client.streaming.I2PSocketManagerFactory
 import net.i2p.client.streaming.I2PSocketOptions
-import net.i2p.client.streaming.I2PSocketManager.DisconnectListener
 import net.i2p.crypto.DSAEngine
 import net.i2p.crypto.SigType
 import net.i2p.data.Destination
@@ -70,20 +51,16 @@ import net.i2p.data.PrivateKey
 import net.i2p.data.Signature
 import net.i2p.data.SigningPrivateKey
 
-import net.i2p.router.Router
-import net.i2p.router.RouterContext
-
 @Log
 public class Core {
-
+    
     final EventBus eventBus
     final Persona me
     final File home
     final Properties i2pOptions
     final MuWireSettings muOptions
-
+    
     private final TrustService trustService
-    private final TrustSubscriber trustSubscriber
     private final PersisterService persisterService
     private final HostCache hostCache
     private final ConnectionManager connectionManager
@@ -93,19 +70,24 @@ public class Core {
     private final ConnectionEstablisher connectionEstablisher
     private final HasherService hasherService
     private final DownloadManager downloadManager
-    private final DirectoryWatcher directoryWatcher
-    final FileManager fileManager
-    final UploadManager uploadManager
-    final ContentManager contentManager
-
-    private final Router router
-
-    final AtomicBoolean shutdown = new AtomicBoolean()
-
+        
     public Core(MuWireSettings props, File home, String myVersion) {
-        this.home = home
+        this.home = home		
         this.muOptions = props
-
+        log.info "Initializing I2P context"
+        I2PAppContext.getGlobalContext().logManager()
+        I2PAppContext.getGlobalContext()._logManager = new MuWireLogManager()
+        
+		log.info("initializing I2P socket manager")
+		def i2pClient = new I2PClientFactory().createClient()
+		File keyDat = new File(home, "key.dat")
+		if (!keyDat.exists()) {
+			log.info("Creating new key.dat")
+			keyDat.withOutputStream { 
+				i2pClient.createDestination(it, Constants.SIG_TYPE)
+			}
+		}
+		
         i2pOptions = new Properties()
         def i2pOptionsFile = new File(home,"i2p.properties")
         if (i2pOptionsFile.exists()) {
@@ -113,70 +95,29 @@ public class Core {
 
             if (!i2pOptions.containsKey("inbound.nickname"))
                 i2pOptions["inbound.nickname"] = "MuWire"
-                if (!i2pOptions.containsKey("outbound.nickname"))
-                    i2pOptions["outbound.nickname"] = "MuWire"
+            if (!i2pOptions.containsKey("outbound.nickname"))
+                i2pOptions["outbound.nickname"] = "MuWire"
         } else {
             i2pOptions["inbound.nickname"] = "MuWire"
             i2pOptions["outbound.nickname"] = "MuWire"
             i2pOptions["inbound.length"] = "3"
-            i2pOptions["inbound.quantity"] = "4"
+            i2pOptions["inbound.quantity"] = "2"
             i2pOptions["outbound.length"] = "3"
-            i2pOptions["outbound.quantity"] = "4"
+            i2pOptions["outbound.quantity"] = "2"
             i2pOptions["i2cp.tcp.host"] = "127.0.0.1"
             i2pOptions["i2cp.tcp.port"] = "7654"
-            Random r = new Random()
-            int port = r.nextInt(60000) + 4000
-            i2pOptions["i2np.ntcp.port"] = String.valueOf(port)
-            i2pOptions["i2np.udp.port"] = String.valueOf(port)
-            i2pOptionsFile.withOutputStream { i2pOptions.store(it, "") }
         }
-
-        if (!props.embeddedRouter) {
-            log.info "Initializing I2P context"
-            I2PAppContext.getGlobalContext().logManager()
-            I2PAppContext.getGlobalContext()._logManager = new MuWireLogManager()
-            router = null
-        } 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))
-            routerProps.setProperty("i2np.outboundKBytesPerSecond", String.valueOf(props.outBw))
-            routerProps.setProperty("i2cp.disableInterface", "true")
-            routerProps.setProperty("i2np.ntcp.port", i2pOptions["i2np.ntcp.port"])
-            routerProps.setProperty("i2np.udp.port", i2pOptions["i2np.udp.port"])
-            routerProps.setProperty("i2np.udp.internalPort", i2pOptions["i2np.udp.port"])
-            router = new Router(routerProps)
-            router.getContext().setLogManager(new MuWireLogManager())
-            router.runRouter()
-            while(!router.isRunning())
-                Thread.sleep(100)
-        }
-
-        log.info("initializing I2P socket manager")
-        def i2pClient = new I2PClientFactory().createClient()
-        File keyDat = new File(home, "key.dat")
-        if (!keyDat.exists()) {
-            log.info("Creating new key.dat")
-            keyDat.withOutputStream {
-                i2pClient.createDestination(it, Constants.SIG_TYPE)
-            }
-        }
-
-
+        
         // options like tunnel length and quantity
-        I2PSession i2pSession
-        I2PSocketManager socketManager
-        keyDat.withInputStream {
-            socketManager = new I2PSocketManagerFactory().createManager(it, i2pOptions["i2cp.tcp.host"], i2pOptions["i2cp.tcp.port"].toInteger(), i2pOptions)
-        }
-        socketManager.getDefaultOptions().setReadTimeout(60000)
-        socketManager.getDefaultOptions().setConnectTimeout(30000)
-        socketManager.addDisconnectListener({eventBus.publish(new RouterDisconnectedEvent())} as DisconnectListener)
-        i2pSession = socketManager.getSession()
-
+		I2PSession i2pSession
+		I2PSocketManager socketManager
+		keyDat.withInputStream {
+			socketManager = new I2PSocketManagerFactory().createManager(it, i2pOptions["i2cp.tcp.host"], i2pOptions["i2cp.tcp.port"].toInteger(), i2pOptions)
+		}
+		socketManager.getDefaultOptions().setReadTimeout(60000)
+		socketManager.getDefaultOptions().setConnectTimeout(30000)
+		i2pSession = socketManager.getSession()
+		
         def destination = new Destination()
         def spk = new SigningPrivateKey(Constants.SIG_TYPE)
         keyDat.withInputStream {
@@ -184,8 +125,8 @@ public class Core {
             def privateKey = new PrivateKey()
             privateKey.readBytes(it)
             spk.readBytes(it)
-        }
-
+		}
+            
         def baos = new ByteArrayOutputStream()
         def daos = new DataOutputStream(baos)
         daos.write(Constants.PERSONA_VERSION)
@@ -202,121 +143,87 @@ public class Core {
         me = new Persona(new ByteArrayInputStream(baos.toByteArray()))
         log.info("Loaded myself as "+me.getHumanReadableName())
 
-        eventBus = new EventBus()
-
-        log.info("initializing trust service")
-        File goodTrust = new File(home, "trusted")
-        File badTrust = new File(home, "distrusted")
-        trustService = new TrustService(goodTrust, badTrust, 5000)
-        eventBus.register(TrustEvent.class, trustService)
-
-
-        log.info "initializing file manager"
-        fileManager = new FileManager(eventBus, props)
-        eventBus.register(FileHashedEvent.class, fileManager)
-        eventBus.register(FileLoadedEvent.class, fileManager)
-        eventBus.register(FileDownloadedEvent.class, fileManager)
-        eventBus.register(FileUnsharedEvent.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"
-        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")
-        File hostStorage = new File(home, "hosts.json")
+		eventBus = new EventBus()
+		
+		log.info("initializing trust service")
+		File goodTrust = new File(home, "trusted")
+		File badTrust = new File(home, "distrusted")
+		trustService = new TrustService(goodTrust, badTrust, 5000)
+		eventBus.register(TrustEvent.class, trustService)
+		
+		
+		log.info "initializing file manager"
+		FileManager fileManager = new FileManager(eventBus, props)
+		eventBus.register(FileHashedEvent.class, fileManager)
+		eventBus.register(FileLoadedEvent.class, fileManager)
+		eventBus.register(FileDownloadedEvent.class, fileManager)
+		eventBus.register(FileUnsharedEvent.class, fileManager)
+		eventBus.register(SearchEvent.class, fileManager)
+		
+		log.info "initializing persistence service"
+		persisterService = new PersisterService(new File(home, "files.json"), eventBus, 15000, fileManager)
+        
+		log.info("initializing host cache")
+		File hostStorage = new File(home, "hosts.json")
         hostCache = new HostCache(trustService,hostStorage, 30000, props, i2pSession.getMyDestination())
-        eventBus.register(HostDiscoveredEvent.class, hostCache)
-        eventBus.register(ConnectionEvent.class, hostCache)
-
-        log.info("initializing connection manager")
-        connectionManager = props.isLeaf() ?
-            new LeafConnectionManager(eventBus, me, 3, hostCache, props) :
+		eventBus.register(HostDiscoveredEvent.class, hostCache)
+		eventBus.register(ConnectionEvent.class, hostCache)
+		
+		log.info("initializing connection manager")
+		connectionManager = props.isLeaf() ? 
+			new LeafConnectionManager(eventBus, me, 3, hostCache, props) : 
             new UltrapeerConnectionManager(eventBus, me, 512, 512, hostCache, trustService, props)
-        eventBus.register(TrustEvent.class, connectionManager)
-        eventBus.register(ConnectionEvent.class, connectionManager)
-        eventBus.register(DisconnectionEvent.class, connectionManager)
+		eventBus.register(TrustEvent.class, connectionManager)
+		eventBus.register(ConnectionEvent.class, connectionManager)
+		eventBus.register(DisconnectionEvent.class, connectionManager)
         eventBus.register(QueryEvent.class, connectionManager)
-
-        log.info("initializing cache client")
-        cacheClient = new CacheClient(eventBus,hostCache, connectionManager, i2pSession, props, 10000)
-
+		
+		log.info("initializing cache client")
+		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")
-        I2PConnector i2pConnector = new I2PConnector(socketManager)
-
-        log.info "initializing results sender"
-        ResultsSender resultsSender = new ResultsSender(eventBus, i2pConnector, me, props)
-
-        log.info "initializing search manager"
-        SearchManager searchManager = new SearchManager(eventBus, me, resultsSender)
-        eventBus.register(QueryEvent.class, searchManager)
-        eventBus.register(ResultsEvent.class, searchManager)
-
+        updateClient = new UpdateClient(eventBus, i2pSession, myVersion, props)
+        
+		log.info("initializing connector")
+		I2PConnector i2pConnector = new I2PConnector(socketManager)
+        
+		log.info "initializing results sender"
+		ResultsSender resultsSender = new ResultsSender(eventBus, i2pConnector, me)
+		
+		log.info "initializing search manager"
+		SearchManager searchManager = new SearchManager(eventBus, me, resultsSender)
+		eventBus.register(QueryEvent.class, searchManager)
+		eventBus.register(ResultsEvent.class, searchManager)
+		
         log.info("initializing download manager")
-        downloadManager = new DownloadManager(eventBus, trustService, meshManager, props, i2pConnector, home, me)
+        downloadManager = new DownloadManager(eventBus, i2pConnector, home, me)
         eventBus.register(UIDownloadEvent.class, downloadManager)
         eventBus.register(UILoadedEvent.class, downloadManager)
         eventBus.register(FileDownloadedEvent.class, downloadManager)
         eventBus.register(UIDownloadCancelledEvent.class, downloadManager)
-        eventBus.register(SourceDiscoveredEvent.class, downloadManager)
-        eventBus.register(UIDownloadPausedEvent.class, downloadManager)
-        eventBus.register(UIDownloadResumedEvent.class, downloadManager)
-
+        
         log.info("initializing upload manager")
-        uploadManager = new UploadManager(eventBus, fileManager, meshManager, downloadManager)
-
+        UploadManager uploadManager = new UploadManager(eventBus, fileManager)
+        
         log.info("initializing connection establisher")
         connectionEstablisher = new ConnectionEstablisher(eventBus, i2pConnector, props, connectionManager, hostCache)
-
-        log.info("initializing acceptor")
-        I2PAcceptor i2pAcceptor = new I2PAcceptor(socketManager)
-        connectionAcceptor = new ConnectionAcceptor(eventBus, connectionManager, props,
-            i2pAcceptor, hostCache, trustService, searchManager, uploadManager, fileManager, connectionEstablisher)
-
-        log.info("initializing directory watcher")
-        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 acceptor")
+		I2PAcceptor i2pAcceptor = new I2PAcceptor(socketManager)
+		connectionAcceptor = new ConnectionAcceptor(eventBus, connectionManager, props, 
+            i2pAcceptor, hostCache, trustService, searchManager, uploadManager, connectionEstablisher)
+		
+        
         log.info("initializing hasher service")
-        hasherService = new HasherService(new FileHasher(), eventBus, fileManager, props)
+        hasherService = new HasherService(new FileHasher(), eventBus, fileManager)
         eventBus.register(FileSharedEvent.class, hasherService)
-        eventBus.register(FileUnsharedEvent.class, hasherService)
-        eventBus.register(DirectoryUnsharedEvent.class, hasherService)
-
-        log.info("initializing trust subscriber")
-        trustSubscriber = new TrustSubscriber(eventBus, i2pConnector, props)
-        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()
         trustService.start()
         trustService.waitForLoad()
+        persisterService.start()
         hostCache.start()
         connectionManager.start()
         cacheClient.start()
@@ -325,30 +232,16 @@ public class Core {
         hostCache.waitForLoad()
         updateClient.start()
     }
-
+    
     public void shutdown() {
-        if (!shutdown.compareAndSet(false, true)) {
-            log.info("already shutting down")
-            return
-        }
-        log.info("shutting down trust subscriber")
-        trustSubscriber.stop()
         log.info("shutting down download manageer")
         downloadManager.shutdown()
         log.info("shutting down connection acceeptor")
         connectionAcceptor.stop()
         log.info("shutting down connection establisher")
         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) {
-            log.info("shutting down embedded router")
-            router.shutdown(0)
-        }
     }
 
     static main(args) {
@@ -358,7 +251,7 @@ public class Core {
             log.info("creating home dir")
             home.mkdir()
         }
-
+        
         def props = new Properties()
         def propsFile = new File(home, "MuWire.properties")
         if (propsFile.exists()) {
@@ -374,10 +267,10 @@ public class Core {
                 props.write(it)
             }
         }
-
-        Core core = new Core(props, home, "0.5.2")
+        
+        Core core = new Core(props, home, "0.2.1")
         core.startServices()
-
+        
         // ... at the end, sleep or execute script
         if (args.length == 0) {
             log.info("initialized everything, sleeping")

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();
-    final long seqNo
-    final long timestamp
-
-    Event() {
-        seqNo = SEQ_NO.getAndIncrement()
-        timestamp = System.currentTimeMillis()
-    }
-
-    @Override
-    public String toString() {
-        "seqNo $seqNo timestamp $timestamp"
-    }
+	private static final AtomicLong SEQ_NO = new AtomicLong();
+	final long seqNo
+	final long timestamp
+	
+	Event() {
+		seqNo = SEQ_NO.getAndIncrement()
+		timestamp = System.currentTimeMillis()
+	}
+	
+	@Override
+	public String toString() {
+		"seqNo $seqNo timestamp $timestamp"
+	}
 }

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

@@ -10,47 +10,42 @@ import com.muwire.core.files.FileSharedEvent
 import groovy.util.logging.Log
 @Log
 class EventBus {
+	
+	private Map handlers = new HashMap()
+	private final Executor executor = Executors.newSingleThreadExecutor {r ->
+		def rv = new Thread(r)
+		rv.setDaemon(true)
+		rv.setName("event-bus")
+		rv
+	}
 
-    private Map handlers = new HashMap()
-    private final Executor executor = Executors.newSingleThreadExecutor {r ->
-        def rv = new Thread(r)
-        rv.setDaemon(true)
-        rv.setName("event-bus")
-        rv
-    }
-
-    void publish(Event e) {
-        executor.execute({publishInternal(e)} as Runnable)
-    }
-
-    private void publishInternal(Event e) {
-        log.fine "publishing event $e of type ${e.getClass().getSimpleName()} event $e"
-        def currentHandlers
-        final def clazz = e.getClass()
-        synchronized(this) {
-            currentHandlers = handlers.getOrDefault(clazz, [])
-        }
-        currentHandlers.each {
+	void publish(Event e) {
+		executor.execute({publishInternal(e)} as Runnable)
+	}
+	
+	private void publishInternal(Event e) {
+		log.fine "publishing event $e of type ${e.getClass().getSimpleName()} event $e"
+		def currentHandlers
+		final def clazz = e.getClass()
+		synchronized(this) {
+			currentHandlers = handlers.getOrDefault(clazz, [])
+		}
+		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) {
-        log.info "Registering $handler for type $eventType"
-        def currentHandlers = handlers.get(eventType)
-        if (currentHandlers == null) {
-            currentHandlers = new CopyOnWriteArrayList()
-            handlers.put(eventType, currentHandlers)
-        }
-        currentHandlers.add handler
-    }
-    
-    synchronized void unregister(Class<? extends Event> eventType, def handler) {
-        log.info("Unregistering $handler for type $eventType")
-        handlers[eventType]?.remove(handler)
-    }
+		}
+	}
+	
+	synchronized void register(Class<? extends Event> eventType, def handler) {
+		log.info "Registering $handler for type $eventType"
+		def currentHandlers = handlers.get(eventType)
+		if (currentHandlers == null) {
+			currentHandlers = new CopyOnWriteArrayList()
+			handlers.put(eventType, currentHandlers)
+		}
+		currentHandlers.add handler
+	}
 }

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

@@ -13,5 +13,5 @@ class InvalidSignatureException extends Exception {
     public InvalidSignatureException(Throwable cause) {
         super(cause);
     }
-
+    
 }

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

@@ -1,174 +1,74 @@
 package com.muwire.core
 
-import java.util.stream.Collectors
-
 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
     int downloadRetryInterval
     int updateCheckInterval
-    boolean autoDownloadUpdate
-    String updateType
     String nickname
     File downloadLocation
-    File incompleteLocation
+    String sharedFiles
     CrawlerResponse crawlerResponse
     boolean shareDownloadedFiles
-    boolean shareHiddenFiles
-    boolean searchComments
-    boolean browseFiles
-    Set<String> watchedDirectories
-    float downloadSequentialRatio
-    int hostClearInterval, hostHopelessInterval, hostRejectInterval
-    int meshExpiration
-    int speedSmoothSeconds
-    boolean embeddedRouter
-    int inBw, outBw
-    Set<String> watchedKeywords
-    Set<String> watchedRegexes
-
-    MuWireSettings() {
+    boolean watchSharedDirectories
+    
+	MuWireSettings() {
         this(new Properties())
     }
-
-    MuWireSettings(Properties props) {
-        isLeaf = Boolean.valueOf(props.get("leaf","false"))
-        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"))
+	
+	MuWireSettings(Properties props) {
+		isLeaf = Boolean.valueOf(props.get("leaf","false"))
+		allowUntrusted = Boolean.valueOf(props.get("allowUntrusted","true"))
+		crawlerResponse = CrawlerResponse.valueOf(props.get("crawlerResponse","REGISTERED"))
         nickname = props.getProperty("nickname","MuWireUser")
-        downloadLocation = new File((String)props.getProperty("downloadLocation",
+        downloadLocation = new File((String)props.getProperty("downloadLocation", 
             System.getProperty("user.home")))
-        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")
+        sharedFiles = props.getProperty("sharedFiles")
+        downloadRetryInterval = Integer.parseInt(props.getProperty("downloadRetryInterval","15"))
+        updateCheckInterval = Integer.parseInt(props.getProperty("updateCheckInterval","36"))
         shareDownloadedFiles = Boolean.parseBoolean(props.getProperty("shareDownloadedFiles","true"))
-        shareHiddenFiles = Boolean.parseBoolean(props.getProperty("shareHiddenFiles","false"))
-        downloadSequentialRatio = Float.valueOf(props.getProperty("downloadSequentialRatio","0.8"))
-        hostClearInterval = Integer.valueOf(props.getProperty("hostClearInterval","15"))
-        hostHopelessInterval = Integer.valueOf(props.getProperty("hostHopelessInterval", "1440"))
-        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 = readEncodedSet(props, "watchedDirectories")
-        watchedKeywords = readEncodedSet(props, "watchedKeywords")
-        watchedRegexes = readEncodedSet(props, "watchedRegexes")
-
-        trustSubscriptions = new HashSet<>()
-        if (props.containsKey("trustSubscriptions")) {
-            props.getProperty("trustSubscriptions").split(",").each {
-                trustSubscriptions.add(new Persona(new ByteArrayInputStream(Base64.decode(it))))
-            }
-        }
-        
-        
-    }
-
+        watchSharedDirectories = Boolean.parseBoolean(props.getProperty("watchSharedDirectories","true"))
+	}
+    
     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",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))
-
-        writeEncodedSet(watchedDirectories, "watchedDirectories", props)
-        writeEncodedSet(watchedKeywords, "watchedKeywords", props)
-        writeEncodedSet(watchedRegexes, "watchedRegexes", props)
-
-        if (!trustSubscriptions.isEmpty()) {
-            String encoded = trustSubscriptions.stream().
-                map({it.toBase64()}).
-                collect(Collectors.joining(","))
-            props.setProperty("trustSubscriptions", encoded)
-        }
-
+        props.setProperty("watchSharedDirectories", String.valueOf(watchSharedDirectories))
+        if (sharedFiles != null)
+            props.setProperty("sharedFiles", sharedFiles)
         props.store(out, "")
     }
+
+	boolean isLeaf() {
+		isLeaf
+	}
+	
+	boolean allowUntrusted() {
+		allowUntrusted
+	} 
+	
+	void setAllowUntrusted(boolean allowUntrusted) {
+		this.allowUntrusted = allowUntrusted
+	}
+	
+	CrawlerResponse getCrawlerResponse() {
+		crawlerResponse
+	}
+	
+	void setCrawlerResponse(CrawlerResponse crawlerResponse) {
+		this.crawlerResponse = crawlerResponse
+	}
     
-    private static Set<String> readEncodedSet(Properties props, String property) {
-        Set<String> rv = new ConcurrentHashSet<>()
-        if (props.containsKey(property)) {
-            String[] encoded = props.getProperty(property).split(",")
-            encoded.each { rv << DataUtil.readi18nString(Base64.decode(it)) }
-        }
-        rv
-    }
-    
-    private static void writeEncodedSet(Set<String> set, String property, Properties props) {
-        if (set.isEmpty())
-            return
-        String encoded = set.stream().
-            map({Base64.encode(DataUtil.encodei18nString(it))}).
-            collect(Collectors.joining(","))
-        props.setProperty(property, encoded)
-    }
-
-    boolean isLeaf() {
-        isLeaf
-    }
-
-    boolean allowUntrusted() {
-        allowUntrusted
-    }
-
-    void setAllowUntrusted(boolean allowUntrusted) {
-        this.allowUntrusted = allowUntrusted
-    }
-
-    CrawlerResponse getCrawlerResponse() {
-        crawlerResponse
-    }
-
-    void setCrawlerResponse(CrawlerResponse crawlerResponse) {
-        this.crawlerResponse = crawlerResponse
-    }
-
     String getNickname() {
         nickname
     }

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

@@ -7,11 +7,11 @@ import java.nio.charset.StandardCharsets
  */
 public class Name {
     final String name
-
+    
     Name(String name) {
         this.name = name
     }
-
+    
     Name(InputStream nameStream) throws IOException {
         DataInputStream dis = new DataInputStream(nameStream)
         int length = dis.readUnsignedShort()
@@ -19,22 +19,22 @@ public class Name {
         dis.readFully(nameBytes)
         this.name = new String(nameBytes, StandardCharsets.UTF_8)
     }
-
+    
     public void write(OutputStream out) throws IOException {
         DataOutputStream dos = new DataOutputStream(out)
         dos.writeShort(name.length())
         dos.write(name.getBytes(StandardCharsets.UTF_8))
     }
-
+    
     public getName() {
         name
     }
-
+    
     @Override
     public int hashCode() {
         name.hashCode()
     }
-
+    
     @Override
     public boolean equals(Object o) {
         if (!(o instanceof Name))

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

@@ -9,7 +9,7 @@ import net.i2p.data.SigningPublicKey
 
 public class Persona {
     private static final int SIG_LEN = Constants.SIG_TYPE.getSigLen()
-
+    
     private final byte version
     private final Name name
     private final Destination destination
@@ -17,12 +17,12 @@ public class Persona {
     private volatile String humanReadableName
     private volatile String base64
     private volatile byte[] payload
-
+    
     public Persona(InputStream personaStream) throws IOException, InvalidSignatureException {
         version = (byte) (personaStream.read() & 0xFF)
         if (version != Constants.PERSONA_VERSION)
             throw new IOException("Unknown version "+version)
-
+            
         name = new Name(personaStream)
         destination = Destination.create(personaStream)
         sig = new byte[SIG_LEN]
@@ -31,7 +31,7 @@ public class Persona {
         if (!verify(version, name, destination, sig))
             throw new InvalidSignatureException(getHumanReadableName() + " didn't verify")
     }
-
+    
     private static boolean verify(byte version, Name name, Destination destination, byte [] sig) {
         ByteArrayOutputStream baos = new ByteArrayOutputStream()
         baos.write(version)
@@ -42,7 +42,7 @@ public class Persona {
         Signature signature = new Signature(Constants.SIG_TYPE, sig)
         DSAEngine.getInstance().verifySignature(signature, payload, spk)
     }
-
+    
     public void write(OutputStream out) throws IOException {
         if (payload == null) {
             ByteArrayOutputStream baos = new ByteArrayOutputStream()
@@ -54,13 +54,13 @@ public class Persona {
         }
         out.write(payload)
     }
-
+    
     public String getHumanReadableName() {
-        if (humanReadableName == null)
+        if (humanReadableName == null) 
             humanReadableName = name.getName() + "@" + destination.toBase32().substring(0,32)
         humanReadableName
     }
-
+    
     public String toBase64() {
         if (base64 == null) {
             def baos = new ByteArrayOutputStream()
@@ -69,12 +69,12 @@ public class Persona {
         }
         base64
     }
-
+    
     @Override
     public int hashCode() {
         name.hashCode() ^ destination.hashCode()
     }
-
+    
     @Override
     public boolean equals(Object o) {
         if (!(o instanceof Persona))
@@ -82,13 +82,4 @@ public class Persona {
         Persona other = (Persona)o
         name.equals(other.name) && destination.equals(other.destination)
     }
-
-    public static void main(String []args) {
-        if (args.length != 1) {
-            println "This utility decodes a bas64-encoded persona"
-            System.exit(1)
-        }
-        Persona p = new Persona(new ByteArrayInputStream(Base64.decode(args[0])))
-        println p.getHumanReadableName()
-    }
 }

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

@@ -1,4 +0,0 @@
-package com.muwire.core
-
-class RouterDisconnectedEvent extends Event {
-}

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

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

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

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

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

@@ -22,108 +22,104 @@ import net.i2p.data.Destination
 @Log
 abstract class Connection implements Closeable {
 
-    private static final int SEARCHES = 10
-    private static final long INTERVAL = 1000
-
-    final EventBus eventBus
-    final Endpoint endpoint
-    final boolean incoming
-    final HostCache hostCache
+	final EventBus eventBus
+	final Endpoint endpoint
+	final boolean incoming
+	final HostCache hostCache
     final TrustService trustService
     final MuWireSettings settings
-
-    private final AtomicBoolean running = new AtomicBoolean()
-    private final BlockingQueue messages = new LinkedBlockingQueue()
-    private final Thread reader, writer
-    private final LinkedList<Long> searchTimestamps = new LinkedList<>()
-
-    protected final String name
-
-    long lastPingSentTime, lastPongReceivedTime
-
-    Connection(EventBus eventBus, Endpoint endpoint, boolean incoming,
+    	
+	private final AtomicBoolean running = new AtomicBoolean()
+	private final BlockingQueue messages = new LinkedBlockingQueue()
+	private final Thread reader, writer
+	
+	protected final String name
+	
+	long lastPingSentTime, lastPongReceivedTime
+	
+	Connection(EventBus eventBus, Endpoint endpoint, boolean incoming, 
         HostCache hostCache, TrustService trustService, MuWireSettings settings) {
-        this.eventBus = eventBus
-        this.incoming = incoming
-        this.endpoint = endpoint
-        this.hostCache = hostCache
+		this.eventBus = eventBus
+		this.incoming = incoming
+		this.endpoint = endpoint
+		this.hostCache = hostCache
         this.trustService = trustService
         this.settings = settings
-
-        this.name = endpoint.destination.toBase32().substring(0,8)
-
-        this.reader = new Thread({readLoop()} as Runnable)
-        this.reader.setName("reader-$name")
-        this.reader.setDaemon(true)
-
-        this.writer = new Thread({writeLoop()} as Runnable)
-        this.writer.setName("writer-$name")
-        this.writer.setDaemon(true)
-    }
-
-    /**
-     * starts the connection threads
-     */
-    void start() {
-        if (!running.compareAndSet(false, true)) {
-            log.log(Level.WARNING,"$name already running", new Exception())
-            return
-        }
-        reader.start()
-        writer.start()
-    }
-
-    @Override
-    public void close() {
-        if (!running.compareAndSet(true, false)) {
-            log.log(Level.WARNING, "$name already closed", new Exception() )
-            return
-        }
+		
+		this.name = endpoint.destination.toBase32().substring(0,8)
+		
+		this.reader = new Thread({readLoop()} as Runnable)
+		this.reader.setName("reader-$name")
+		this.reader.setDaemon(true)
+		
+		this.writer = new Thread({writeLoop()} as Runnable)
+		this.writer.setName("writer-$name")
+		this.writer.setDaemon(true)
+	}
+	
+	/**
+	 * starts the connection threads
+	 */
+	void start() {
+		if (!running.compareAndSet(false, true)) {
+			log.log(Level.WARNING,"$name already running", new Exception())
+			return
+		}
+		reader.start()
+		writer.start()
+	}
+	
+	@Override
+	public void close() {
+		if (!running.compareAndSet(true, false)) {
+			log.log(Level.WARNING, "$name already closed", new Exception() )
+			return
+		}
         log.info("closing $name")
-        reader.interrupt()
-        writer.interrupt()
-        endpoint.close()
-        eventBus.publish(new DisconnectionEvent(destination: endpoint.destination))
-    }
-
-    protected void readLoop() {
-        try {
-            while(running.get()) {
-                read()
-            }
-        } catch (SocketTimeoutException e) {
+		reader.interrupt()
+		writer.interrupt()
+		endpoint.close()
+		eventBus.publish(new DisconnectionEvent(destination: endpoint.destination))
+	}
+	
+	protected void readLoop() {
+		try {
+			while(running.get()) {
+				read()
+			}
+		} catch (SocketTimeoutException e) {
         } catch (Exception e) {
             log.log(Level.WARNING,"unhandled exception in reader",e)
         } finally {
             close()
         }
-    }
-
-    protected abstract void read()
-
-    protected void writeLoop() {
-        try {
-            while(running.get()) {
-                def message = messages.take()
-                write(message)
-            }
-        } catch (Exception e) {
+	}
+	
+	protected abstract void read()
+	
+	protected void writeLoop() {
+		try {
+			while(running.get()) {
+				def message = messages.take()
+				write(message)
+			}
+		} catch (Exception e) {
             log.log(Level.WARNING, "unhandled exception in writer",e)
         } finally {
             close()
         }
-    }
-
-    protected abstract void write(def message);
-
-    void sendPing() {
-        def ping = [:]
-        ping.type = "Ping"
-        ping.version = 1
-        messages.put(ping)
-        lastPingSentTime = System.currentTimeMillis()
-    }
-
+	}
+	
+	protected abstract void write(def message);
+	
+	void sendPing() {
+		def ping = [:]
+		ping.type = "Ping"
+		ping.version = 1
+		messages.put(ping)
+		lastPingSentTime = System.currentTimeMillis()
+	}
+    
     void sendQuery(QueryEvent e) {
         def query = [:]
         query.type = "Search"
@@ -132,8 +128,6 @@ 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()
@@ -141,53 +135,35 @@ abstract class Connection implements Closeable {
             query.originator = e.originator.toBase64()
         messages.put(query)
     }
-
-    protected void handlePing() {
-        log.fine("$name received ping")
-        def pong = [:]
-        pong.type = "Pong"
-        pong.version = 1
-        pong.pongs = hostCache.getGoodHosts(10).collect { d -> d.toBase64() }
-        messages.put(pong)
-    }
-
-    protected void handlePong(def pong) {
-        log.fine("$name received pong")
-        lastPongReceivedTime = System.currentTimeMillis()
-        if (pong.pongs == null)
-            throw new Exception("Pong doesn't have pongs")
-        pong.pongs.each {
-            def dest = new Destination(it)
-            eventBus.publish(new HostDiscoveredEvent(destination: dest))
-        }
-    }
-
-    private boolean throttleSearch() {
-        final long now = System.currentTimeMillis()
-        if (searchTimestamps.size() < SEARCHES) {
-            searchTimestamps.addLast(now)
-            return false
-        }
-        Long oldest = searchTimestamps.getFirst()
-        if (now - oldest.longValue() < INTERVAL)
-            return true
-        searchTimestamps.addLast(now)
-        searchTimestamps.removeFirst()
-        false
-    }
-
+	
+	protected void handlePing() {
+		log.fine("$name received ping")
+		def pong = [:]
+		pong.type = "Pong"
+		pong.version = 1
+		pong.pongs = hostCache.getGoodHosts(10).collect { d -> d.toBase64() }
+		messages.put(pong)
+	}
+	
+	protected void handlePong(def pong) {
+		log.fine("$name received pong")
+		lastPongReceivedTime = System.currentTimeMillis()
+		if (pong.pongs == null)
+			throw new Exception("Pong doesn't have pongs")
+		pong.pongs.each { 
+			def dest = new Destination(it)
+			eventBus.publish(new HostDiscoveredEvent(destination: dest))
+		}
+	}
+    
     protected void handleSearch(def search) {
-        if (throttleSearch()) {
-            log.info("dropping excessive search")
-            return
-        }
         UUID uuid = UUID.fromString(search.uuid)
         byte [] infohash = null
         if (search.infohash != null) {
             search.keywords = null
             infohash = Base64.decode(search.infohash)
         }
-
+            
         Destination replyTo = new Destination(search.replyTo)
         TrustLevel trustLevel = trustService.getLevel(replyTo)
         if (trustLevel == TrustLevel.DISTRUSTED) {
@@ -198,7 +174,7 @@ abstract class Connection implements Closeable {
             log.info("dropping search from neutral peer")
             return
         }
-
+        
         Persona originator = null
         if (search.originator != null) {
             originator = new Persona(new ByteArrayInputStream(Base64.decode(search.originator)))
@@ -207,29 +183,21 @@ abstract class Connection implements Closeable {
                 return
             }
         }
-
+        
         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,
-                                            searchComments : searchComments,
-                                            compressedResults : compressedResults)
+                                            oobInfohash : oob)
         QueryEvent event = new QueryEvent ( searchEvent : searchEvent,
                                             replyTo : replyTo,
                                             originator : originator,
                                             receivedOn : endpoint.destination,
                                             firstHop : search.firstHop )
         eventBus.publish(event)
-
+                                            
     }
 }

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

@@ -5,214 +5,194 @@ 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
 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
 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 UltrapeerConnectionManager manager
-    final MuWireSettings settings
-    final I2PAcceptor acceptor
-    final HostCache hostCache
-    final TrustService trustService
-    final SearchManager searchManager
+	final EventBus eventBus
+	final UltrapeerConnectionManager manager
+	final MuWireSettings settings
+	final I2PAcceptor acceptor
+	final HostCache hostCache
+	final TrustService trustService
+    final SearchManager searchManager 
     final UploadManager uploadManager
-    final FileManager fileManager
     final ConnectionEstablisher establisher
-
-    final ExecutorService acceptorThread
-    final ExecutorService handshakerThreads
-
+	
+	final ExecutorService acceptorThread
+	final ExecutorService handshakerThreads
+    
     private volatile shutdown
-
-    ConnectionAcceptor(EventBus eventBus, UltrapeerConnectionManager manager,
-        MuWireSettings settings, I2PAcceptor acceptor, HostCache hostCache,
-        TrustService trustService, SearchManager searchManager, UploadManager uploadManager,
-        FileManager fileManager, ConnectionEstablisher establisher) {
-        this.eventBus = eventBus
-        this.manager = manager
-        this.settings = settings
-        this.acceptor = acceptor
-        this.hostCache = hostCache
-        this.trustService = trustService
+	
+	ConnectionAcceptor(EventBus eventBus, UltrapeerConnectionManager manager,
+		MuWireSettings settings, I2PAcceptor acceptor, HostCache hostCache,
+		TrustService trustService, SearchManager searchManager, UploadManager uploadManager,
+        ConnectionEstablisher establisher) {
+		this.eventBus = eventBus
+		this.manager = manager
+		this.settings = settings
+		this.acceptor = acceptor
+		this.hostCache = hostCache
+		this.trustService = trustService
         this.searchManager = searchManager
-        this.fileManager = fileManager
         this.uploadManager = uploadManager
-        this.establisher = establisher
-
-        acceptorThread = Executors.newSingleThreadExecutor { r ->
-            def rv = new Thread(r)
-            rv.setDaemon(true)
-            rv.setName("acceptor")
-            rv
-        }
-
-        handshakerThreads = Executors.newCachedThreadPool { r ->
-            def rv = new Thread(r)
-            rv.setDaemon(true)
-            rv.setName("acceptor-processor-${System.currentTimeMillis()}")
-            rv
-        }
-    }
-
-    void start() {
-        acceptorThread.execute({acceptLoop()} as Runnable)
-    }
-
-    void stop() {
+		this.establisher = establisher
+        
+		acceptorThread = Executors.newSingleThreadExecutor { r -> 
+			def rv = new Thread(r)
+			rv.setDaemon(true)
+			rv.setName("acceptor")
+			rv
+		}
+		
+		handshakerThreads = Executors.newCachedThreadPool { r ->
+			def rv = new Thread(r)
+			rv.setDaemon(true)
+			rv.setName("acceptor-processor-${System.currentTimeMillis()}")
+			rv
+		}
+	}
+	
+	void start() {
+		acceptorThread.execute({acceptLoop()} as Runnable)
+	}
+	
+	void stop() {
         shutdown = true
-        acceptorThread.shutdownNow()
-        handshakerThreads.shutdownNow()
-    }
-
-    private void acceptLoop() {
+		acceptorThread.shutdownNow()
+		handshakerThreads.shutdownNow()
+	}
+	
+	private void acceptLoop() {
         try {
-        while(true) {
-            def incoming = acceptor.accept()
-            log.info("accepted connection from ${incoming.destination.toBase32()}")
-            switch(trustService.getLevel(incoming.destination)) {
-                case TrustLevel.TRUSTED : break
-                case TrustLevel.NEUTRAL :
-                    if (settings.allowUntrusted())
-                        break
-                case TrustLevel.DISTRUSTED :
-                    log.info("Disallowing distrusted connection")
-                    incoming.close()
-                    continue
-            }
-            handshakerThreads.execute({processIncoming(incoming)} as Runnable)
-        }
+		while(true) {
+			def incoming = acceptor.accept()
+			log.info("accepted connection from ${incoming.destination.toBase32()}")
+			switch(trustService.getLevel(incoming.destination)) {
+				case TrustLevel.TRUSTED : break
+				case TrustLevel.NEUTRAL :
+					if (settings.allowUntrusted())
+						break
+				case TrustLevel.DISTRUSTED :
+					log.info("Disallowing distrusted connection")
+					incoming.close()
+					continue
+			}
+			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) {
-        InputStream is = e.inputStream
-        try {
-            int read = is.read()
-            switch(read) {
-                case (byte)'M':
+	}
+	
+	private void processIncoming(Endpoint e) {
+		InputStream is = e.inputStream
+		try {
+			int read = is.read()
+			switch(read) {
+				case (byte)'M':
                     if (settings.isLeaf())
                         throw new IOException("Incoming connection as leaf")
-                    processMuWire(e)
-                    break
-                case (byte)'G':
-                    processGET(e)
-                    break
+					processMuWire(e)
+					break
+				case (byte)'G':
+					processGET(e)
+					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
-                case (byte)'B':
-                    processBROWSE(e)
-                    break
-                default:
-                    throw new Exception("Invalid read $read")
-            }
-        } 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) {
-        byte[] uWire = "uWire ".bytes
-        for (int i = 0; i < uWire.length; i++) {
-            int read = e.inputStream.read()
-            if (read != uWire[i]) {
-                throw new IOException("unexpected value $read at position $i")
-            }
-        }
-
-        byte[] type = new byte[4]
-        DataInputStream dis = new DataInputStream(e.inputStream)
-        dis.readFully(type)
-
+				default:
+					throw new Exception("Invalid read $read")
+			}
+		} 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) {
+		byte[] uWire = "uWire ".bytes
+		for (int i = 0; i < uWire.length; i++) {
+			int read = e.inputStream.read()
+			if (read != uWire[i]) {
+				throw new IOException("unexpected value $read at position $i")
+			}
+		}
+        
+		byte[] type = new byte[4]
+		DataInputStream dis = new DataInputStream(e.inputStream)
+		dis.readFully(type)
+                
         if (type == "leaf".bytes)
             handleIncoming(e, true)
         else if (type == "peer".bytes)
             handleIncoming(e, false)
-        else
+        else 
             throw new IOException("unknown connection type $type")
     }
 
-    private void handleIncoming(Endpoint e, boolean leaf) {
-        boolean accept = !manager.isConnected(e.destination) &&
+	private void handleIncoming(Endpoint e, boolean leaf) {
+		boolean accept = !manager.isConnected(e.destination) && 
             !establisher.isInProgress(e.destination) &&
             (leaf ? manager.hasLeafSlots() : manager.hasPeerSlots())
-        if (accept) {
-            log.info("accepting connection, leaf:$leaf")
-            e.outputStream.write("OK".bytes)
-            e.outputStream.flush()
-            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))
-        } else {
-            log.info("rejecting connection, leaf:$leaf")
-            e.outputStream.write("REJECT".bytes)
-            def hosts = hostCache.getGoodHosts(10)
-            if (!hosts.isEmpty()) {
-                def json = [:]
-                json.tryHosts = hosts.collect { d -> d.toBase64() }
-                json = JsonOutput.toJson(json)
-                def os = new DataOutputStream(e.outputStream)
-                os.writeShort(json.bytes.length)
-                os.write(json.bytes)
-            }
-            e.outputStream.flush()
-            e.close()
-            eventBus.publish(new ConnectionEvent(endpoint: e, incoming: true, leaf: leaf, status: ConnectionAttemptStatus.REJECTED))
-        }
-    }
-
-
-
-    private void processGET(Endpoint e) {
+		if (accept) {
+			log.info("accepting connection, leaf:$leaf")
+			e.outputStream.write("OK".bytes)
+			e.outputStream.flush()
+			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))
+		} else {
+			log.info("rejecting connection, leaf:$leaf")
+			e.outputStream.write("REJECT".bytes)
+			def hosts = hostCache.getGoodHosts(10)
+			if (!hosts.isEmpty()) {
+				def json = [:]
+				json.tryHosts = hosts.collect { d -> d.toBase64() }
+				json = JsonOutput.toJson(json)
+				def os = new DataOutputStream(e.outputStream)
+				os.writeShort(json.bytes.length)
+				os.write(json.bytes)
+			}
+			e.outputStream.flush()
+			e.close()
+			eventBus.publish(new ConnectionEvent(endpoint: e, incoming: true, leaf: leaf, status: ConnectionAttemptStatus.REJECTED))
+		}
+	}
+	
+	
+	
+	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]
         final DataInputStream dis = new DataInputStream(e.getInputStream())
@@ -221,7 +201,7 @@ class ConnectionAcceptor {
             throw new IOException("Invalid HASHLIST connection")
         uploadManager.processHashList(e)
     }
-
+    
     private void processPOST(final Endpoint e) throws IOException {
         byte [] ost = new byte[4]
         final DataInputStream dis = new DataInputStream(e.getInputStream())
@@ -243,164 +223,20 @@ 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++) {
                 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(ResultsParser.parse(sender, resultsUUID, json))
             }
-            eventBus.publish(new UIResultBatchEvent(uuid: resultsUUID, results: results))
         } catch (IOException | UnexpectedResultsException | InvalidSearchResultException bad) {
             log.log(Level.WARNING, "failed to process POST", bad)
         } finally {
             e.close()
         }
     }
-    
-    private void processRESULTS(Endpoint e) {
-        InputStream is = e.getInputStream()
-        DataInputStream dis = new DataInputStream(is)
-        byte[] esults = new byte[7]
-        dis.readFully(esults)
-        if (esults != "ESULTS ".getBytes(StandardCharsets.US_ASCII))
-            throw new IOException("Invalid RESULTS connection")
-            
-        JsonSlurper slurper = new JsonSlurper()
-        try {
-            String uuid = DataUtil.readTillRN(dis)
-            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()
-        }
-            
-    }
-    
-    private void processBROWSE(Endpoint e) {
-        try {
-            byte [] rowse = new byte[7]
-            DataInputStream dis = new DataInputStream(e.getInputStream())
-            dis.readFully(rowse)
-            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
-
-            OutputStream os = e.getOutputStream()
-            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

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

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

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

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

@@ -5,11 +5,11 @@ import com.muwire.core.Event
 import net.i2p.data.Destination
 
 class DisconnectionEvent extends Event {
+	
+	Destination destination
 
-    Destination destination
-
-    @Override
-    public String toString() {
-        "DisconnectionEvent ${super.toString()} destination:${destination.toBase32()}"
-    }
+	@Override
+	public String toString() {
+		"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 InputStream inputStream
-    final OutputStream outputStream
+	final Destination destination
+	final InputStream inputStream
+	final OutputStream outputStream
     final def toClose
-
-    private final AtomicBoolean closed = new AtomicBoolean()
-
-    Endpoint(Destination destination, InputStream inputStream, OutputStream outputStream, def toClose) {
-        this.destination = destination
-        this.inputStream = inputStream
-        this.outputStream = outputStream
+	
+	private final AtomicBoolean closed = new AtomicBoolean()
+	
+	Endpoint(Destination destination, InputStream inputStream, OutputStream outputStream, def toClose) {
+		this.destination = destination
+		this.inputStream = inputStream
+		this.outputStream = outputStream
         this.toClose = toClose
-    }
-
-    @Override
-    public void close() {
-        if (!closed.compareAndSet(false, true)) {
-            log.log(Level.WARNING,"Close loop detected for ${destination.toBase32()}", new Exception())
-            return
-        }
-        if (inputStream != null) {
-            try {inputStream.close()} catch (Exception ignore) {}
-        }
-        if (outputStream != null) {
-            try {outputStream.close()} catch (Exception ignore) {}
-        }
+	}
+	
+	@Override
+	public void close() {
+		if (!closed.compareAndSet(false, true)) {
+			log.log(Level.WARNING,"Close loop detected for ${destination.toBase32()}", new Exception())
+			return
+		}
+		if (inputStream != null) {
+			try {inputStream.close()} catch (Exception ignore) {}
+		}
+		if (outputStream != null) {
+			try {outputStream.close()} catch (Exception ignore) {}
+		}
         if (toClose != null) {
             try {toClose.reset()} catch (Exception ignore) {}
         }
-    }
-
-    @Override
-    public String toString() {
-        "destination: ${destination.toBase32()}"
-    }
-}
+	}
+	
+	@Override
+	public String toString() {
+		"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 I2PServerSocket serverSocket
-
-    I2PAcceptor() {}
-
-    I2PAcceptor(I2PSocketManager socketManager) {
-        this.socketManager = socketManager
-        this.serverSocket = socketManager.getServerSocket()
-    }
-
-    Endpoint accept() {
-        def socket = serverSocket.accept()
-        new Endpoint(socket.getPeerDestination(), socket.getInputStream(), socket.getOutputStream(), socket)
-    }
+	final I2PSocketManager socketManager
+	final I2PServerSocket serverSocket
+	
+	I2PAcceptor() {}
+	
+	I2PAcceptor(I2PSocketManager socketManager) {
+		this.socketManager = socketManager
+		this.serverSocket = socketManager.getServerSocket()
+	}
+	
+	Endpoint accept() {
+		def socket = serverSocket.accept()
+		new Endpoint(socket.getPeerDestination(), socket.getInputStream(), socket.getOutputStream(), socket)
+	}
 }

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

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

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

@@ -11,27 +11,27 @@ import com.muwire.core.trust.TrustService
 import net.i2p.data.Destination
 
 /**
- * Connection where the other side is a leaf.
+ * Connection where the other side is a leaf. 
  * Such connections can only be incoming.
  * @author zab
  */
 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
-    protected void read() {
-        // TODO Auto-generated method stub
+	@Override
+	protected void read() {
+		// TODO Auto-generated method stub
+		
+	}
 
-    }
-
-    @Override
-    protected void write(Object message) {
-        // TODO Auto-generated method stub
-
-    }
+	@Override
+	protected void write(Object message) {
+		// TODO Auto-generated method stub
+		
+	}
 
 }

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

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

@@ -2,6 +2,7 @@ package com.muwire.core.connection
 
 import java.io.InputStream
 import java.io.OutputStream
+import java.nio.charset.StandardCharsets
 
 import com.muwire.core.EventBus
 import com.muwire.core.MuWireSettings
@@ -20,63 +21,63 @@ import net.i2p.data.Destination
  */
 @Log
 class PeerConnection extends Connection {
+	
+	private final DataInputStream dis
+	private final DataOutputStream dos
+	
+	private final byte[] readHeader = new byte[3]
+	private final byte[] writeHeader = new byte[3]
+	
+	private final JsonSlurper slurper = new JsonSlurper()
 
-    private final DataInputStream dis
-    private final DataOutputStream dos
-
-    private final byte[] readHeader = new byte[3]
-    private final byte[] writeHeader = new byte[3]
-
-    private final JsonSlurper slurper = new JsonSlurper()
-
-    public PeerConnection(EventBus eventBus, Endpoint endpoint,
-            boolean incoming, HostCache hostCache, TrustService trustService,
+	public PeerConnection(EventBus eventBus, Endpoint endpoint,
+			boolean incoming, HostCache hostCache, TrustService trustService,
             MuWireSettings settings) {
-        super(eventBus, endpoint, incoming, hostCache, trustService, settings)
-        this.dis = new DataInputStream(endpoint.inputStream)
-        this.dos = new DataOutputStream(endpoint.outputStream)
-    }
+		super(eventBus, endpoint, incoming, hostCache, trustService, settings)
+		this.dis = new DataInputStream(endpoint.inputStream)
+		this.dos = new DataOutputStream(endpoint.outputStream)
+	}
 
-    @Override
-    protected void read() {
-        dis.readFully(readHeader)
-        int length = DataUtil.readLength(readHeader)
-        log.fine("$name read length $length")
-
-        byte[] payload = new byte[length]
-        dis.readFully(payload)
-
-        if ((readHeader[0] & (byte)0x80) == 0x80) {
-            // TODO process binary
-        } else {
-            def json = slurper.parse(payload)
-            if (json.type == null)
-                throw new Exception("missing json type")
-            switch(json.type) {
-                case "Ping" : handlePing(); break;
-                case "Pong" : handlePong(json); break;
+	@Override
+	protected void read() {
+		dis.readFully(readHeader)
+		int length = DataUtil.readLength(readHeader)
+		log.fine("$name read length $length")
+		
+		byte[] payload = new byte[length]
+		dis.readFully(payload)
+		
+		if ((readHeader[0] & (byte)0x80) == 0x80) {
+			// TODO process binary
+		} else {
+			def json = slurper.parse(payload)
+			if (json.type == null)
+				throw new Exception("missing json type")
+			switch(json.type) {
+				case "Ping" : handlePing(); break;
+				case "Pong" : handlePong(json); break;
                 case "Search": handleSearch(json); break
-                default :
-                    throw new Exception("unknown json type ${json.type}")
-            }
-        }
-    }
+				default :
+					throw new Exception("unknown json type ${json.type}")
+			}
+		}
+	}
 
-    @Override
-    protected void write(Object message) {
-        byte[] payload
-        if (message instanceof Map) {
-            payload = JsonOutput.toJson(message).bytes
-            DataUtil.packHeader(payload.length, writeHeader)
-            log.fine "$name writing message type ${message.type} length $payload.length"
-            writeHeader[0] &= (byte)0x7F
-        } else {
-            // TODO: write binary
-        }
-
-        dos.write(writeHeader)
-        dos.write(payload)
-        dos.flush()
-    }
+	@Override
+	protected void write(Object message) {
+		byte[] payload
+		if (message instanceof Map) {
+			payload = JsonOutput.toJson(message).getBytes(StandardCharsets.UTF_8)
+			DataUtil.packHeader(payload.length, writeHeader)
+			log.fine "$name writing message type ${message.type} length $payload.length"
+			writeHeader[0] &= (byte)0x7F
+		} else {
+			// TODO: write binary
+		}
+		
+		dos.write(writeHeader)
+		dos.write(payload)
+		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) {
-        super(eventBus, endpoint, false, hostCache, trustService)
-    }
+	public UltrapeerConnection(EventBus eventBus, Endpoint endpoint, HostCache hostCache, TrustService trustService) {
+		super(eventBus, endpoint, false, hostCache, trustService)
+	}
 
-    @Override
-    protected void read() {
-        // TODO Auto-generated method stub
+	@Override
+	protected void read() {
+		// TODO Auto-generated method stub
+		
+	}
 
-    }
+	@Override
+	protected void write(Object message) {
+		if (message instanceof Map) {
+			writeJsonMessage(message)
+		} else {
+			writeBinaryMessage(message)
+		}
+	}
 
-    @Override
-    protected void write(Object message) {
-        if (message instanceof Map) {
-            writeJsonMessage(message)
-        } else {
-            writeBinaryMessage(message)
-        }
-    }
-
-    private void writeJsonMessage(def message) {
-
-    }
-
-    private void writeBinaryMessage(def message) {
-
-    }
+	private void writeJsonMessage(def message) {
+		
+	}
+	
+	private void writeBinaryMessage(def message) {
+		
+	}
 }

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

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

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

@@ -1,9 +0,0 @@
-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

@@ -1,30 +0,0 @@
-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

@@ -1,36 +0,0 @@
-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

@@ -1,9 +0,0 @@
-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

@@ -1,20 +0,0 @@
-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

@@ -1,35 +0,0 @@
-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/BadHashException.groovy

@@ -21,5 +21,5 @@ class BadHashException extends Exception {
     public BadHashException(Throwable cause) {
         super(cause);
     }
-
+    
 }

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

@@ -3,10 +3,6 @@ package com.muwire.core.download
 import com.muwire.core.connection.I2PConnector
 import com.muwire.core.files.FileDownloadedEvent
 import com.muwire.core.files.FileHasher
-import com.muwire.core.mesh.Mesh
-import com.muwire.core.mesh.MeshManager
-import com.muwire.core.trust.TrustLevel
-import com.muwire.core.trust.TrustService
 import com.muwire.core.util.DataUtil
 
 import groovy.json.JsonBuilder
@@ -18,37 +14,31 @@ import net.i2p.util.ConcurrentHashSet
 
 import com.muwire.core.EventBus
 import com.muwire.core.InfoHash
-import com.muwire.core.MuWireSettings
 import com.muwire.core.Persona
 import com.muwire.core.UILoadedEvent
 
-import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors
 
 public class DownloadManager {
-
+    
     private final EventBus eventBus
-    private final TrustService trustService
-    private final MeshManager meshManager
-    private final MuWireSettings muSettings
     private final I2PConnector connector
     private final Executor executor
-    private final File home
+    private final File incompletes, home
     private final Persona me
-
-    private final Map<InfoHash, Downloader> downloaders = new ConcurrentHashMap<>()
-
-    public DownloadManager(EventBus eventBus, TrustService trustService, MeshManager meshManager, MuWireSettings muSettings,
-        I2PConnector connector, File home, Persona me) {
+    
+    private final Set<Downloader> downloaders = new ConcurrentHashSet<>()
+    
+    public DownloadManager(EventBus eventBus, I2PConnector connector, File home, Persona me) {
         this.eventBus = eventBus
-        this.trustService = trustService
-        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")
@@ -56,54 +46,37 @@ public class DownloadManager {
             rv
         })
     }
-
-
+    
+    
     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
-
+        
         Set<Destination> destinations = new HashSet<>()
-        e.result.each {
+        e.result.each { 
             destinations.add(it.sender.destination)
         }
-        destinations.addAll(e.sources)
-        destinations.remove(me.destination)
-
-        Pieces pieces = getPieces(infohash, size, pieceSize, e.sequential)
-
+        
         def downloader = new Downloader(eventBus, this, me, e.target, size,
             infohash, pieceSize, connector, destinations,
-            incompletes, pieces)
-        downloaders.put(infohash, downloader)
+            incompletes)
+        downloaders.add(downloader)
         persistDownloaders()
         executor.execute({downloader.download()} as Runnable)
         eventBus.publish(new DownloadStartedEvent(downloader : downloader))
     }
-
+    
     public void onUIDownloadCancelledEvent(UIDownloadCancelledEvent e) {
-        downloaders.remove(e.downloader.infoHash)
+        downloaders.remove(e.downloader)
         persistDownloaders()
     }
-
-    public void onUIDownloadPausedEvent(UIDownloadPausedEvent e) {
-        persistDownloaders()
-    }
-
-    public void onUIDownloadResumedEvent(UIDownloadResumedEvent e) {
-        persistDownloaders()
-    }
-
+    
     void resume(Downloader downloader) {
         executor.execute({downloader.download() as Runnable})
     }
-
+    
     void onUILoadedEvent(UILoadedEvent e) {
         File downloadsFile = new File(home, "downloads.json")
         if (!downloadsFile.exists())
@@ -113,7 +86,7 @@ public class DownloadManager {
             def json = slurper.parseText(it)
             File file = new File(DataUtil.readi18nString(Base64.decode(json.file)))
             def destinations = new HashSet<>()
-            json.destinations.each { destination ->
+            json.destinations.each { destination -> 
                 destinations.add new Destination(destination)
             }
             InfoHash infoHash
@@ -124,64 +97,23 @@ public class DownloadManager {
                 byte [] root = Base64.decode(json.hashRoot)
                 infoHash = new InfoHash(root)
             }
-            
-            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)
-            if (json.paused != null)
-                downloader.paused = json.paused
-            downloaders.put(infoHash, downloader)
-            downloader.readPieces()
-            if (!downloader.paused)
-                downloader.download()
+                infoHash, json.pieceSizePow2, connector, destinations, incompletes)
+            downloaders.add(downloader)
+            downloader.download()
             eventBus.publish(new DownloadStartedEvent(downloader : downloader))
         }
     }
-
-    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, sequential)
-        mesh.pieces
-    }
-
-    void onSourceDiscoveredEvent(SourceDiscoveredEvent e) {
-        Downloader downloader = downloaders.get(e.infoHash)
-        if (downloader == null)
-            return
-        boolean ok = false
-        switch(trustService.getLevel(e.source.destination)) {
-            case TrustLevel.TRUSTED: ok = true; break
-            case TrustLevel.NEUTRAL: ok = muSettings.allowUntrusted; break
-            case TrustLevel.DISTRUSTED: ok = false; break
-        }
-
-        if (ok)
-            downloader.addSource(e.source.destination)
-    }
-
+    
     void onFileDownloadedEvent(FileDownloadedEvent e) {
-        downloaders.remove(e.downloader.infoHash)
+        downloaders.remove(e.downloader)
         persistDownloaders()
     }
-
+    
     private void persistDownloaders() {
         File downloadsFile = new File(home,"downloads.json")
-        downloadsFile.withPrintWriter { writer ->
-            downloaders.values().each { downloader ->
+        downloadsFile.withPrintWriter { writer -> 
+            downloaders.each { downloader ->
                 if (!downloader.cancelled) {
                     def json = [:]
                     json.file = Base64.encode(DataUtil.encodei18nString(downloader.file.getAbsolutePath()))
@@ -192,27 +124,20 @@ public class DownloadManager {
                         destinations << it.toBase64()
                     }
                     json.destinations = destinations
-
+                    
                     InfoHash infoHash = downloader.getInfoHash()
                     if (infoHash.hashList != null)
                         json.hashList = Base64.encode(infoHash.hashList)
                     else
                         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))
                 }
             }
         }
     }
-
+    
     public void shutdown() {
-        downloaders.values().each { it.stop() }
+        downloaders.each { it.stop() }
         Downloader.executorService.shutdownNow()
     }
 }

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

@@ -3,56 +3,49 @@ package com.muwire.core.download;
 import net.i2p.data.Base64
 
 import com.muwire.core.Constants
-import com.muwire.core.EventBus
 import com.muwire.core.InfoHash
-import com.muwire.core.Persona
 import com.muwire.core.connection.Endpoint
-import com.muwire.core.util.DataUtil
-
 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
 import java.nio.file.StandardOpenOption
 import java.security.MessageDigest
 import java.security.NoSuchAlgorithmException
-import java.util.logging.Level
 
 @Log
 class DownloadSession {
-
-    private final EventBus eventBus
+    
+    private static int SAMPLES = 10
+    
     private final String meB64
-    private final Pieces pieces
+    private final Pieces downloaded, claimed
     private final InfoHash infoHash
     private final Endpoint endpoint
     private final File file
     private final int pieceSize
     private final long fileLength
-    private final Set<Integer> available
     private final MessageDigest digest
-
-    private long lastSpeedRead = System.currentTimeMillis()
-    private long dataSinceLastRead
-
-    private MappedByteBuffer mapped
-
-    DownloadSession(EventBus eventBus, String meB64, Pieces pieces, InfoHash infoHash, Endpoint endpoint, File file,
-        int pieceSize, long fileLength, Set<Integer> available) {
-        this.eventBus = eventBus
+    
+    private final LinkedList<Long> timestamps = new LinkedList<>()
+    private final LinkedList<Integer> reads = new LinkedList<>()
+    
+    private ByteBuffer mapped
+    
+    DownloadSession(String meB64, Pieces downloaded, Pieces claimed, InfoHash infoHash, Endpoint endpoint, File file, 
+        int pieceSize, long fileLength) {
         this.meB64 = meB64
-        this.pieces = pieces
+        this.downloaded = downloaded
+        this.claimed = claimed
         this.endpoint = endpoint
         this.infoHash = infoHash
         this.file = file
         this.pieceSize = pieceSize
         this.fileLength = fileLength
-        this.available = available
         try {
             digest = MessageDigest.getInstance("SHA-256")
         } catch (NoSuchAlgorithmException impossible) {
@@ -60,7 +53,7 @@ class DownloadSession {
             System.exit(1)
         }
     }
-
+    
     /**
      * @return if the request will proceed.  The only time it may not
      * is if all the pieces have been claimed by other sessions.
@@ -69,164 +62,143 @@ class DownloadSession {
     public boolean request() throws IOException {
         OutputStream os = endpoint.getOutputStream()
         InputStream is = endpoint.getInputStream()
-
-        int[] pieceAndPosition
-        if (available.isEmpty())
-            pieceAndPosition = pieces.claim()
-        else
-            pieceAndPosition = pieces.claim(new HashSet<>(available))
-        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 from position $position steal $steal")
-
-        long pieceStart = piece * ((long)pieceSize)
-        long end = Math.min(fileLength, pieceStart + pieceSize) - 1
-        long start = pieceStart + position
+        
+        int piece
+        while(true) {
+            piece = downloaded.getRandomPiece()
+            if (claimed.isMarked(piece)) {
+                if (downloaded.donePieces() + claimed.donePieces() == downloaded.nPieces) {
+                    log.info("all pieces claimed")
+                    return false
+                }
+                continue
+            }
+            break
+        }
+        claimed.markDownloaded(piece)
+        
+        log.info("will download piece $piece")
+        
+        long start = piece * pieceSize
+        long end = Math.min(fileLength, start + pieceSize) - 1
+        long length = end - start + 1
+        
         String root = Base64.encode(infoHash.getRoot())
-
+                
+        FileChannel channel
         try {
             os.write("GET $root\r\n".getBytes(StandardCharsets.US_ASCII))
             os.write("Range: $start-$end\r\n".getBytes(StandardCharsets.US_ASCII))
-            os.write("X-Persona: $meB64\r\n".getBytes(StandardCharsets.US_ASCII))
-            String xHave = DataUtil.encodeXHave(pieces.getDownloaded(), pieces.nPieces)
-            os.write("X-Have: $xHave\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
+            os.write("X-Persona: $meB64\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
             os.flush()
-            String codeString = readTillRN(is)
-            int space = codeString.indexOf(' ')
-            if (space > 0)
-                codeString = codeString.substring(0, space)
-
-            int code = Integer.parseInt(codeString.trim())
-
-            if (code == 404) {
+            String code = readTillRN(is)
+            if (code.startsWith("404 ")) {
                 log.warning("file not found")
                 endpoint.close()
-                return false
+                return
             }
-
-            if (!(code == 200 || code == 416)) {
+                
+            if (code.startsWith("416 ")) {
+                log.warning("range $start-$end cannot be satisfied")
+                return // leave endpoint open
+            }
+            
+            if (!code.startsWith("200 ")) {
                 log.warning("unknown code $code")
                 endpoint.close()
                 return false
             }
 
             // parse all headers
-            Map<String,String> headers = new HashMap<>()
+            Set<String> headers = new HashSet<>()
             String header
-            while((header = 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()
+            while((header = readTillRN(is)) != "" && headers.size() < Constants.MAX_HEADERS) 
+                headers.add(header)
+
+            long receivedStart = -1
+            long receivedEnd = -1
+            for (String receivedHeader : headers) {
+                def group = (receivedHeader =~ /^Content-Range: (\d+)-(\d+)$/)
+                if (group.size() != 1) {
+                    log.info("ignoring header $receivedHeader")
+                    continue
+                } 
+
+                receivedStart = Long.parseLong(group[0][1])
+                receivedEnd = Long.parseLong(group[0][2])
             }
-
-            // prase X-Alt if present
-            if (headers.containsKey("X-Alt")) {
-                headers["X-Alt"].split(",").each {
-                    if (it.length() > 0) {
-                        byte [] raw = Base64.decode(it)
-                        Persona source = new Persona(new ByteArrayInputStream(raw))
-                        eventBus.publish(new SourceDiscoveredEvent(infoHash : infoHash, source : source))
-                    }
-                }
-            }
-
-            // parse X-Have if present
-            if (headers.containsKey("X-Have")) {
-                DataUtil.decodeXHave(headers["X-Have"]).each {
-                    available.add(it)
-                }
-                if (!available.contains(piece))
-                    return true // try again next time
-            } else {
-                if (code != 200)
-                    throw new IOException("Code $code but no X-Have")
-                available.clear()
-            }
-
-            if (code != 200)
-                return true
-
-            String range = headers["Content-Range"]
-            if (range == null)
-                throw new IOException("Code 200 but no Content-Range")
-
-            def group = (range =~ /^(\d+)-(\d+)$/)
-            if (group.size() != 1)
-                throw new IOException("invalid Content-Range header $range")
-
-            long receivedStart = Long.parseLong(group[0][1])
-            long receivedEnd = Long.parseLong(group[0][2])
-
+            
             if (receivedStart != start || receivedEnd != end) {
                 log.warning("We don't support mismatching ranges yet")
                 endpoint.close()
                 return false
             }
-
+            
             // start the download
-            FileChannel channel
-            try {
-                channel = Files.newByteChannel(file.toPath(), EnumSet.of(StandardOpenOption.READ, StandardOpenOption.WRITE,
-                        StandardOpenOption.SPARSE, StandardOpenOption.CREATE)) 
-                mapped = channel.map(FileChannel.MapMode.READ_WRITE, pieceStart, end - pieceStart + 1)
-                mapped.position(position)
-
-                byte[] tmp = new byte[0x1 << 13]
-                while(mapped.hasRemaining()) {
-                    if (mapped.remaining() < tmp.length)
-                        tmp = new byte[mapped.remaining()]
-                    int read = is.read(tmp)
-                    if (read == -1)
-                        throw new IOException()
-                    synchronized(this) {
-                        mapped.put(tmp, 0, read)
-                        dataSinceLastRead += read
-                        pieces.markPartial(piece, mapped.position())
+            channel = Files.newByteChannel(file.toPath(), EnumSet.of(StandardOpenOption.READ, StandardOpenOption.WRITE, 
+                StandardOpenOption.SPARSE, StandardOpenOption.CREATE)) // TODO: double-check, maybe CREATE_NEW
+            mapped = channel.map(FileChannel.MapMode.READ_WRITE, start, end - start + 1)
+            
+            byte[] tmp = new byte[0x1 << 13]
+            while(mapped.hasRemaining()) {
+                if (mapped.remaining() < tmp.length)
+                    tmp = new byte[mapped.remaining()]
+                int read = is.read(tmp)
+                if (read == -1)
+                    throw new IOException()
+                synchronized(this) {
+                    mapped.put(tmp, 0, read)
+                    
+                    if (timestamps.size() == SAMPLES) {
+                        timestamps.removeFirst()
+                        reads.removeFirst()
                     }
+                    timestamps.addLast(System.currentTimeMillis())
+                    reads.addLast(read)
                 }
-
-                mapped.clear()
-                digest.update(mapped)
-                byte [] hash = digest.digest()
-                byte [] expected = new byte[32]
-                System.arraycopy(infoHash.getHashList(), piece * 32, expected, 0, 32)
-                if (hash != expected) {
-                    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
+            
+            mapped.clear()
+            digest.update(mapped)
+            byte [] hash = digest.digest()
+            byte [] expected = new byte[32]
+            System.arraycopy(infoHash.getHashList(), piece * 32, expected, 0, 32)    
+            if (hash != expected) 
+                throw new BadHashException()
+            
+            downloaded.markDownloaded(piece)        
         } finally {
-            if (unclaim && !steal) 
-                pieces.unclaim(piece)
+            claimed.clear(piece)
+            try { channel?.close() } catch (IOException ignore) {}
         }
         return true
     }
-
+    
     synchronized int positionInPiece() {
         if (mapped == null)
             return 0
         mapped.position()
     }
-
+    
     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)
-        lastSpeedRead = now;
-        int rv = (int) (dataSinceLastRead * 1000.0 / interval)
-        dataSinceLastRead = 0
-        rv
+        
+        while(idx < SAMPLES && timestamps.get(idx) < now - 1000)
+            idx++
+        if (idx == SAMPLES)
+            return 0
+        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

@@ -4,14 +4,9 @@ import com.muwire.core.InfoHash
 import com.muwire.core.Persona
 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
-import java.util.concurrent.atomic.AtomicBoolean
 import java.util.logging.Level
 
 import com.muwire.core.Constants
@@ -19,18 +14,15 @@ import com.muwire.core.DownloadedFile
 import com.muwire.core.EventBus
 import com.muwire.core.connection.I2PConnector
 import com.muwire.core.files.FileDownloadedEvent
-import com.muwire.core.util.DataUtil
 
 import groovy.util.logging.Log
 import net.i2p.data.Destination
-import net.i2p.util.ConcurrentHashSet
 
 @Log
 public class Downloader {
-    
-    public enum DownloadState { CONNECTING, HASHLIST, DOWNLOADING, FAILED, CANCELLED, PAUSED, FINISHED }
+    public enum DownloadState { CONNECTING, HASHLIST, DOWNLOADING, FAILED, CANCELLED, FINISHED }
     private enum WorkerState { CONNECTING, HASHLIST, DOWNLOADING, FINISHED}
-
+    
     private static final ExecutorService executorService = Executors.newCachedThreadPool({r ->
         Thread rv = new Thread(r)
         rv.setName("download worker")
@@ -39,37 +31,28 @@ public class Downloader {
     })
 
     private final EventBus eventBus
-    private final DownloadManager downloadManager
-    private final Persona me
+    private final DownloadManager downloadManager 
+    private final Persona me   
     private final File file
-    private final Pieces pieces
+    private final Pieces downloaded, claimed
     private final long length
     private InfoHash infoHash
     private final int pieceSize
     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
     private final Map<Destination, DownloadWorker> activeWorkers = new ConcurrentHashMap<>()
-    private final Set<Destination> successfulDestinations = new ConcurrentHashSet<>()
+    
+    
+    private volatile boolean cancelled
+    private volatile boolean eventFired
 
-
-    private volatile boolean cancelled, paused
-    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,
+    public Downloader(EventBus eventBus, DownloadManager downloadManager, 
+        Persona me, File file, long length, InfoHash infoHash, 
         int pieceSizePow2, I2PConnector connector, Set<Destination> destinations,
-        File incompletes, Pieces pieces) {
+        File incompletes) {
         this.eventBus = eventBus
         this.me = me
         this.downloadManager = downloadManager
@@ -78,23 +61,29 @@ 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
         this.pieceSize = 1 << pieceSizePow2
-        this.pieces = pieces
-        this.nPieces = pieces.nPieces
+        
+        int nPieces
+        if (length % pieceSize == 0)
+            nPieces = length / pieceSize
+        else
+            nPieces = length / pieceSize + 1
+        this.nPieces = nPieces
+        
+        downloaded = new Pieces(nPieces, Constants.DOWNLOAD_SEQUENTIAL_RATIO)
+        claimed = new Pieces(nPieces)
     }
-
+    
     public synchronized InfoHash getInfoHash() {
         infoHash
     }
-
+    
     private synchronized void setInfoHash(InfoHash infoHash) {
         this.infoHash = infoHash
     }
-
+    
     void download() {
         readPieces()
         destinations.each {
@@ -105,106 +94,68 @@ public class Downloader {
             }
         }
     }
-
+    
     void readPieces() {
         if (!piecesFile.exists())
             return
-        piecesFile.eachLine {
-            String [] split = it.split(",")
-            int piece = Integer.parseInt(split[0])
-            if (split.length == 1)
-                pieces.markDownloaded(piece)
-            else {
-                int position = Integer.parseInt(split[1])
-                pieces.markPartial(piece, position)
-            }
+        piecesFile.eachLine { 
+            int piece = Integer.parseInt(it)
+            downloaded.markDownloaded(piece)
         }
     }
-
+    
     void writePieces() {
-        synchronized(piecesFile) {
-            if (piecesFileClosed)
-                return
-            piecesFile.withPrintWriter { writer ->
-                pieces.write(writer)
+        piecesFile.withPrintWriter { writer ->
+            downloaded.getDownloaded().each { piece -> 
+                writer.println(piece)
             }
         }
     }
-
+    
     public long donePieces() {
-        pieces.donePieces()
+        downloaded.donePieces()
     }
-
-
+    
+    
     public int speed() {
-        int currSpeed = 0
+        int total = 0
         if (getCurrentState() == DownloadState.DOWNLOADING) {
             activeWorkers.values().each {
                 if (it.currentState == WorkerState.DOWNLOADING)
-                    currSpeed += it.speed()
+                    total += it.speed()
             }
         }
-        
-        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
+        total
     }
-
+    
     public DownloadState getCurrentState() {
         if (cancelled)
             return DownloadState.CANCELLED
-        if (paused)
-            return DownloadState.PAUSED
-
         boolean allFinished = true
-        activeWorkers.values().each {
+        activeWorkers.values().each { 
             allFinished &= it.currentState == WorkerState.FINISHED
         }
         if (allFinished) {
-            if (pieces.isComplete())
+            if (downloaded.isComplete())
                 return DownloadState.FINISHED
             return DownloadState.FAILED
         }
-
+        
         // if at least one is downloading...
         boolean oneDownloading = false
-        activeWorkers.values().each {
+        activeWorkers.values().each { 
             if (it.currentState == WorkerState.DOWNLOADING) {
                 oneDownloading = true
-                return
+                return 
             }
         }
-
+        
         if (oneDownloading)
             return DownloadState.DOWNLOADING
-
+        
         // at least one is requesting hashlist
         boolean oneHashlist = false
-        activeWorkers.values().each {
+        activeWorkers.values().each { 
             if (it.currentState == WorkerState.HASHLIST) {
                 oneHashlist = true
                 return
@@ -212,44 +163,33 @@ public class Downloader {
         }
         if (oneHashlist)
             return DownloadState.HASHLIST
-
+            
         return DownloadState.CONNECTING
     }
-
+    
     public void cancel() {
         cancelled = true
         stop()
-        synchronized(piecesFile) {
-            piecesFileClosed = true
-            piecesFile.delete()
-        }
-        incompleteFile.delete()
-        pieces.clearAll()
+        file.delete()
+        piecesFile.delete()
     }
-
-    public void pause() {
-        paused = true
-        stop()
-    }
-
+    
     void stop() {
-        activeWorkers.values().each {
+        activeWorkers.values().each { 
             it.cancel()
         }
     }
-
+    
     public int activeWorkers() {
         int active = 0
-        activeWorkers.values().each {
+        activeWorkers.values().each { 
             if (it.currentState != WorkerState.FINISHED)
                 active++
         }
         active
     }
-
+    
     public void resume() {
-        paused = false
-        readPieces()
         destinations.each { destination ->
             def worker = activeWorkers.get(destination)
             if (worker != null) {
@@ -265,27 +205,18 @@ public class Downloader {
             }
         }
     }
-
-    void addSource(Destination d) {
-        if (activeWorkers.containsKey(d))
-            return
-        DownloadWorker newWorker = new DownloadWorker(d)
-        activeWorkers.put(d, newWorker)
-        executorService.submit(newWorker)
-    }
-
+    
     class DownloadWorker implements Runnable {
         private final Destination destination
         private volatile WorkerState currentState
         private volatile Thread downloadThread
         private Endpoint endpoint
         private volatile DownloadSession currentSession
-        private final Set<Integer> available = new HashSet<>()
-
+                
         DownloadWorker(Destination destination) {
             this.destination = destination
         }
-
+        
         public void run() {
             downloadThread = Thread.currentThread()
             currentState = WorkerState.CONNECTING
@@ -300,51 +231,36 @@ public class Downloader {
                 }
                 currentState = WorkerState.DOWNLOADING
                 boolean requestPerformed
-                while(!pieces.isComplete()) {
-                    currentSession = new DownloadSession(eventBus, me.toBase64(), pieces, getInfoHash(),
-                        endpoint, incompleteFile, pieceSize, length, available)
+                while(!downloaded.isComplete()) {
+                    currentSession = new DownloadSession(me.toBase64(), downloaded, claimed, getInfoHash(), endpoint, file, pieceSize, length)
                     requestPerformed = currentSession.request()
                     if (!requestPerformed)
                         break
-                    successfulDestinations.add(endpoint.destination)
                     writePieces()
                 }
             } catch (Exception bad) {
-                log.log(Level.WARNING,"Exception while downloading",DataUtil.findRoot(bad))
+                log.log(Level.WARNING,"Exception while downloading",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) {
-                        Files.copy(incompleteFile.toPath(), file.toPath(), StandardCopyOption.REPLACE_EXISTING)
-                        incompleteFile.delete()
-                    }
+                if (downloaded.isComplete() && !eventFired) {
+                    piecesFile.delete()
+                    eventFired = true
                     eventBus.publish(
                         new FileDownloadedEvent(
-                            downloadedFile : new DownloadedFile(file.getCanonicalFile(), getInfoHash(), pieceSizePow2, successfulDestinations),
+                            downloadedFile : new DownloadedFile(file, getInfoHash(), pieceSizePow2, Collections.emptySet()),
                         downloader : Downloader.this))
-
-                }
+                            
+                } 
                 endpoint?.close()
             }
         }
-
+        
         int speed() {
             if (currentSession == null)
                 return 0
             currentSession.speed()
         }
-
+        
         void cancel() {
             downloadThread?.interrupt()
         }

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

@@ -20,32 +20,32 @@ class HashListSession {
     private final String meB64
     private final InfoHash infoHash
     private final Endpoint endpoint
-
+    
     HashListSession(String meB64, InfoHash infoHash, Endpoint endpoint) {
         this.meB64 = meB64
         this.infoHash = infoHash
         this.endpoint = endpoint
     }
-
+    
     InfoHash request() throws IOException {
         InputStream is = endpoint.getInputStream()
         OutputStream os = endpoint.getOutputStream()
-
+        
         String root = Base64.encode(infoHash.getRoot())
         os.write("HASHLIST $root\r\n".getBytes(StandardCharsets.US_ASCII))
         os.write("X-Persona: $meB64\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
         os.flush()
-
+        
         String code = readTillRN(is)
         if (!code.startsWith("200"))
             throw new IOException("unknown code $code")
-
+        
         // parse all headers
         Set<String> headers = new HashSet<>()
         String header
         while((header = readTillRN(is)) != "" && headers.size() < Constants.MAX_HEADERS)
             headers.add(header)
-
+            
         long receivedStart = -1
         long receivedEnd = -1
         for (String receivedHeader : headers) {
@@ -58,10 +58,10 @@ class HashListSession {
             receivedStart = Long.parseLong(group[0][1])
             receivedEnd = Long.parseLong(group[0][2])
         }
-
+        
         if (receivedStart != 0)
             throw new IOException("hashlist started at $receivedStart")
-
+        
         byte[] hashList = new byte[receivedEnd]
         ByteBuffer hashListBuf = ByteBuffer.wrap(hashList)
         byte[] tmp = new byte[0x1 << 13]
@@ -73,7 +73,7 @@ class HashListSession {
                 throw new IOException()
             hashListBuf.put(tmp, 0, read)
         }
-
+        
         InfoHash received = InfoHash.fromHashList(hashList)
         if (received.getRoot() != infoHash.getRoot())
             throw new IOException("fetched list doesn't match root")

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

@@ -1,117 +1,64 @@
 package com.muwire.core.download
 
 class Pieces {
-    private final BitSet done, claimed
+    private final BitSet bitSet
     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)
     }
-
+    
     Pieces(int nPieces, float ratio) {
         this.nPieces = nPieces
         this.ratio = ratio
-        done = new BitSet(nPieces)
-        claimed = new BitSet(nPieces)
+        bitSet = new BitSet(nPieces)
     }
     
-    synchronized int[] claim() {
-        int claimedCardinality = claimed.cardinality()
-        if (claimedCardinality == nPieces) {
-            // steal
-            int downloadedCardinality = done.cardinality()
-            if (downloadedCardinality == nPieces)
-                return null
-            int rv = done.nextClearBit(0)
-            return [rv, partials.getOrDefault(rv, 0), 1]
-        }
-
+    synchronized int getRandomPiece() {
+        int cardinality = bitSet.cardinality()
+        if (cardinality == nPieces)
+            return -1
+        
         // if fuller than ratio just do sequential
-        if ( (1.0f * claimedCardinality) / nPieces >= ratio) {
-            int rv = claimed.nextClearBit(0)
-            claimed.set(rv)
-            return [rv, partials.getOrDefault(rv, 0), 0]
+        if ( (1.0f * cardinality) / nPieces > ratio) {
+            return bitSet.nextClearBit(0)
         }
-
+        
         while(true) {
             int start = random.nextInt(nPieces)
-            if (claimed.get(start))
+            if (bitSet.get(start))
                 continue
-            claimed.set(start)
-            return [start, partials.getOrDefault(start,0), 0]
+            return start
         }
     }
-
-    synchronized int[] claim(Set<Integer> available) {
-        for (int i = done.nextSetBit(0); i >= 0; i = done.nextSetBit(i+1))
-            available.remove(i)
-        if (available.isEmpty())
-            return null
-        Set<Integer> availableCopy = new HashSet<>(available)
-        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, partials.getOrDefault(rv, 0), 0]
-    }
-
-    synchronized def getDownloaded() {
+    
+    def getDownloaded() {
         def rv = []
-        for (int i = done.nextSetBit(0); i >= 0; i = done.nextSetBit(i+1)) {
+        for (int i = bitSet.nextSetBit(0); i >= 0; i = bitSet.nextSetBit(i+1)) {
             rv << i
         }
         rv
     }
-
+    
     synchronized void markDownloaded(int piece) {
-        done.set(piece)
-        claimed.set(piece)
-        partials.remove(piece)
+        bitSet.set(piece)
     }
     
-    synchronized void markPartial(int piece, int position) {
-        partials.put(piece, position)
+    synchronized void clear(int piece) {
+        bitSet.clear(piece)
     }
-
-    synchronized void unclaim(int piece) {
-        claimed.clear(piece)
-    }
-
+    
     synchronized boolean isComplete() {
-        done.cardinality() == nPieces
-    }
-
-    synchronized int donePieces() {
-        done.cardinality()
-    }
-
-    synchronized boolean isDownloaded(int piece) {
-        done.get(piece)
-    }
-
-    synchronized void clearAll() {
-        done.clear()
-        claimed.clear()
-        partials.clear()
+        bitSet.cardinality() == nPieces
     }
     
-    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")
-        }
+    synchronized boolean isMarked(int piece) {
+        bitSet.get(piece)
+    }
+    
+    synchronized int donePieces() {
+        bitSet.cardinality()
     }
 }

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

@@ -1,10 +0,0 @@
-package com.muwire.core.download
-
-import com.muwire.core.Event
-import com.muwire.core.InfoHash
-import com.muwire.core.Persona
-
-class SourceDiscoveredEvent extends Event {
-    InfoHash infoHash
-    Persona source
-}

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

@@ -3,12 +3,8 @@ package com.muwire.core.download
 import com.muwire.core.Event
 import com.muwire.core.search.UIResultEvent
 
-import net.i2p.data.Destination
-
 class UIDownloadEvent extends Event {
-
+    
     UIResultEvent[] result
-    Set<Destination> sources
     File target
-    boolean sequential
 }

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

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

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

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

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

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

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

@@ -1,166 +1,4 @@
 package com.muwire.core.files
 
-import java.nio.file.FileSystem
-import java.nio.file.FileSystems
-import java.nio.file.Path
-import java.nio.file.Paths
-import static java.nio.file.StandardWatchEventKinds.*
-
-import java.nio.file.ClosedWatchServiceException
-import java.nio.file.WatchEvent
-import java.nio.file.WatchKey
-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
-import net.i2p.util.SystemVersion
-
-@Log
 class DirectoryWatcher {
-
-    private static final long WAIT_TIME = 1000
-
-    private static final WatchEvent.Kind[] kinds
-    static {
-        if (SystemVersion.isMac())
-            kinds = [ENTRY_MODIFY, ENTRY_DELETE]
-        else
-            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
-    private final Map<File, Long> waitingFiles = new ConcurrentHashMap<>()
-    private final Map<File, WatchKey> watchedDirectories = new ConcurrentHashMap<>()
-    private WatchService watchService
-    private volatile boolean shutdown
-
-    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")
-        watcherThread.setDaemon(true)
-        this.publisherThread = new Thread({publish()} as Runnable, "watched-files-publisher")
-        publisherThread.setDaemon(true)
-    }
-
-    void onAllFilesLoadedEvent(AllFilesLoadedEvent e) {
-        watchService = FileSystems.getDefault().newWatchService()
-        watcherThread.start()
-        publisherThread.start()
-    }
-
-    void stop() {
-        shutdown = true
-        watcherThread?.interrupt()
-        publisherThread?.interrupt()
-        watchService?.close()
-    }
-
-    void onFileSharedEvent(FileSharedEvent e) {
-        if (!e.file.isDirectory())
-            return
-        File canonical = e.file.getCanonicalFile()
-        Path path = canonical.toPath()
-        WatchKey wk = path.register(watchService, kinds)
-        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() {
-        try {
-            while(!shutdown) {
-                WatchKey key = watchService.take()
-                key.pollEvents().each {
-                    switch(it.kind()) {
-                        case ENTRY_CREATE: processCreated(key.watchable(), it.context()); break
-                        case ENTRY_MODIFY: processModified(key.watchable(), it.context()); break
-                        case ENTRY_DELETE: processDeleted(key.watchable(), it.context()); break
-                    }
-                }
-                key.reset()
-            }
-        } catch (InterruptedException|ClosedWatchServiceException e) {
-            if (!shutdown)
-                throw e
-        }
-    }
-
-
-    private void processCreated(Path parent, Path path) {
-        File f= join(parent, path)
-        log.fine("created entry $f")
-        if (f.isDirectory())
-            f.toPath().register(watchService, kinds)
-        else
-            waitingFiles.put(f, System.currentTimeMillis())
-    }
-
-    private void processModified(Path parent, Path path) {
-        File f = join(parent, path)
-        log.fine("modified entry $f")
-        waitingFiles.put(f, System.currentTimeMillis())
-    }
-
-    private void processDeleted(Path parent, Path path) {
-        File f = join(parent, path)
-        log.fine("deleted entry $f")
-        SharedFile sf = fileManager.fileToSharedFile.get(f)
-        if (sf != null)
-            eventBus.publish(new FileUnsharedEvent(unsharedFile : sf))
-    }
-
-    private static File join(Path parent, Path path) {
-        File parentFile = parent.toFile().getCanonicalFile()
-        new File(parentFile, path.toFile().getName()).getCanonicalFile()
-    }
-
-    private void publish() {
-        try {
-            while(!shutdown) {
-                Thread.sleep(WAIT_TIME)
-                long now = System.currentTimeMillis()
-                def published = []
-                waitingFiles.each { file, timestamp ->
-                    if (now - timestamp > WAIT_TIME) {
-                        log.fine("publishing file $file")
-                        eventBus.publish new FileSharedEvent(file : file)
-                        published << file
-                    }
-                }
-                published.each {
-                    waitingFiles.remove(it)
-                }
-            }
-        } catch (InterruptedException e) {
-            if (!shutdown)
-                throw e
-        }
-    }
 }

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,12 +5,6 @@ import com.muwire.core.SharedFile
 
 class FileHashedEvent extends Event {
 
-    SharedFile sharedFile
-    String error
-
-    @Override
-    public String toString() {
-        super.toString() + " sharedFile " + sharedFile?.file.getAbsolutePath() + " error: $error"
-    }
-
+	SharedFile sharedFile
+	String error
 }

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

@@ -1,7 +1,6 @@
 package com.muwire.core.files
 
 import com.muwire.core.InfoHash
-import com.muwire.core.util.DataUtil
 
 import net.i2p.data.Base64
 
@@ -13,75 +12,72 @@ import java.security.NoSuchAlgorithmException
 
 class FileHasher {
 
-    /** max size of shared file is 128 GB */
-    public static final long MAX_SIZE = 0x1L << 37
-
-    /**
-     * @param size of the file to be shared
-     * @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) {
-        if (size <= 0x1 << 30)
-            return 17
-
-        for (int i = 31; i <= 37; i++) {
-            if (size <= 0x1L << i) {
-                return i-13
-            }
-        }
-
-        throw new IllegalArgumentException("File too large $size")
-    }
-
-    final MessageDigest digest
-
-    FileHasher() {
-        try {
-            digest = MessageDigest.getInstance("SHA-256")
-        } catch (NoSuchAlgorithmException impossible) {
-            digest = null
-            System.exit(1)
-        }
-    }
-
-    InfoHash hashFile(File file) {
-        final long length = file.length()
-        final int size = 0x1 << getPieceSize(length)
-        int numPieces = (int) (length / size)
-        if (numPieces * size < length)
-            numPieces++
-
-        def output = new ByteArrayOutputStream()
-        RandomAccessFile raf = new RandomAccessFile(file, "r")
-        try {
-            MappedByteBuffer buf
-            for (int i = 0; i < numPieces - 1; i++) {
-                buf = raf.getChannel().map(MapMode.READ_ONLY, ((long)size) * i, size)
-                digest.update buf
-                DataUtil.tryUnmap(buf)
-                output.write(digest.digest(), 0, 32)
-            }
-            def lastPieceLength = length - (numPieces - 1) * ((long)size)
-            buf = raf.getChannel().map(MapMode.READ_ONLY, length - lastPieceLength, lastPieceLength)
-            digest.update buf
-            output.write(digest.digest(), 0, 32)
-        } finally {
-            raf.close()
-        }
-
-        byte [] hashList = output.toByteArray()
-        InfoHash.fromHashList(hashList)
-    }
-
+	/** max size of shared file is 128 GB */
+	public static final long MAX_SIZE = 0x1L << 37
+	
+	/**
+	 * @param size of the file to be shared
+	 * @return the size of each piece in power of 2
+	 */
+	static int getPieceSize(long size) {
+		if (size <= 0x1 << 30)
+			return 17
+		
+		for (int i = 31; i <= 37; i++) {
+			if (size <= 0x1L << i) {
+				return i-13
+			}
+		}
+		
+		throw new IllegalArgumentException("File too large $size")
+	}
+	
+	final MessageDigest digest
+	
+	FileHasher() {
+		try {
+			digest = MessageDigest.getInstance("SHA-256")
+		} catch (NoSuchAlgorithmException impossible) {
+			digest = null
+			System.exit(1)
+		}
+	}
+	
+	InfoHash hashFile(File file) {
+		final long length = file.length()
+		final int size = 0x1 << getPieceSize(length)
+		int numPieces = (int) (length / size)
+		if (numPieces * size < length)
+			numPieces++
+			
+		def output = new ByteArrayOutputStream()
+		RandomAccessFile raf = new RandomAccessFile(file, "r")
+		try {
+			MappedByteBuffer buf
+			for (int i = 0; i < numPieces - 1; i++) {
+				buf = raf.getChannel().map(MapMode.READ_ONLY, ((long)size) * i, size)
+				digest.update buf
+				output.write(digest.digest(), 0, 32)
+			}
+			def lastPieceLength = length - (numPieces - 1) * ((long)size)
+			buf = raf.getChannel().map(MapMode.READ_ONLY, length - lastPieceLength, lastPieceLength)
+			digest.update buf
+			output.write(digest.digest(), 0, 32)
+		} finally {
+			raf.close()
+		}
+		
+		byte [] hashList = output.toByteArray()
+		InfoHash.fromHashList(hashList)
+	}
+    
     public static void main(String[] args) {
         if (args.length != 1) {
             println "This utility computes an infohash of a file"
             println "Pass absolute path to a file as an argument"
             System.exit(1)
         }
-
+        
         def file = new File(args[0])
         file = file.getAbsoluteFile()
         def hasher = new FileHasher()

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

@@ -1,15 +0,0 @@
-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,199 +8,131 @@ 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<File, SharedFile> fileToSharedFile = Collections.synchronizedMap(new HashMap<>())
-    final Map<String, Set<File>> nameToFiles = new HashMap<>()
-    final Map<String, Set<File>> commentToFile = new HashMap<>()
-    final SearchIndex index = new SearchIndex()
-
-    FileManager(EventBus eventBus, MuWireSettings settings) {
+	final Map<InfoHash, Set<SharedFile>> rootToFiles = Collections.synchronizedMap(new HashMap<>())
+	final Map<File, SharedFile> fileToSharedFile = Collections.synchronizedMap(new HashMap<>())
+	final Map<String, Set<File>> nameToFiles = new HashMap<>()
+	final SearchIndex index = new SearchIndex()
+	
+	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) {
-        addToIndex(e.loadedFile)
-    }
-
+	
+	void onFileLoadedEvent(FileLoadedEvent e) {
+		addToIndex(e.loadedFile)
+	}
+	
     void onFileDownloadedEvent(FileDownloadedEvent e) {
         if (settings.shareDownloadedFiles) {
             addToIndex(e.downloadedFile)
         }
     }
-
-    private void addToIndex(SharedFile sf) {
+	
+	private void addToIndex(SharedFile sf) {
         log.info("Adding shared file " + sf.getFile())
-        InfoHash infoHash = sf.getInfoHash()
-        Set<SharedFile> existing = rootToFiles.get(infoHash)
-        if (existing == null) {
+		InfoHash infoHash = sf.getInfoHash()
+		Set<SharedFile> existing = rootToFiles.get(infoHash)
+		if (existing == null) {
             log.info("adding new root")
-            existing = new HashSet<>()
-            rootToFiles.put(infoHash, existing);
-        }
-        existing.add(sf)
-        fileToSharedFile.put(sf.file, sf)
-
-        String name = sf.getFile().getName()
-        Set<File> existingFiles = nameToFiles.get(name)
-        if (existingFiles == null) {
-            existingFiles = new HashSet<>()
-            nameToFiles.put(name, existingFiles)
-        }
-        existingFiles.add(sf.getFile())
-
-        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())
-        }
-        
-        index.add(name)
-    }
-
-    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)
-            }
-        }
-
-        fileToSharedFile.remove(sf.file)
-
-        String name = sf.getFile().getName()
-        Set<File> existingFiles = nameToFiles.get(name)
-        if (existingFiles != null) {
-            existingFiles.remove(sf.file)
-            if (existingFiles.isEmpty()) {
-                nameToFiles.remove(name)
-            }
-        }
-        
-        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() {
+			existing = new HashSet<>()
+			rootToFiles.put(infoHash, existing);
+		}
+		existing.add(sf)
+		fileToSharedFile.put(sf.file, sf)
+		
+		String name = sf.getFile().getName()
+		Set<File> existingFiles = nameToFiles.get(name)
+		if (existingFiles == null) {
+			existingFiles = new HashSet<>()
+			nameToFiles.put(name, existingFiles)
+		}
+		existingFiles.add(sf.getFile())
+		
+		index.add(name)
+	}
+	
+	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)
+			}
+		}
+		
+		fileToSharedFile.remove(sf.file)
+		
+		String name = sf.getFile().getName()
+		Set<File> existingFiles = nameToFiles.get(name)
+		if (existingFiles != null) {
+			existingFiles.remove(sf.file)
+			if (existingFiles.isEmpty()) {
+				nameToFiles.remove(name)
+			}
+		}
+		
+		index.remove(name)
+	}
+	
+	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) {
-        // hash takes precedence
-        ResultsEvent re = null
-        if (e.searchHash != null) {
+	
+	void onSearchEvent(SearchEvent e) {
+		// hash takes precedence
+		ResultsEvent re = 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())
-                re = new ResultsEvent(results: found.asList(), uuid: e.uuid, searchEvent: e)
-        } else {
-            def names = index.search e.searchTerms
-            Set<File> files = new HashSet<>()
-            names.each { 
-                files.addAll nameToFiles.getOrDefault(it, [])
-                if (e.searchComments)
-                    files.addAll commentToFile.getOrDefault(it, [])
-            }
-            Set<SharedFile> sharedFiles = new HashSet<>()
-            files.each { sharedFiles.add fileToSharedFile[it] }
+			if (found != null && !found.isEmpty())
+				re = new ResultsEvent(results: found.asList(), uuid: e.uuid, searchEvent: e)
+		} else {
+			def names = index.search e.searchTerms
+			Set<File> files = new HashSet<>()
+			names.each { files.addAll nameToFiles.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 (re != null)
-            eventBus.publish(re)
-    }
-
+			if (!sharedFiles.isEmpty())
+				re = new ResultsEvent(results: sharedFiles.asList(), uuid: e.uuid, searchEvent: e)
+			
+		}
+		
+		if (re != null)
+			eventBus.publish(re)
+	}
+    
     private static Set<SharedFile> filter(Set<SharedFile> files, boolean oob) {
         if (!oob)
             return files
         Set<SharedFile> rv = new HashSet<>()
-        files.each {
+        files.each { 
             if (it.getPieceSize() != 0)
                 rv.add(it)
         }
         rv
     }
-
-    void onDirectoryUnsharedEvent(DirectoryUnsharedEvent e) {
-        e.directory.listFiles().each {
-            if (it.isDirectory())
-                eventBus.publish(new DirectoryUnsharedEvent(directory : it))
-            else {
-                SharedFile sf = fileToSharedFile.get(it)
-                if (sf != null)
-                    eventBus.publish(new FileUnsharedEvent(unsharedFile : sf))
-            }
-        }
-    }
 }

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

@@ -4,10 +4,5 @@ import com.muwire.core.Event
 
 class FileSharedEvent extends Event {
 
-    File file
-
-    @Override
-    public String toString() {
-        return super.toString() + " file: "+file.getAbsolutePath()
-    }
+	File file
 }

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,60 +4,44 @@ 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 EventBus eventBus
+	final FileHasher hasher
+	final EventBus eventBus
     final FileManager fileManager
-    final Set<File> hashed = new HashSet<>()
-    final MuWireSettings settings
-    Executor executor
-
-    HasherService(FileHasher hasher, EventBus eventBus, FileManager fileManager, MuWireSettings settings) {
-        this.hasher = hasher
-        this.eventBus = eventBus
+	Executor executor
+	
+	HasherService(FileHasher hasher, EventBus eventBus, FileManager fileManager) {
+		this.hasher = hasher
+		this.eventBus = eventBus
         this.fileManager = fileManager
-        this.settings = settings
-    }
-
-    void start() {
-        executor = Executors.newSingleThreadExecutor()
-    }
-
-    void onFileSharedEvent(FileSharedEvent evt) {
-        File canonical = evt.file.getCanonicalFile()
-        if (!settings.shareHiddenFiles && canonical.isHidden())
+	}
+	
+	void start() {
+		executor = Executors.newSingleThreadExecutor()
+	}
+	
+	void onFileSharedEvent(FileSharedEvent evt) {
+        if (fileManager.fileToSharedFile.containsKey(evt.file))
             return
-        if (fileManager.fileToSharedFile.containsKey(canonical)) 
-            return
-        if (hashed.add(canonical))
-            executor.execute( { -> process(canonical) } as Runnable)
-    }
-    
-    void onFileUnsharedEvent(FileUnsharedEvent evt) {
-        hashed.remove(evt.unsharedFile.file)
-    }
-    
-    void onDirectoryUnsharedEvent(DirectoryUnsharedEvent evt) {
-        hashed.remove(evt.directory)
-    }
-
-    private void process(File f) {
-        if (f.isDirectory()) {
-            f.listFiles().each {eventBus.publish new FileSharedEvent(file: it) }
-        } 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())))
-            }
-        }
-    }
+		executor.execute( { -> process(evt.file) } as Runnable)
+	}
+	
+	private void process(File f) {
+		f = f.getCanonicalFile()
+		if (f.isDirectory()) {
+			f.listFiles().each {onFileSharedEvent new FileSharedEvent(file: it) }
+		} 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 {
+				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,9 +3,6 @@ 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
 
@@ -14,7 +11,6 @@ import com.muwire.core.EventBus
 import com.muwire.core.InfoHash
 import com.muwire.core.Service
 import com.muwire.core.SharedFile
-import com.muwire.core.UILoadedEvent
 import com.muwire.core.util.DataUtil
 
 import groovy.json.JsonOutput
@@ -26,148 +22,135 @@ import net.i2p.data.Destination
 @Log
 class PersisterService extends Service {
 
-    final File location
-    final EventBus listener
-    final int interval
-    final Timer timer
-    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) {
-        this.location = location
-        this.listener = listener
-        this.interval = interval
-        this.fileManager = fileManager
-        timer = new Timer("file persister timer", true)
-    }
-
-    void stop() {
-        timer.cancel()
-    }
-
-    void onUILoadedEvent(UILoadedEvent e) {
-        timer.schedule({load()} as TimerTask, 1)
-    }
-    
-    void onUIPersistFilesEvent(UIPersistFilesEvent e) {
-        persistFiles()
-    }
-
-    void load() {
-        Thread.currentThread().setPriority(Thread.MIN_PRIORITY)
-
-        if (location.exists() && location.isFile()) {
-            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) {
+	final File location
+	final EventBus listener
+	final int interval
+	final Timer timer
+	final FileManager fileManager
+	
+	PersisterService(File location, EventBus listener, int interval, FileManager fileManager) {
+		this.location = location
+		this.listener = listener
+		this.interval = interval
+		this.fileManager = fileManager
+		timer = new Timer("file persister", true)
+	}
+	
+	void start() {
+		timer.schedule({load()} as TimerTask, 1)
+	}
+	
+	void stop() {
+		timer.cancel()
+	}
+	
+	void load() {
+		if (location.exists() && location.isFile()) {
+			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
-                            loaded++
-                            if (loaded % 10 == 0)
-                                Thread.sleep(20)
-                        }
-                    }
-                }
+							listener.publish event
+						}
+					}
+				}
                 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)
-        loaded = true
-    }
-
-    private static FileLoadedEvent fromJson(def json) {
-        if (json.file == null || json.length == null || json.infoHash == null || json.hashList == null)
-            throw new IllegalArgumentException()
-        if (!(json.hashList instanceof List))
-            throw new IllegalArgumentException()
-
-        def file = new File(DataUtil.readi18nString(Base64.decode(json.file)))
-        file = file.getCanonicalFile()
-        if (!file.exists() || file.isDirectory())
-            return null
-        long length = Long.valueOf(json.length)
-        if (length != file.length())
-            return null
-
-        List hashList = (List) json.hashList
-        ByteArrayOutputStream baos = new ByteArrayOutputStream()
-        hashList.each {
-            byte [] hash = Base64.decode it.toString()
-            if (hash == null)
-                throw new IllegalArgumentException()
-            baos.write hash
-        }
-        byte[] hashListBytes = baos.toByteArray()
-
-        InfoHash ih = InfoHash.fromHashList(hashListBytes)
-        byte [] root = Base64.decode(json.infoHash.toString())
-        if (root == null)
-            throw new IllegalArgumentException()
-        if (!Arrays.equals(root, ih.getRoot()))
-            return null
-
+		timer.schedule({persistFiles()} as TimerTask, 0, interval)
+		loaded = true
+	}
+	
+	private static FileLoadedEvent fromJson(def json) {
+		if (json.file == null || json.length == null || json.infoHash == null || json.hashList == null)
+			throw new IllegalArgumentException()
+		if (!(json.hashList instanceof List))
+			throw new IllegalArgumentException()
+			
+		def file = new File(DataUtil.readi18nString(Base64.decode(json.file)))
+		file = file.getCanonicalFile()
+		if (!file.exists() || file.isDirectory())
+			return null
+		long length = Long.valueOf(json.length)
+		if (length != file.length())
+			return null
+		
+		List hashList = (List) json.hashList
+		ByteArrayOutputStream baos = new ByteArrayOutputStream()
+		hashList.each {
+			byte [] hash = Base64.decode it.toString()
+			if (hash == null)
+				throw new IllegalArgumentException()
+			baos.write hash
+		}
+		byte[] hashListBytes = baos.toByteArray()
+		
+		InfoHash ih = InfoHash.fromHashList(hashListBytes)
+		byte [] root = Base64.decode(json.infoHash.toString())
+		if (root == null)
+			throw new IllegalArgumentException()
+		if (!Arrays.equals(root, ih.getRoot()))
+			return null
+			
         int pieceSize = 0
         if (json.pieceSize != null)
             pieceSize = json.pieceSize
-
+            
         if (json.sources != null) {
-            List sources = (List)json.sources
-            Set<Destination> sourceSet = sources.stream().map({d -> new Destination(d.toString())}).collect Collectors.toSet()
-            DownloadedFile df = new DownloadedFile(file, ih, pieceSize, sourceSet)
-            df.setComment(json.comment)
-            return new FileLoadedEvent(loadedFile : df)
-        }
-
-
-        SharedFile sf = new SharedFile(file, ih, pieceSize)
-        sf.setComment(json.comment)
-        return new FileLoadedEvent(loadedFile: sf)
-
-    }
-
-    private void persistFiles() {
-        persisterExecutor.submit( {
-            def sharedFiles = fileManager.getSharedFiles()
-
-            File tmp = File.createTempFile("muwire-files", "tmp")
-            tmp.deleteOnExit()
-            tmp.withPrintWriter { writer ->
-                sharedFiles.each { k, v ->
-                    def json = toJson(k,v)
-                    json = JsonOutput.toJson(json)
-                    writer.println json
-                }
-            }
-            Files.copy(tmp.toPath(), location.toPath(), StandardCopyOption.REPLACE_EXISTING)
-            tmp.delete()
-        } as Runnable)
-    }
-
-    private def toJson(File f, SharedFile sf) {
-        def json = [:]
-        json.file = sf.getB64EncodedFileName()
-        json.length = sf.getCachedLength()
-        InfoHash ih = sf.getInfoHash()
-        json.infoHash = sf.getB64EncodedHashRoot()
+			List sources = (List)json.sources
+			Set<Destination> sourceSet = sources.stream().map({d -> new Destination(d.toString())}).collect Collectors.toSet()
+			DownloadedFile df = new DownloadedFile(file, ih, pieceSize, sourceSet)
+			return new FileLoadedEvent(loadedFile : df)
+		}
+        
+		 
+		SharedFile sf = new SharedFile(file, ih, pieceSize)
+		return new FileLoadedEvent(loadedFile: sf)
+		
+	}
+	
+	private void persistFiles() {
+		def sharedFiles = fileManager.getSharedFiles()
+        
+        File tmp = File.createTempFile("muwire-files", "tmp")
+        tmp.deleteOnExit()
+		tmp.withPrintWriter { writer ->
+			sharedFiles.each { k, v ->
+				def json = toJson(k,v)
+				json = JsonOutput.toJson(json)
+				writer.println json
+			}
+		}
+        Files.copy(tmp.toPath(), location.toPath(), StandardCopyOption.REPLACE_EXISTING)
+        tmp.delete()
+	}
+	
+	private def toJson(File f, SharedFile sf) {
+		def json = [:]
+		json.file = Base64.encode DataUtil.encodei18nString(f.getCanonicalFile().toString())
+		json.length = f.length()
+		InfoHash ih = sf.getInfoHash()
+		json.infoHash = Base64.encode ih.getRoot()
         json.pieceSize = sf.getPieceSize()
-        json.hashList = sf.getB64EncodedHashList()
-        json.comment = sf.getComment()
-
-        if (sf instanceof DownloadedFile) {
-            json.sources = sf.sources.stream().map( {d -> d.toBase64()}).collect(Collectors.toList())
-        }
-
-        json
-    }
+		byte [] tmp = new byte [32]
+		json.hashList = []
+		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) {
+			json.sources = sf.sources.stream().map( {d -> d.toBase64()}).collect(Collectors.toList())
+		}
+		
+		json
+	}
 }

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

@@ -1,9 +0,0 @@
-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

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

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

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

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

@@ -4,25 +4,20 @@ import net.i2p.data.Destination
 
 class CacheServers {
 
-    private static final int TO_GIVE = 3
-    private static Set<Destination> CACHES = [
-            // 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==")
-        ]
+	private static final int TO_GIVE = 3
+	private static Set<Destination> CACHES = [
+			new Destination("Wddh2E6FyyXBF7SvUYHKdN-vjf3~N6uqQWNeBDTM0P33YjiQCOsyedrjmDZmWFrXUJfJLWnCb5bnKezfk4uDaMyj~uvDG~yvLVcFgcPWSUd7BfGgym-zqcG1q1DcM8vfun-US7YamBlmtC6MZ2j-~Igqzmgshita8aLPCfNAA6S6e2UMjjtG7QIXlxpMec75dkHdJlVWbzrk9z8Qgru3YIk0UztYgEwDNBbm9wInsbHhr3HtAfa02QcgRVqRN2PnQXuqUJs7R7~09FZPEviiIcUpkY3FeyLlX1sgQFBeGeA96blaPvZNGd6KnNdgfLgMebx5SSxC-N4KZMSMBz5cgonQF3~m2HHFRSI85zqZNG5X9bJN85t80ltiv1W1es8ZnQW4es11r7MrvJNXz5bmSH641yJIvS6qI8OJJNpFVBIQSXLD-96TayrLQPaYw~uNZ-eXaE6G5dYhiuN8xHsFI1QkdaUaVZnvDGfsRbpS5GtpUbBDbyLkdPurG0i7dN1wAAAA")
+		]
 
-    static List<Destination> getCacheServers() {
-        List<Destination> allCaches = new ArrayList<>(CACHES)
-        Collections.shuffle(allCaches)
-        if (allCaches.size() <= TO_GIVE)
-            return allCaches
-        allCaches[0..TO_GIVE-1]
-    }
-
-    static boolean isRegistered(Destination d) {
-        return CACHES.contains(d)
-    }
+	static List<Destination> getCacheServers() {
+		List<Destination> allCaches = new ArrayList<>(CACHES)
+		Collections.shuffle(allCaches)
+		if (allCaches.size() <= TO_GIVE)
+			return allCaches
+		allCaches[0..TO_GIVE-1]
+	}
+	
+	static boolean isRegistered(Destination d) {
+		return CACHES.contains(d)
+	}
 }

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

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

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

@@ -1,28 +0,0 @@
-package com.muwire.core.mesh
-
-import com.muwire.core.InfoHash
-import com.muwire.core.Persona
-import com.muwire.core.download.Pieces
-
-import net.i2p.data.Destination
-import net.i2p.util.ConcurrentHashSet
-
-class Mesh {
-    private final InfoHash infoHash
-    private final Set<Persona> sources = new ConcurrentHashSet<>()
-    private final Pieces pieces
-
-    Mesh(InfoHash infoHash, Pieces pieces) {
-        this.infoHash = infoHash
-        this.pieces = pieces
-    }
-
-    Set<Persona> getRandom(int n, Persona exclude) {
-        List<Persona> tmp = new ArrayList<>(sources)
-        tmp.remove(exclude)
-        Collections.shuffle(tmp)
-        if (tmp.size() < n)
-            return tmp
-        tmp[0..n-1]
-    }
-}

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

@@ -1,103 +0,0 @@
-package com.muwire.core.mesh
-
-import java.util.stream.Collectors
-
-import com.muwire.core.Constants
-import com.muwire.core.InfoHash
-import com.muwire.core.MuWireSettings
-import com.muwire.core.Persona
-import com.muwire.core.download.Pieces
-import com.muwire.core.download.SourceDiscoveredEvent
-import com.muwire.core.files.FileManager
-import com.muwire.core.util.DataUtil
-
-import groovy.json.JsonOutput
-import groovy.json.JsonSlurper
-import net.i2p.data.Base64
-
-class MeshManager {
-
-    private final Map<InfoHash, Mesh> meshes = Collections.synchronizedMap(new HashMap<>())
-    private final FileManager fileManager
-    private final File home
-    private final MuWireSettings settings
-
-    MeshManager(FileManager fileManager, File home, MuWireSettings settings) {
-        this.fileManager = fileManager
-        this.home = home
-        this.settings = settings
-        load()
-    }
-
-    Mesh get(InfoHash infoHash) {
-        meshes.get(infoHash)
-    }
-
-    Mesh getOrCreate(InfoHash infoHash, int nPieces, boolean sequential) {
-        synchronized(meshes) {
-            if (meshes.containsKey(infoHash))
-                return meshes.get(infoHash)
-            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)
-            }
-            Mesh rv = new Mesh(infoHash, pieces)
-            meshes.put(infoHash, rv)
-            return rv
-        }
-    }
-
-    void onSourceDiscoveredEvent(SourceDiscoveredEvent e) {
-        Mesh mesh = meshes.get(e.infoHash)
-        if (mesh == null)
-            return
-       mesh.sources.add(e.source)
-       save()
-    }
-
-    private void save() {
-        File meshFile = new File(home, "mesh.json")
-        synchronized(meshes) {
-            meshFile.withPrintWriter { writer ->
-                meshes.values().each { mesh ->
-                    def json = [:]
-                    json.timestamp = System.currentTimeMillis()
-                    json.infoHash = Base64.encode(mesh.infoHash.getRoot())
-                    json.sources = mesh.sources.stream().map({it.toBase64()}).collect(Collectors.toList())
-                    json.nPieces = mesh.pieces.nPieces
-                    json.xHave = DataUtil.encodeXHave(mesh.pieces.downloaded, mesh.pieces.nPieces)
-                    writer.println(JsonOutput.toJson(json))
-                }
-            }
-        }
-    }
-
-    private void load() {
-        File meshFile = new File(home, "mesh.json")
-        if (!meshFile.exists())
-            return
-        long now = System.currentTimeMillis()
-        JsonSlurper slurper = new JsonSlurper()
-        meshFile.eachLine {
-            def json = slurper.parseText(it)
-            if (now - json.timestamp > settings.meshExpiration * 60 * 1000)
-                return
-            InfoHash infoHash = new InfoHash(Base64.decode(json.infoHash))
-            Pieces pieces = new Pieces(json.nPieces, settings.downloadSequentialRatio)
-
-            Mesh mesh = new Mesh(infoHash, pieces)
-            json.sources.each { source ->
-                Persona persona = new Persona(new ByteArrayInputStream(Base64.decode(source)))
-                mesh.sources.add(persona)
-            }
-
-            if (json.xHave != null)
-                DataUtil.decodeXHave(json.xHave).each { pieces.markDownloaded(it) }
-
-            if (!mesh.sources.isEmpty())
-                meshes.put(infoHash, mesh)
-        }
-    }
-}

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

@@ -1,87 +0,0 @@
-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

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

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

@@ -1,8 +0,0 @@
-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
-    Destination leaf
-
-    @Override
-    public String toString() {
-        "DeleteEvent ${super.toString()} infoHash:${Base32.encode(infoHash)} leaf:${leaf.toBase32()}"
-    }
+	byte [] infoHash
+	Destination leaf
+	
+	@Override
+	public String toString() {
+		"DeleteEvent ${super.toString()} infoHash:${Base32.encode(infoHash)} leaf:${leaf.toBase32()}"
+	}
 }

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

@@ -21,5 +21,5 @@ class InvalidSearchResultException extends Exception {
         super(cause);
         // TODO Auto-generated constructor stub
     }
-
+    
 }

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

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

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

@@ -6,12 +6,12 @@ import com.muwire.core.Persona
 import net.i2p.data.Destination
 
 class QueryEvent extends Event {
-
+	
     SearchEvent searchEvent
-    boolean firstHop
-    Destination replyTo
+	boolean firstHop
+	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
-    UUID uuid
+	SharedFile[] results
+	UUID uuid
 }

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

@@ -1,7 +1,5 @@
 package com.muwire.core.search
 
-import java.util.stream.Collectors
-
 import javax.naming.directory.InvalidSearchControlsException
 
 import com.muwire.core.InfoHash
@@ -9,7 +7,6 @@ import com.muwire.core.Persona
 import com.muwire.core.util.DataUtil
 
 import net.i2p.data.Base64
-import net.i2p.data.Destination
 
 class ResultsParser {
     public static UIResultEvent parse(Persona p, UUID uuid, def json) throws InvalidSearchResultException {
@@ -26,7 +23,7 @@ class ResultsParser {
         }
 
     }
-
+    
     private static parseV1(Persona p, UUID uuid, def json) {
         if (json.name == null)
             throw new InvalidSearchResultException("name missing")
@@ -55,19 +52,18 @@ class ResultsParser {
             InfoHash parsedIH = InfoHash.fromHashList(hashList)
             if (parsedIH.getRoot() != infoHash)
                 throw new InvalidSearchControlsException("infohash root doesn't match")
-
+            
              return new UIResultEvent( sender : p,
                  name : name,
                  size : size,
                  infohash : parsedIH,
                  pieceSize : pieceSize,
-                 sources : Collections.emptySet(),
                  uuid : uuid)
         } catch (Exception e) {
             throw new InvalidSearchResultException("parsing search result failed",e)
         }
     }
-
+    
     private static UIResultEvent parseV2(Persona p, UUID uuid, def json) {
         if (json.name == null)
             throw new InvalidSearchResultException("name missing")
@@ -86,27 +82,11 @@ class ResultsParser {
             if (infoHash.length != InfoHash.SIZE)
                 throw new InvalidSearchResultException("invalid infohash size $infoHash.length")
             int pieceSize = json.pieceSize
-
-            Set<Destination> sources = Collections.emptySet()
-            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,7 +4,6 @@ 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
@@ -12,14 +11,9 @@ import java.util.concurrent.Executor
 import java.util.concurrent.Executors
 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
@@ -28,9 +22,9 @@ import net.i2p.data.Destination
 
 @Log
 class ResultsSender {
-
+    
     private static final AtomicInteger THREAD_NO = new AtomicInteger()
-
+    
     private final Executor executor = Executors.newCachedThreadPool(
         new ThreadFactory() {
             @Override
@@ -41,131 +35,89 @@ class ResultsSender {
                 rv
             }
         })
-
+    
     private final I2PConnector connector
     private final Persona me
     private final EventBus eventBus
-    private final MuWireSettings settings
-
-    ResultsSender(EventBus eventBus, I2PConnector connector, Persona me, MuWireSettings settings) {
+    
+    ResultsSender(EventBus eventBus, I2PConnector connector, Persona me) {
         this.connector = connector;
         this.eventBus = eventBus
         this.me = me
-        this.settings = settings
     }
-
-    void sendResults(UUID uuid, SharedFile[] results, Destination target, boolean oobInfohash, boolean compressedResults) {
+    
+    void sendResults(UUID uuid, SharedFile[] results, Destination target, boolean oobInfohash) {
         log.info("Sending $results.length results for uuid $uuid to ${target.toBase32()} oobInfohash : $oobInfohash")
         if (target.equals(me.destination)) {
-            def uiResultEvents = []
-            results.each {
+            results.each { 
                 long length = it.getFile().length()
                 int pieceSize = it.getPieceSize()
                 if (pieceSize == 0)
                     pieceSize = FileHasher.getPieceSize(length)
-                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,
-                    comment : comment
+                    uuid : uuid
                     )
-                uiResultEvents << uiResultEvent
+                    eventBus.publish(uiResultEvent)
             }
-            eventBus.publish(new UIResultBatchEvent(uuid : uuid, results : uiResultEvents))
         } else {
-            executor.execute(new ResultSendJob(uuid : uuid, results : results,
-                target: target, oobInfohash : oobInfohash, compressedResults : compressedResults))
+            executor.execute(new ResultSendJob(uuid : uuid, results : results, 
+                target: target, oobInfohash : oobInfohash))
         }
     }
-
+    
     private class ResultSendJob implements Runnable {
         UUID uuid
         SharedFile [] results
         Destination target
         boolean oobInfohash
-        boolean compressedResults
-
+        
         @Override
         public void run() {
+            byte [] tmp = new byte[InfoHash.SIZE]
+            JsonOutput jsonOutput = new JsonOutput()
+            Endpoint endpoint = null;
             try {
-                JsonOutput jsonOutput = new JsonOutput()
-                Endpoint endpoint = null;
-                if (!compressedResults) {
-                    try {
-                        endpoint = connector.connect(target)
-                        DataOutputStream os = new DataOutputStream(endpoint.getOutputStream())
-                        os.write("POST $uuid\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
-                        me.write(os)
-                        os.writeShort((short)results.length)
-                        results.each {
-                            def obj = sharedFileToObj(it, settings.browseFiles)
-                            def json = jsonOutput.toJson(obj)
-                            os.writeShort((short)json.length())
-                            os.write(json.getBytes(StandardCharsets.US_ASCII))
+                endpoint = connector.connect(target)
+                DataOutputStream os = new DataOutputStream(endpoint.getOutputStream())
+                os.write("POST $uuid\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
+                me.write(os)
+                os.writeShort((short)results.length)
+                results.each {
+                    byte [] name = it.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 = 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)
                         }
-                        os.flush()
-                    } finally {
-                        endpoint?.close()
-                    }
-                } else {
-                    try {
-                        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()
+                        obj.hashList = hashListB64
                     }
+                    def json = jsonOutput.toJson(obj)
+                    os.writeShort((short)json.length())
+                    os.write(json.getBytes(StandardCharsets.US_ASCII))
                 }
-            } catch (Exception e) {
-                log.log(Level.WARNING, "problem sending results",e)
+                os.flush()
+            } finally {
+                endpoint?.close()
             }
         }
     }
-    
-    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,17 +5,15 @@ import com.muwire.core.InfoHash
 
 class SearchEvent extends Event {
 
-    List<String> searchTerms
-    byte [] searchHash
-    UUID uuid
+	List<String> searchTerms
+	byte [] searchHash
+	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 searchComments:$searchComments compressedResults:$compressedResults"
+        "searchTerms: $searchTerms searchHash:$infoHash, uuid:$uuid oobInfohash:$oobInfohash"
     }
 }

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

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

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

@@ -8,17 +8,17 @@ import net.i2p.data.Destination
 
 @Log
 public class SearchManager {
-
+    
     private static final int EXPIRE_TIME = 60 * 1000 * 1000
     private static final int CHECK_INTERVAL = 60 * 1000
-
+    
     private final EventBus eventBus
     private final Persona me
     private final ResultsSender resultsSender
     private final Map<UUID, QueryEvent> responderAddress = Collections.synchronizedMap(new HashMap<>())
-
+    
     SearchManager(){}
-
+    
     SearchManager(EventBus eventBus, Persona me, ResultsSender resultsSender) {
         this.eventBus = eventBus
         this.me = me
@@ -26,7 +26,7 @@ public class SearchManager {
         Timer timer = new Timer("query-expirer", true)
         timer.schedule({cleanup()} as TimerTask, CHECK_INTERVAL, CHECK_INTERVAL)
     }
-
+    
     void onQueryEvent(QueryEvent event) {
         if (responderAddress.containsKey(event.searchEvent.uuid)) {
             log.info("Dropping duplicate search uuid $event.searchEvent.uuid")
@@ -35,7 +35,7 @@ public class SearchManager {
         responderAddress.put(event.searchEvent.uuid, event)
         eventBus.publish(event.searchEvent)
     }
-
+    
     void onResultsEvent(ResultsEvent event) {
         Destination target = responderAddress.get(event.uuid)?.replyTo
         if (target == null)
@@ -44,13 +44,13 @@ public class SearchManager {
             log.info("No results for search uuid $event.uuid")
             return
         }
-        resultsSender.sendResults(event.uuid, event.results, target, event.searchEvent.oobInfohash, event.searchEvent.compressedResults)
+        resultsSender.sendResults(event.uuid, event.results, target, event.searchEvent.oobInfohash)
     }
-
+    
     boolean hasLocalSearch(UUID uuid) {
         me.destination.equals(responderAddress.get(uuid)?.replyTo)
     }
-
+    
     private void cleanup() {
         final long now = System.currentTimeMillis()
         synchronized(responderAddress) {

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

@@ -1,8 +0,0 @@
-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/UIResultBatchEvent.groovy

@@ -1,8 +0,0 @@
-package com.muwire.core.search
-
-import com.muwire.core.Event
-
-class UIResultBatchEvent extends Event {
-    UUID uuid
-    UIResultEvent[] results
-}

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

@@ -4,19 +4,14 @@ import com.muwire.core.Event
 import com.muwire.core.InfoHash
 import com.muwire.core.Persona
 
-import net.i2p.data.Destination
-
 class UIResultEvent extends Event {
     Persona sender
-    Set<Destination> sources
     UUID uuid
     String name
     long size
     InfoHash infohash
     int pieceSize
-    String comment
-    boolean browse
-
+    
     @Override
     public String toString() {
         super.toString() + "name:$name size:$size sender:${sender.getHumanReadableName()} pieceSize $pieceSize"

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

@@ -18,5 +18,5 @@ class UnexpectedResultsException extends Exception {
     public UnexpectedResultsException(String message) {
         super(message);
     }
-
+    
 }

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
-    byte [] infoHash
-    Destination leaf
-
-    @Override
-    public String toString() {
-        "UpsertEvent ${super.toString()} names:$names infoHash:${Base32.encode(infoHash)} leaf:${leaf.toBase32()}"
-    }
+	Set<String> names
+	byte [] infoHash
+	Destination leaf
+	
+	@Override
+	public String toString() {
+		"UpsertEvent ${super.toString()} names:$names infoHash:${Base32.encode(infoHash)} leaf:${leaf.toBase32()}"
+	}
 }

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

@@ -1,31 +0,0 @@
-package com.muwire.core.trust
-
-import java.util.concurrent.ConcurrentHashMap
-
-import com.muwire.core.Persona
-
-import net.i2p.util.ConcurrentHashSet
-
-class RemoteTrustList {
-    public enum Status { NEW, UPDATING, UPDATED, UPDATE_FAILED }
-
-    private final Persona persona
-    private final Set<Persona> good, bad
-    volatile long timestamp
-    volatile boolean forceUpdate
-    Status status = Status.NEW
-
-    RemoteTrustList(Persona persona) {
-        this.persona = persona
-        good = new ConcurrentHashSet<>()
-        bad = new ConcurrentHashSet<>()
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (!(o instanceof RemoteTrustList))
-            return false
-        RemoteTrustList other = (RemoteTrustList)o
-        persona == other.persona
-    }
-}

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

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

@@ -1,161 +0,0 @@
-package com.muwire.core.trust
-
-import java.nio.charset.StandardCharsets
-import java.util.concurrent.ConcurrentHashMap
-import java.util.concurrent.ExecutorService
-import java.util.concurrent.Executors
-import java.util.logging.Level
-
-import com.muwire.core.EventBus
-import com.muwire.core.MuWireSettings
-import com.muwire.core.Persona
-import com.muwire.core.UILoadedEvent
-import com.muwire.core.connection.Endpoint
-import com.muwire.core.connection.I2PConnector
-import com.muwire.core.util.DataUtil
-
-import groovy.util.logging.Log
-import net.i2p.data.Destination
-
-@Log
-class TrustSubscriber {
-    private final EventBus eventBus
-    private final I2PConnector i2pConnector
-    private final MuWireSettings settings
-
-    private final Map<Destination, RemoteTrustList> remoteTrustLists = new ConcurrentHashMap<>()
-
-    private final Object waitLock = new Object()
-    private volatile boolean shutdown
-    private volatile Thread thread
-    private final ExecutorService updateThreads = Executors.newCachedThreadPool()
-
-    TrustSubscriber(EventBus eventBus, I2PConnector i2pConnector, MuWireSettings settings) {
-        this.eventBus = eventBus
-        this.i2pConnector = i2pConnector
-        this.settings = settings
-    }
-
-    void onUILoadedEvent(UILoadedEvent e) {
-        thread = new Thread({checkLoop()} as Runnable, "trust-subscriber")
-        thread.setDaemon(true)
-        thread.start()
-    }
-
-    void stop() {
-        shutdown = true
-        thread?.interrupt()
-        updateThreads.shutdownNow()
-    }
-
-    void onTrustSubscriptionEvent(TrustSubscriptionEvent e) {
-        if (!e.subscribe) {
-            remoteTrustLists.remove(e.persona.destination)
-        } else {
-            RemoteTrustList trustList = remoteTrustLists.putIfAbsent(e.persona.destination, new RemoteTrustList(e.persona))
-            trustList?.forceUpdate = true
-            synchronized(waitLock) {
-                waitLock.notify()
-            }
-        }
-    }
-
-    private void checkLoop() {
-        try {
-            while(!shutdown) {
-                synchronized(waitLock) {
-                    waitLock.wait(60 * 1000)
-                }
-                final long now = System.currentTimeMillis()
-                remoteTrustLists.values().each { trustList ->
-                    if (trustList.status == RemoteTrustList.Status.UPDATING)
-                        return
-                    if (!trustList.forceUpdate &&
-                        now - trustList.timestamp < settings.trustListInterval * 60 * 60 * 1000)
-                        return
-                    trustList.forceUpdate = false
-                    updateThreads.submit(new UpdateJob(trustList))
-                }
-            }
-        } catch (InterruptedException e) {
-            if (!shutdown)
-                throw e
-        }
-    }
-
-    private class UpdateJob implements Runnable {
-
-        private final RemoteTrustList trustList
-
-        UpdateJob(RemoteTrustList trustList) {
-            this.trustList = trustList
-        }
-
-        public void run() {
-            trustList.status = RemoteTrustList.Status.UPDATING
-            eventBus.publish(new TrustSubscriptionUpdatedEvent(trustList : trustList))
-            if (check(trustList, System.currentTimeMillis()))
-                trustList.status = RemoteTrustList.Status.UPDATED
-            else
-                trustList.status = RemoteTrustList.Status.UPDATE_FAILED
-            eventBus.publish(new TrustSubscriptionUpdatedEvent(trustList : trustList))
-        }
-    }
-
-    private boolean check(RemoteTrustList trustList, long now) {
-        log.info("fetching trust list from ${trustList.persona.getHumanReadableName()}")
-        Endpoint endpoint = null
-        try {
-            endpoint = i2pConnector.connect(trustList.persona.destination)
-            OutputStream os = endpoint.getOutputStream()
-            InputStream is = endpoint.getInputStream()
-            os.write("TRUST\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
-            os.flush()
-
-            String codeString = DataUtil.readTillRN(is)
-            int space = codeString.indexOf(' ')
-            if (space > 0)
-                codeString = codeString.substring(0,space)
-            int code = Integer.parseInt(codeString.trim())
-
-            if (code != 200) {
-                log.info("couldn't fetch trust list, code $code")
-                return false
-            }
-
-            // swallow any headers
-            String header
-            while (( header = DataUtil.readTillRN(is)) != "");
-
-            DataInputStream dis = new DataInputStream(is)
-
-            Set<Persona> good = new HashSet<>()
-            int nGood = dis.readUnsignedShort()
-            for (int i = 0; i < nGood; i++) {
-                Persona p = new Persona(dis)
-                good.add(p)
-            }
-
-            Set<Persona> bad = new HashSet<>()
-            int nBad = dis.readUnsignedShort()
-            for (int i = 0; i < nBad; i++) {
-                Persona p = new Persona(dis)
-                bad.add(p)
-            }
-
-            trustList.timestamp = now
-            trustList.good.clear()
-            trustList.good.addAll(good)
-            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/trust/TrustSubscriptionEvent.groovy

@@ -1,9 +0,0 @@
-package com.muwire.core.trust
-
-import com.muwire.core.Event
-import com.muwire.core.Persona
-
-class TrustSubscriptionEvent extends Event {
-    Persona persona
-    boolean subscribe
-}

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

@@ -1,7 +0,0 @@
-package com.muwire.core.trust
-
-import com.muwire.core.Event
-
-class TrustSubscriptionUpdatedEvent extends Event {
-    RemoteTrustList trustList
-}

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

@@ -3,15 +3,7 @@ package com.muwire.core.update
 import java.util.logging.Level
 
 import com.muwire.core.EventBus
-import com.muwire.core.InfoHash
 import com.muwire.core.MuWireSettings
-import com.muwire.core.Persona
-import com.muwire.core.download.UIDownloadEvent
-import com.muwire.core.files.FileDownloadedEvent
-import com.muwire.core.files.FileManager
-import com.muwire.core.search.QueryEvent
-import com.muwire.core.search.SearchEvent
-import com.muwire.core.search.UIResultBatchEvent
 
 import groovy.json.JsonOutput
 import groovy.json.JsonSlurper
@@ -21,7 +13,6 @@ import net.i2p.client.I2PSessionMuxedListener
 import net.i2p.client.SendMessageOptions
 import net.i2p.client.datagram.I2PDatagramDissector
 import net.i2p.client.datagram.I2PDatagramMaker
-import net.i2p.data.Base64
 import net.i2p.util.VersionComparator
 
 @Log
@@ -30,54 +21,28 @@ class UpdateClient {
     final I2PSession session
     final String myVersion
     final MuWireSettings settings
-    final FileManager fileManager
-    final Persona me
-
+    
     private final Timer timer
-
+    
     private long lastUpdateCheckTime
-
-    private volatile InfoHash updateInfoHash
-    private volatile String version, signer
-    private volatile boolean updateDownloading
-
-    UpdateClient(EventBus eventBus, I2PSession session, String myVersion, MuWireSettings settings, FileManager fileManager, Persona me) {
+    
+    UpdateClient(EventBus eventBus, I2PSession session, String myVersion, MuWireSettings settings) {
         this.eventBus = eventBus
         this.session = session
         this.myVersion = myVersion
         this.settings = settings
-        this.fileManager = fileManager
-        this.me = me
         timer = new Timer("update-client",true)
     }
-
+    
     void start() {
         session.addMuxedSessionListener(new Listener(), I2PSession.PROTO_DATAGRAM, 2)
         timer.schedule({checkUpdate()} as TimerTask, 60000, 60 * 60 * 1000)
     }
-
+    
     void stop() {
         timer.cancel()
     }
-
-    void onUIResultBatchEvent(UIResultBatchEvent results) {
-        if (results.results[0].infohash != updateInfoHash)
-            return
-        if (updateDownloading)
-            return
-        updateDownloading = true
-        def file = new File(settings.downloadLocation, results.results[0].name)
-        def downloadEvent = new UIDownloadEvent(result: results.results[0], sources : results.results[0].sources, target : file)
-        eventBus.publish(downloadEvent)
-    }
-
-    void onFileDownloadedEvent(FileDownloadedEvent e) {
-        if (e.downloadedFile.infoHash != updateInfoHash)
-            return
-        updateDownloading = false
-        eventBus.publish(new UpdateDownloadedEvent(version : version, signer : signer))
-    }
-
+    
     private void checkUpdate() {
         final long now = System.currentTimeMillis()
         if (lastUpdateCheckTime > 0) {
@@ -85,20 +50,20 @@ class UpdateClient {
                 return
         }
         lastUpdateCheckTime = now
-
+    
         log.info("checking for update")
-
+        
         def ping = [version : 1, myVersion : myVersion]
         ping = JsonOutput.toJson(ping)
         def maker = new I2PDatagramMaker(session)
         ping = maker.makeI2PDatagram(ping.bytes)
-        def options = new SendMessageOptions()
+        def options = new SendMessageOptions() 
         options.setSendLeaseSet(true)
-        session.sendMessage(UpdateServers.UPDATE_SERVER, ping, 0, ping.length, I2PSession.PROTO_DATAGRAM, 2, 0, options)
+        session.sendMessage(UpdateServers.UPDATE_SERVER, ping, 0, ping.length, I2PSession.PROTO_DATAGRAM, 2, 0, options)   
     }
-
+    
     class Listener implements I2PSessionMuxedListener {
-
+        
         final JsonSlurper slurper = new JsonSlurper()
 
         @Override
@@ -111,7 +76,7 @@ class UpdateClient {
                 log.warning "Received unexpected protocol $proto"
                 return
             }
-
+            
             def payload = session.receiveMessage(msgId)
             def dissector = new I2PDatagramDissector()
             try {
@@ -121,53 +86,29 @@ class UpdateClient {
                     log.warning("received something not from update server " + sender.toBase32())
                     return
                 }
-
+                
                 log.info("Received something from update server")
-
+                
                 payload = dissector.getPayload()
                 payload = slurper.parse(payload)
-
+                
                 if (payload.version == null) {
                     log.warning("version missing")
                     return
                 }
-
+                
                 if (payload.signer == null) {
                     log.warning("signer missing")
                 }
-
+                
                 if (VersionComparator.comp(myVersion, payload.version) >= 0) {
                     log.info("no new version available")
                     return
                 }
-
-                String infoHash
-                if (settings.updateType == "jar") {
-                    infoHash = payload.infoHash
-                } else
-                    infoHash = payload[settings.updateType]
-
-
-                if (!settings.autoDownloadUpdate) {
-                    log.info("new version $payload.version available, publishing event")
-                    eventBus.publish(new UpdateAvailableEvent(version : payload.version, signer : payload.signer, infoHash : infoHash))
-                } else {
-                    log.info("new version $payload.version available")
-                    updateInfoHash = new InfoHash(Base64.decode(infoHash))
-                    if (fileManager.rootToFiles.containsKey(updateInfoHash))
-                        eventBus.publish(new UpdateDownloadedEvent(version : payload.version, signer : payload.signer))
-                    else {
-                        updateDownloading = false
-                        version = payload.version
-                        signer = payload.signer
-                        log.info("starting search for new version hash $payload.infoHash")
-                        def searchEvent = new SearchEvent(searchHash : updateInfoHash.getRoot(), uuid : UUID.randomUUID(), oobInfohash : true)
-                        def queryEvent = new QueryEvent(searchEvent : searchEvent, firstHop : true, replyTo : me.destination,
-                            receivedOn : me.destination, originator : me)
-                        eventBus.publish(queryEvent)
-                    }
-                }
-
+                
+                log.info("new version $payload.version available, publishing event")
+                eventBus.publish(new UpdateAvailableEvent(version : payload.version, signer : payload.signer, infoHash : payload.infoHash))
+                
             } catch (Exception e) {
                 log.log(Level.WARNING,"Invalid datagram",e)
             }
@@ -186,6 +127,6 @@ class UpdateClient {
         public void errorOccurred(I2PSession session, String message, Throwable error) {
             log.log(Level.SEVERE, message, error)
         }
-
+        
     }
 }

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

@@ -1,8 +0,0 @@
-package com.muwire.core.update
-
-import com.muwire.core.Event
-
-class UpdateDownloadedEvent extends Event {
-    String version
-    String signer
-}

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("VJYAiCPZHNLraWvLkeRLxRiT4PHAqNqRO1nH240r7u1noBw8Pa~-lJOhKR7CccPkEN8ejSi4H6XjqKYLC8BKLVLeOgnAbedUVx81MV7DETPDdPEGV4RVu6YDFri7-tJOeqauGHxtlXT44YWuR69xKrTG3u4~iTWgxKnlBDht9Q3aVpSPFD2KqEizfVxolqXI0zmAZ2xMi8jfl0oe4GbgHrD9hR2FYj6yKfdqcUgHVobY4kDdJt-u31QqwWdsQMEj8Y3tR2XcNaITEVPiAjoKgBrYwB4jddWPNaT4XdHz76d9p9Iqes7dhOKq3OKpk6kg-bfIKiEOiA1mY49fn5h8pNShTqV7QBhh4CE4EDT3Szl~WsLdrlHUKJufSi7erEMh3coF7HORpF1wah2Xw7q470t~b8dKGKi7N7xQsqhGruDm66PH9oE9Kt9WBVBq2zORdPRtRM61I7EnrwDlbOkL0y~XpvQ3JKUQKdBQ3QsOJt8CHlhHHXMMbvqhntR61RSDBQAEAAcAAA==")
+    static final Destination UPDATE_SERVER = new Destination("pSWieSRB3czCl3Zz4WpKp4Z8tjv-05zbogRDS7SEnKcSdWOupVwjzQ92GsgQh1VqgoSRk1F8dpZOnHxxz5HFy9D7ri0uFdkMyXdSKoB7IgkkvCfTAyEmeaPwSYnurF3Zk7u286E7YG2rZkQZgJ77tow7ZS0mxFB7Z0Ti-VkZ9~GeGePW~howwNm4iSQACZA0DyTpI8iv5j4I0itPCQRgaGziob~Vfvjk49nd8N4jtaDGo9cEcafikVzQ2OgBgYWL6LRbrrItwuGqsDvITUHWaElUYIDhRQYUq8gYiUA6rwAJputfhFU0J7lIxFR9vVY7YzRvcFckfr0DNI4VQVVlPnRPkUxQa--BlldMaCIppWugjgKLwqiSiHywKpSMlBWgY2z1ry4ueEBo1WEP-mEf88wRk4cFQBCKtctCQnIG2GsnATqTl-VGUAsuzeNWZiFSwXiTy~gQ094yWx-K06fFZUDt4CMiLZVhGlixiInD~34FCRC9LVMtFcqiFB2M-Ql2AAAA")
 }

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

@@ -2,5 +2,4 @@ package com.muwire.core.upload
 
 class ContentRequest extends Request {
     Range range
-    int have
 }

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

@@ -5,58 +5,34 @@ import java.nio.channels.FileChannel
 import java.nio.charset.StandardCharsets
 import java.nio.file.Files
 import java.nio.file.StandardOpenOption
-import java.util.stream.Collectors
 
-import com.muwire.core.Persona
 import com.muwire.core.connection.Endpoint
-import com.muwire.core.mesh.Mesh
-import com.muwire.core.util.DataUtil
-
-import net.i2p.data.Destination
 
 class ContentUploader extends Uploader {
-
+    
     private final File file
     private final ContentRequest request
-    private final Mesh mesh
-    private final int pieceSize
-
-    ContentUploader(File file, ContentRequest request, Endpoint endpoint, Mesh mesh, int pieceSize) {
+    
+    ContentUploader(File file, ContentRequest request, Endpoint endpoint) {
         super(endpoint)
         this.file = file
         this.request = request
-        this.mesh = mesh
-        this.pieceSize = pieceSize
     }
-
+    
     @Override
     void respond() {
         OutputStream os = endpoint.getOutputStream()
         Range range = request.getRange()
-        boolean satisfiable = true
-        final long length = file.length()
-        if (range.start >= length || range.end >= length)
-            satisfiable = false
-        if (satisfiable) {
-            int startPiece = range.start / (0x1 << pieceSize)
-            int endPiece = range.end / (0x1 << pieceSize)
-            for (int i = startPiece; i <= endPiece; i++)
-                satisfiable &= mesh.pieces.isDownloaded(i)
-        }
-        if (!satisfiable) {
-            os.write("416 Range Not Satisfiable\r\n".getBytes(StandardCharsets.US_ASCII))
-            writeMesh(request.downloader)
-            os.write("\r\n".getBytes(StandardCharsets.US_ASCII))
+        if (range.start >= file.length() || range.end >= file.length()) {
+            os.write("416 Range Not Satisfiable\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
             os.flush()
             return
         }
 
         os.write("200 OK\r\n".getBytes(StandardCharsets.US_ASCII))
-        os.write("Content-Range: $range.start-$range.end\r\n".getBytes(StandardCharsets.US_ASCII))
-        writeMesh(request.downloader)
-        os.write("\r\n".getBytes(StandardCharsets.US_ASCII))
+        os.write("Content-Range: $range.start-$range.end\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
 
-        FileChannel channel = null
+        FileChannel channel
         try {
             channel = Files.newByteChannel(file.toPath(), EnumSet.of(StandardOpenOption.READ))
             mapped = channel.map(FileChannel.MapMode.READ_ONLY, range.start, range.end - range.start + 1)
@@ -72,55 +48,7 @@ class ContentUploader extends Uploader {
         } finally {
             try {channel?.close() } catch (IOException ignored) {}
             endpoint.getOutputStream().flush()
-            synchronized(this) {
-                DataUtil.tryUnmap(mapped)
-                mapped = null
-            }
         }
     }
 
-    private void writeMesh(Persona toExclude) {
-        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(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))
-        }
-    }
-
-    @Override
-    public String getName() {
-        return file.getName();
-    }
-
-    @Override
-    public synchronized int getProgress() {
-        if (mapped == null)
-            return 0
-        int position = mapped.position()
-        int total = request.getRange().end - request.getRange().start
-        (int)(position * 100.0 / total)
-    }
-
-    @Override
-    public String getDownloader() {
-        request.downloader.getHumanReadableName()
-    }
-
-    @Override
-    public int getDonePieces() {
-        return request.have;
-    }
-
-    @Override
-    public int getTotalPieces() {
-        return mesh.pieces.nPieces;
-    }
-
-    @Override
-    public long getTotalSize() {
-        return file.length();
-    }
 }

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

@@ -6,24 +6,21 @@ import java.nio.charset.StandardCharsets
 import com.muwire.core.InfoHash
 import com.muwire.core.connection.Endpoint
 
-import net.i2p.data.Base64
-
 class HashListUploader extends Uploader {
     private final InfoHash infoHash
     private final HashListRequest request
-
+    
     HashListUploader(Endpoint endpoint, InfoHash infoHash, HashListRequest request) {
         super(endpoint)
         this.infoHash = infoHash
         mapped = ByteBuffer.wrap(infoHash.getHashList())
-        this.request = request
     }
-
+    
     void respond() {
         OutputStream os = endpoint.getOutputStream()
         os.write("200 OK\r\n".getBytes(StandardCharsets.US_ASCII))
         os.write("Content-Range: 0-${mapped.remaining()}\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
-
+        
         byte[]tmp = new byte[0x1 << 13]
         while(mapped.hasRemaining()) {
             int start = mapped.position()
@@ -35,34 +32,4 @@ class HashListUploader extends Uploader {
         }
         endpoint.getOutputStream().flush()
     }
-
-    @Override
-    public String getName() {
-        return "Hash list for " + Base64.encode(infoHash.getRoot());
-    }
-
-    @Override
-    public synchronized int getProgress() {
-        (int)(mapped.position() * 100.0 / mapped.capacity())
-    }
-
-    @Override
-    public String getDownloader() {
-        request.downloader.getHumanReadableName()
-    }
-
-    @Override
-    public int getDonePieces() {
-        return 0;
-    }
-
-    @Override
-    public int getTotalPieces() {
-        return 1;
-    }
-
-    @Override
-    public long getTotalSize() {
-        return -1;
-    }
 }

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

@@ -2,7 +2,7 @@ package com.muwire.core.upload
 
 class Range {
     final long start, end
-
+    
     Range(long start, long end) {
         this.start = start
         this.end = end