Release 0.2.8

Fixes i2cp bug while connecting to remote router

README.md

@@ -1,14 +1,14 @@
 # MuWire - Easy Anonymous File-Sharing
 
-MuWire is an easy to use file-sharing program which offers anonymity using [I2P technology](http://geti2p.net).
+MuWire is an easy to use file-sharing program which offers anonymity using [I2P technology](http://geti2p.net).  It works on any platform Java works on, including Windows,MacOS,Linux.
 
 It is inspired by the LimeWire Gnutella client and developped by a former LimeWire developer.
 
-The project is in development.  You can find technical documentation in the "doc" folder.
+The current stable release - 0.2.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 assemble 
@@ -23,16 +23,11 @@ Some of the UI tests will fail because they haven't been written yet :-/
 
 ### Running
 
-You need to have an I2P router up and running on the same machine.  After you build the application, look inside "gui/build/distributions".  Untar/unzip one of the "shadow" files and then run the jar contained inside.  
+You need to have an I2P router up and running on the same machine.  After you build the application, look inside "gui/build/distributions".  Untar/unzip one of the "shadow" files and then run the jar contained inside by typing "java -jar MuWire-x.y.z.jar" in a terminal or command prompt.  If you use a custom I2CP host and port, create a file $HOME/.MuWire/i2p.properties and put "i2cp.tcp.host=<host>" and "i2cp.tcp.port=<port>" in there.
 
-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.
+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.
-
-At the moment there are very few nodes on the network, so you will see very few connections and search results.  It is best to leave MuWire running all the time, just like I2P.
 
 
 ### Known bugs and limitations
 
-* Sometimes the list of shared files gets lost 
 * Many UI features you would expect are not there yet
-
-

TODO.md

@@ -0,0 +1,45 @@
+# TODO List
+
+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
+
+##### Two-tier Topology
+
+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
+* Download file sequentially
+* Unsharing of files
+* Multiple-selection download, Ctrl-A

cli/build.gradle

@@ -1,8 +1,22 @@
-apply plugin : 'application'
+buildscript {
 
+    repositories {
+        jcenter()
+        mavenLocal()
+    }
+
+    dependencies {
+        classpath 'com.github.jengelman.gradle.plugins:shadow:2.0.4'
+    }
+}
+
+apply plugin : 'application'
 mainClassName = 'com.muwire.cli.Cli'
+apply plugin : 'com.github.johnrengelman.shadow'
+
 applicationDefaultJvmArgs = ['-Djava.util.logging.config.file=logging.properties']
 
 dependencies {
     compile project(":core")
 }
+

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

@@ -4,9 +4,16 @@ 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
 import com.muwire.core.files.AllFilesLoadedEvent
 import com.muwire.core.files.FileHashedEvent
+import com.muwire.core.files.FileLoadedEvent
 import com.muwire.core.files.FileSharedEvent
+import com.muwire.core.upload.UploadEvent
+import com.muwire.core.upload.UploadFinishedEvent
 
 class Cli {
     
@@ -28,28 +35,15 @@ class Cli {
         
         Core core 
         try {
-            core = new Core(props, home, "0.0.11")
+            core = new Core(props, home, "0.2.8")
         } catch (Exception bad) {
             bad.printStackTrace(System.out)
             println "Failed to initialize core, exiting"
             System.exit(1)
         }
 
-        def latch = new CountDownLatch(1)
-        def fileLoader = new Object() {
-            public void onAllFilesLoadedEvent(AllFilesLoadedEvent e) {
-                latch.countDown()
-            }
-        }
-        core.eventBus.register(AllFilesLoadedEvent.class, fileLoader)
-        core.startServices()
-        
-        println "waiting for files to load"
-        latch.await()
                 
         
-        // now we begin
-        println "MuWire is ready"
         
         def filesList
         if (args.length == 0) {
@@ -62,14 +56,40 @@ class Cli {
         Thread.sleep(1000)
         println "loading shared files from $filesList"
         
-        core.eventBus.register(FileHashedEvent.class, new Object() {
+        // listener for shared files
-            void onFileHashedEvent(FileHashedEvent e) {
+        def sharedListener = new SharedListener()
-                if (e.error != null)
+        core.eventBus.register(FileHashedEvent.class, sharedListener)
-                    println "ERROR $e.error"
+        core.eventBus.register(FileLoadedEvent.class, sharedListener)
-                else
+        
-                    println "Shared file : $e.sharedFile.file"
+        // 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"
+        } as TimerTask, 60000, 60000)
+        
+        def latch = new CountDownLatch(1)
+        def fileLoader = new Object() {
+            public void onAllFilesLoadedEvent(AllFilesLoadedEvent e) {
+                latch.countDown()
             }
-        })
+        }
+        core.eventBus.register(AllFilesLoadedEvent.class, fileLoader)
+        core.startServices()
+
+        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 { 
@@ -83,4 +103,42 @@ class Cli {
         })
         Thread.sleep(Integer.MAX_VALUE)
     }
+    
+    static class ConnectionListener {
+        volatile int connections
+        public void onConnectionEvent(ConnectionEvent e) {
+            if (e.status == ConnectionAttemptStatus.SUCCESSFUL)
+                connections++
+        }
+        public void onDisconnectionEvent(DisconnectionEvent e) {
+            connections--
+        }
+    }
+    
+    static class UploadsListener {
+        volatile int uploads
+        public void onUploadEvent(UploadEvent e) {
+            uploads++
+            println String.valueOf(new Date()) + " 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()}"
+        }
+    }
+    
+    static class SharedListener {
+        volatile int shared
+        void onFileHashedEvent(FileHashedEvent e) {
+            if (e.error != null)
+                println "ERROR $e.error"
+            else {
+                println "Shared file : $e.sharedFile.file"
+                shared++
+            }
+        }
+        void onFileLoadedEvent(FileLoadedEvent e) {
+            shared++
+        }
+    }
 }

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

@@ -0,0 +1,166 @@
+package com.muwire.cli
+
+import java.util.concurrent.ConcurrentHashMap
+import java.util.concurrent.CountDownLatch
+
+import com.muwire.core.Core
+import com.muwire.core.MuWireSettings
+import com.muwire.core.connection.ConnectionAttemptStatus
+import com.muwire.core.connection.ConnectionEvent
+import com.muwire.core.download.DownloadStartedEvent
+import com.muwire.core.download.Downloader
+import com.muwire.core.download.UIDownloadEvent
+import com.muwire.core.search.QueryEvent
+import com.muwire.core.search.SearchEvent
+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, " + 
+                "how many connections you want before searching" +
+                "and how long to wait for results to arrive"
+                System.exit(1)
+        } else {
+            filesList = args[0]
+            connections = Integer.parseInt(args[1])
+            resultWait = Integer.parseInt(args[2])
+        }
+
+        Core core
+        try {
+            core = new Core(props, home, "0.2.8")
+        } 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(",")
+            UUID uuid = UUID.randomUUID()
+            core.eventBus.register(UIResultEvent.class, new ResultsListener(fileName : split[1]))
+            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)) 
+        }
+        
+        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 ==="
+            downloaders.each {
+                int donePieces = it.donePieces()
+                int totalPieces = it.nPieces
+                int sources = it.activeWorkers.size()
+                def root = Base64.encode(it.infoHash.getRoot())
+                def state = it.getCurrentState()
+                println "file $it.file hash: $root progress: $donePieces/$totalPieces sources: $sources status: $state}"
+                it.resume()
+            }
+            println "==== END ==="
+        } as TimerTask, 60000, 60000)
+        
+        println "waiting for downloads to finish"
+        while(true) {
+            boolean allFinished = true
+            for (Downloader d : downloaders) {
+                allFinished &= d.getCurrentState() == Downloader.DownloadState.FINISHED
+            }
+            if (allFinished)
+                break
+            Thread.sleep(1000)
+        }
+        
+        println "all downloads finished"
+    }
+    
+    static class ResultsHolder {
+        final List<UIResultEvent> results = Collections.synchronizedList(new ArrayList<>())
+        String fileName
+        void add(UIResultEvent e) {
+            results.add(e)
+        }
+        List getResults() {
+            results
+        }
+    }
+    
+    static class ResultsListener {
+        UUID uuid
+        String fileName
+        public onUIResultEvent(UIResultEvent e) {
+            println "got a result for $fileName from ${e.sender.getHumanReadableName()}"
+            ResultsHolder listener = resultsListeners.get(e.uuid)
+            if (listener == null) {
+                listener = new ResultsHolder(fileName : fileName)
+                resultsListeners.put(e.uuid, listener)
+            }
+            listener.add(e)
+        }
+    }
+    
+    static class ConnectionWaiter {
+        CountDownLatch latch
+        public void onConnectionEvent(ConnectionEvent e) {
+            if (e.status == ConnectionAttemptStatus.SUCCESSFUL)
+                latch.countDown()
+        }
+    }
+    
+
+    static class DownloadListener {
+        public void onDownloadStartedEvent(DownloadStartedEvent e) {
+            downloaders.add(e.downloader)
+        }
+    }
+}

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

@@ -12,6 +12,7 @@ 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.UIDownloadCancelledEvent
 import com.muwire.core.download.UIDownloadEvent
 import com.muwire.core.files.FileDownloadedEvent
 import com.muwire.core.files.FileHashedEvent
@@ -22,6 +23,7 @@ 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.DirectoryWatcher
 import com.muwire.core.hostcache.CacheClient
 import com.muwire.core.hostcache.HostCache
 import com.muwire.core.hostcache.HostDiscoveredEvent
@@ -68,6 +70,9 @@ public class Core {
     private final ConnectionAcceptor connectionAcceptor
     private final ConnectionEstablisher connectionEstablisher
     private final HasherService hasherService
+    private final DownloadManager downloadManager
+    private final DirectoryWatcher directoryWatcher
+    final FileManager fileManager
         
     public Core(MuWireSettings props, File home, String myVersion) {
         this.home = home		
@@ -90,19 +95,27 @@ public class Core {
         def i2pOptionsFile = new File(home,"i2p.properties")
         if (i2pOptionsFile.exists()) {
             i2pOptionsFile.withInputStream { i2pOptions.load(it) }
+
+            if (!i2pOptions.containsKey("inbound.nickname"))
+                i2pOptions["inbound.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"] = "2"
             i2pOptions["outbound.length"] = "3"
             i2pOptions["outbound.quantity"] = "2"
+            i2pOptions["i2cp.tcp.host"] = "127.0.0.1"
+            i2pOptions["i2cp.tcp.port"] = "7654"
         }
         
         // options like tunnel length and quantity
 		I2PSession i2pSession
 		I2PSocketManager socketManager
 		keyDat.withInputStream {
-			socketManager = new I2PSocketManagerFactory().createManager(it, i2pOptions)
+			socketManager = new I2PSocketManagerFactory().createManager(it, i2pOptions["i2cp.tcp.host"], i2pOptions["i2cp.tcp.port"].toInteger(), i2pOptions)
 		}
 		socketManager.getDefaultOptions().setReadTimeout(60000)
 		socketManager.getDefaultOptions().setConnectTimeout(30000)
@@ -143,7 +156,7 @@ public class Core {
 		
 		
 		log.info "initializing file manager"
-		FileManager fileManager = new FileManager(eventBus, props)
+		fileManager = new FileManager(eventBus, props)
 		eventBus.register(FileHashedEvent.class, fileManager)
 		eventBus.register(FileLoadedEvent.class, fileManager)
 		eventBus.register(FileDownloadedEvent.class, fileManager)
@@ -151,7 +164,8 @@ public class Core {
 		eventBus.register(SearchEvent.class, fileManager)
 		
 		log.info "initializing persistence service"
-		persisterService = new PersisterService(new File(home, "files.json"), eventBus, 5000, fileManager)
+		persisterService = new PersisterService(new File(home, "files.json"), eventBus, 15000, fileManager)
+        eventBus.register(UILoadedEvent.class, persisterService)
         
 		log.info("initializing host cache")
 		File hostStorage = new File(home, "hosts.json")
@@ -186,8 +200,11 @@ public class Core {
 		eventBus.register(ResultsEvent.class, searchManager)
 		
         log.info("initializing download manager")
-        DownloadManager downloadManager = new DownloadManager(eventBus, i2pConnector, new File(home, "incompletes"), 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)
         
         log.info("initializing upload manager")
         UploadManager uploadManager = new UploadManager(eventBus, fileManager)
@@ -200,6 +217,9 @@ public class Core {
 		connectionAcceptor = new ConnectionAcceptor(eventBus, connectionManager, props, 
             i2pAcceptor, hostCache, trustService, searchManager, uploadManager, connectionEstablisher)
 		
+        log.info("initializing directory watcher")
+        directoryWatcher = new DirectoryWatcher(eventBus, fileManager)
+        eventBus.register(FileSharedEvent.class, directoryWatcher)
         
         log.info("initializing hasher service")
         hasherService = new HasherService(new FileHasher(), eventBus, fileManager)
@@ -208,9 +228,9 @@ public class Core {
     
     public void startServices() {
         hasherService.start()
+        directoryWatcher.start()
         trustService.start()
         trustService.waitForLoad()
-        persisterService.start()
         hostCache.start()
         connectionManager.start()
         cacheClient.start()
@@ -221,6 +241,15 @@ public class Core {
     }
     
     public void shutdown() {
+        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 connection manager")
         connectionManager.shutdown()
     }
 
@@ -248,7 +277,7 @@ public class Core {
             }
         }
         
-        Core core = new Core(props, home, "0.0.11")
+        Core core = new Core(props, home, "0.2.8")
         core.startServices()
         
         // ... at the end, sleep or execute script

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

@@ -3,6 +3,7 @@ package com.muwire.core
 import java.util.concurrent.CopyOnWriteArrayList
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors
+import java.util.logging.Level
 
 import com.muwire.core.files.FileSharedEvent
 
@@ -23,14 +24,18 @@ class EventBus {
 	}
 	
 	private void publishInternal(Event e) {
-		log.fine "publishing event $e of type ${e.getClass().getSimpleName()}"
+		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 {
-			it."on${clazz.getSimpleName()}"(e)
+            try {
+                it."on${clazz.getSimpleName()}"(e)
+            } catch (Exception bad) {
+                log.log(Level.SEVERE, "exception dispatching event",bad)
+            }
 		}
 	}
 	

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

@@ -1,6 +1,11 @@
 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
 
 class MuWireSettings {
 	
@@ -10,9 +15,9 @@ class MuWireSettings {
     int updateCheckInterval
     String nickname
     File downloadLocation
-    String sharedFiles
     CrawlerResponse crawlerResponse
     boolean shareDownloadedFiles
+    Set<String> watchedDirectories
     
 	MuWireSettings() {
         this(new Properties())
@@ -25,10 +30,16 @@ class MuWireSettings {
         nickname = props.getProperty("nickname","MuWireUser")
         downloadLocation = new File((String)props.getProperty("downloadLocation", 
             System.getProperty("user.home")))
-        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"))
+        
+        watchedDirectories = new HashSet<>()
+        if (props.containsKey("watchedDirectories")) {
+            String[] encoded = props.getProperty("watchedDirectories").split(",")
+            encoded.each { watchedDirectories << DataUtil.readi18nString(Base64.decode(it)) }
+        }
+        
 	}
     
     void write(OutputStream out) throws IOException {
@@ -41,8 +52,14 @@ class MuWireSettings {
         props.setProperty("downloadRetryInterval", String.valueOf(downloadRetryInterval))
         props.setProperty("updateCheckInterval", String.valueOf(updateCheckInterval))
         props.setProperty("shareDownloadedFiles", String.valueOf(shareDownloadedFiles))
-        if (sharedFiles != null)
+        
-            props.setProperty("sharedFiles", sharedFiles)
+        if (!watchedDirectories.isEmpty()) {
+            String encoded = watchedDirectories.stream().
+                map({Base64.encode(DataUtil.encodei18nString(it))}).
+                collect(Collectors.joining(","))
+            props.setProperty("watchedDirectories", encoded)
+        }
+        
         props.store(out, "")
     }
 

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

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

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

@@ -76,9 +76,9 @@ abstract class Connection implements Closeable {
 			return
 		}
         log.info("closing $name")
-        endpoint.close()
 		reader.interrupt()
 		writer.interrupt()
+		endpoint.close()
 		eventBus.publish(new DisconnectionEvent(destination: endpoint.destination))
 	}
 	
@@ -127,6 +127,9 @@ abstract class Connection implements Closeable {
         query.uuid = e.searchEvent.getUuid()
         query.firstHop = e.firstHop
         query.keywords = e.searchEvent.getSearchTerms()
+        query.oobInfohash = e.searchEvent.oobInfohash
+        if (e.searchEvent.searchHash != null)
+            query.infohash = Base64.encode(e.searchEvent.searchHash)
         query.replyTo = e.replyTo.toBase64()
         if (e.originator != null)
             query.originator = e.originator.toBase64()
@@ -155,8 +158,11 @@ abstract class Connection implements Closeable {
     
     protected void handleSearch(def search) {
         UUID uuid = UUID.fromString(search.uuid)
-        if (search.infohash != null)
+        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)
@@ -178,10 +184,14 @@ abstract class Connection implements Closeable {
             }
         }
         
+        boolean oob = false
+        if (search.oobInfohash != null)
+            oob = search.oobInfohash
         
         SearchEvent searchEvent = new SearchEvent(searchTerms : search.keywords,
-                                            searchHash : search.infohash,
+                                            searchHash : infohash,
-                                            uuid : uuid)
+                                            uuid : uuid,
+                                            oobInfohash : oob)
         QueryEvent event = new QueryEvent ( searchEvent : searchEvent,
                                             replyTo : replyTo,
                                             originator : originator,

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

@@ -17,6 +17,8 @@ import com.muwire.core.upload.UploadManager
 import com.muwire.core.search.InvalidSearchResultException
 import com.muwire.core.search.ResultsParser
 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
@@ -38,6 +40,8 @@ class ConnectionAcceptor {
 	
 	final ExecutorService acceptorThread
 	final ExecutorService handshakerThreads
+    
+    private volatile shutdown
 	
 	ConnectionAcceptor(EventBus eventBus, UltrapeerConnectionManager manager,
 		MuWireSettings settings, I2PAcceptor acceptor, HostCache hostCache,
@@ -73,11 +77,13 @@ class ConnectionAcceptor {
 	}
 	
 	void stop() {
+        shutdown = true
 		acceptorThread.shutdownNow()
 		handshakerThreads.shutdownNow()
 	}
 	
 	private void acceptLoop() {
+        try {
 		while(true) {
 			def incoming = acceptor.accept()
 			log.info("accepted connection from ${incoming.destination.toBase32()}")
@@ -93,6 +99,11 @@ class ConnectionAcceptor {
 			}
 			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) {
@@ -108,6 +119,9 @@ class ConnectionAcceptor {
 				case (byte)'G':
 					processGET(e)
 					break
+                case (byte)'H':
+                    processHashList(e)
+                    break
                 case (byte)'P':
                     processPOST(e)
                     break
@@ -144,7 +158,7 @@ class ConnectionAcceptor {
 
 	private void handleIncoming(Endpoint e, boolean leaf) {
 		boolean accept = !manager.isConnected(e.destination) && 
-            !establisher.inProgress.contains(e.destination) &&
+            !establisher.isInProgress(e.destination) &&
             (leaf ? manager.hasLeafSlots() : manager.hasPeerSlots())
 		if (accept) {
 			log.info("accepting connection, leaf:$leaf")
@@ -178,9 +192,18 @@ class ConnectionAcceptor {
         dis.readFully(et)
         if (et != "ET ".getBytes(StandardCharsets.US_ASCII))
             throw new IOException("Invalid GET connection")
-        uploadManager.processEndpoint(e)
+        uploadManager.processGET(e)
 	}
     
+    private void processHashList(Endpoint e) {
+        byte[] ashList = new byte[8]
+        final DataInputStream dis = new DataInputStream(e.getInputStream())
+        dis.readFully(ashList)
+        if (ashList != "ASHLIST ".getBytes(StandardCharsets.US_ASCII))
+            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())
@@ -204,13 +227,15 @@ class ConnectionAcceptor {
             if (sender.destination != e.getDestination())
                 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)
-                eventBus.publish(ResultsParser.parse(sender, resultsUUID, json))
+                results[i] = 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 {

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

@@ -35,6 +35,8 @@ class ConnectionEstablisher {
 	
 	final Set inProgress = new ConcurrentHashSet()
 	
+    ConnectionEstablisher(){}
+    
 	ConnectionEstablisher(EventBus eventBus, I2PConnector i2pConnector, MuWireSettings settings,
 		ConnectionManager connectionManager, HostCache hostCache) {
 		this.eventBus = eventBus
@@ -176,4 +178,8 @@ class ConnectionEstablisher {
 			e.close()
 		}
 	}
+    
+    public boolean isInProgress(Destination d) {
+        inProgress.contains(d)
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.muwire.core.connection
 
 import java.util.concurrent.atomic.AtomicBoolean
+import java.util.logging.Level
 
 import groovy.util.logging.Log
 import net.i2p.data.Destination
@@ -24,7 +25,7 @@ class Endpoint implements Closeable {
 	@Override
 	public void close() {
 		if (!closed.compareAndSet(false, true)) {
-			log.warning("Close loop detected for ${destination.toBase32()}", new Exception())
+			log.log(Level.WARNING,"Close loop detected for ${destination.toBase32()}", new Exception())
 			return
 		}
 		if (inputStream != null) {
@@ -34,7 +35,7 @@ class Endpoint implements Closeable {
 			try {outputStream.close()} catch (Exception ignore) {}
 		}
         if (toClose != null) {
-            try {toClose.close()} catch (Exception ignore) {}
+            try {toClose.reset()} catch (Exception ignore) {}
         }
 	}
 	

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

@@ -104,8 +104,8 @@ class UltrapeerConnectionManager extends ConnectionManager {
     
     @Override
     void shutdown() {
-        peerConnections.each {k,v -> v.close() }
+        peerConnections.values().stream().parallel().forEach({v -> v.close()})
-        leafConnections.each {k,v -> v.close() }
+        leafConnections.values().stream().parallel().forEach({v -> v.close()})
         peerConnections.clear()
         leafConnections.clear()
     }

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

@@ -1,12 +1,21 @@
 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.util.DataUtil
 
+import groovy.json.JsonBuilder
+import groovy.json.JsonOutput
+import groovy.json.JsonSlurper
 import net.i2p.data.Base64
 import net.i2p.data.Destination
+import net.i2p.util.ConcurrentHashSet
 
 import com.muwire.core.EventBus
+import com.muwire.core.InfoHash
 import com.muwire.core.Persona
+import com.muwire.core.UILoadedEvent
 
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors
@@ -16,13 +25,16 @@ public class DownloadManager {
     private final EventBus eventBus
     private final I2PConnector connector
     private final Executor executor
-    private final File incompletes
+    private final File incompletes, home
     private final Persona me
     
-    public DownloadManager(EventBus eventBus, I2PConnector connector, File incompletes, Persona me) {
+    private final Set<Downloader> downloaders = new ConcurrentHashSet<>()
+    
+    public DownloadManager(EventBus eventBus, I2PConnector connector, File home, Persona me) {
         this.eventBus = eventBus
         this.connector = connector
-        this.incompletes = incompletes
+        this.incompletes = new File(home,"incompletes")
+        this.home = home
         this.me = me
         
         incompletes.mkdir()
@@ -46,15 +58,88 @@ public class DownloadManager {
         e.result.each { 
             destinations.add(it.sender.destination)
         }
+        destinations.addAll(e.sources)
+        destinations.remove(me.destination)
         
         def downloader = new Downloader(eventBus, this, me, e.target, size,
             infohash, pieceSize, connector, destinations,
             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)
+        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())
+            return
+        def slurper = new JsonSlurper()
+        downloadsFile.eachLine {
+            def json = slurper.parseText(it)
+            File file = new File(DataUtil.readi18nString(Base64.decode(json.file)))
+            def destinations = new HashSet<>()
+            json.destinations.each { destination -> 
+                destinations.add new Destination(destination)
+            }
+            InfoHash infoHash
+            if (json.hashList != null) {
+                byte[] hashList = Base64.decode(json.hashList)
+                infoHash = InfoHash.fromHashList(hashList)
+            } else {
+                byte [] root = Base64.decode(json.hashRoot)
+                infoHash = new InfoHash(root)
+            }
+            def downloader = new Downloader(eventBus, this, me, file, (long)json.length,
+                infoHash, json.pieceSizePow2, connector, destinations, incompletes)
+            downloaders.add(downloader)
+            downloader.download()
+            eventBus.publish(new DownloadStartedEvent(downloader : downloader))
+        }
+    }
+    
+    void onFileDownloadedEvent(FileDownloadedEvent e) {
+        downloaders.remove(e.downloader)
+        persistDownloaders()
+    }
+    
+    private void persistDownloaders() {
+        File downloadsFile = new File(home,"downloads.json")
+        downloadsFile.withPrintWriter { writer -> 
+            downloaders.each { downloader ->
+                if (!downloader.cancelled) {
+                    def json = [:]
+                    json.file = Base64.encode(DataUtil.encodei18nString(downloader.file.getAbsolutePath()))
+                    json.length = downloader.length
+                    json.pieceSizePow2 = downloader.pieceSizePow2
+                    def destinations = []
+                    downloader.destinations.each {
+                        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())
+                    writer.println(JsonOutput.toJson(json))
+                }
+            }
+        }
+    }
+    
+    public void shutdown() {
+        downloaders.each { it.stop() }
+        Downloader.executorService.shutdownNow()
+    }
 }

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

@@ -16,6 +16,7 @@ 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 {
@@ -23,7 +24,7 @@ class DownloadSession {
     private static int SAMPLES = 10
     
     private final String meB64
-    private final Pieces downloaded, claimed
+    private final Pieces pieces
     private final InfoHash infoHash
     private final Endpoint endpoint
     private final File file
@@ -36,11 +37,10 @@ class DownloadSession {
     
     private ByteBuffer mapped
     
-    DownloadSession(String meB64, Pieces downloaded, Pieces claimed, InfoHash infoHash, Endpoint endpoint, File file, 
+    DownloadSession(String meB64, Pieces pieces, InfoHash infoHash, Endpoint endpoint, File file, 
         int pieceSize, long fileLength) {
         this.meB64 = meB64
-        this.downloaded = downloaded
+        this.pieces = pieces
-        this.claimed = claimed
         this.endpoint = endpoint
         this.infoHash = infoHash
         this.file = file
@@ -63,20 +63,11 @@ class DownloadSession {
         OutputStream os = endpoint.getOutputStream()
         InputStream is = endpoint.getInputStream()
         
-        int piece
+        int piece = pieces.claim()
-        while(true) {
+        if (piece == -1)
-            piece = downloaded.getRandomPiece()
+            return false
-            if (claimed.isMarked(piece)) {
+        boolean unclaim = true
-                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
@@ -85,7 +76,6 @@ class DownloadSession {
         
         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))
@@ -95,7 +85,7 @@ class DownloadSession {
             if (code.startsWith("404 ")) {
                 log.warning("file not found")
                 endpoint.close()
-                return
+                return false
             }
                 
             if (code.startsWith("416 ")) {
@@ -106,7 +96,7 @@ class DownloadSession {
             if (!code.startsWith("200 ")) {
                 log.warning("unknown code $code")
                 endpoint.close()
-                return
+                return false
             }
 
             // parse all headers
@@ -131,45 +121,50 @@ class DownloadSession {
             if (receivedStart != start || receivedEnd != end) {
                 log.warning("We don't support mismatching ranges yet")
                 endpoint.close()
-                return
+                return false
             }
             
             // start the download
-            channel = Files.newByteChannel(file.toPath(), EnumSet.of(StandardOpenOption.READ, StandardOpenOption.WRITE, 
+            FileChannel channel
-                StandardOpenOption.SPARSE, StandardOpenOption.CREATE)) // TODO: double-check, maybe CREATE_NEW
+            try {
-            mapped = channel.map(FileChannel.MapMode.READ_WRITE, start, end - start + 1)
+                channel = Files.newByteChannel(file.toPath(), EnumSet.of(StandardOpenOption.READ, StandardOpenOption.WRITE,
-            
+                        StandardOpenOption.SPARSE, StandardOpenOption.CREATE)) // TODO: double-check, maybe CREATE_NEW
-            byte[] tmp = new byte[0x1 << 13]
+                mapped = channel.map(FileChannel.MapMode.READ_WRITE, start, end - start + 1)
-            while(mapped.hasRemaining()) {
+
-                if (mapped.remaining() < tmp.length)
+                byte[] tmp = new byte[0x1 << 13]
-                    tmp = new byte[mapped.remaining()]
+                while(mapped.hasRemaining()) {
-                int read = is.read(tmp)
+                    if (mapped.remaining() < tmp.length)
-                if (read == -1)
+                        tmp = new byte[mapped.remaining()]
-                    throw new IOException()
+                    int read = is.read(tmp)
-                synchronized(this) {
+                    if (read == -1)
-                    mapped.put(tmp, 0, read)
+                        throw new IOException()
-                    
+                    synchronized(this) {
-                    if (timestamps.size() == SAMPLES) {
+                        mapped.put(tmp, 0, read)
-                        timestamps.removeFirst()
+
-                        reads.removeFirst()
+                        if (timestamps.size() == SAMPLES) {
+                            timestamps.removeFirst()
+                            reads.removeFirst()
+                        }
+                        timestamps.addLast(System.currentTimeMillis())
+                        reads.addLast(read)
                     }
-                    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)
+                    throw new BadHashException()
+            } finally {
+                try { channel?.close() } catch (IOException ignore) {}
             }
-            
+            pieces.markDownloaded(piece)
-            mapped.clear()
+            unclaim = false
-            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 {
-            claimed.clear(piece)
+            if (unclaim)
-            try { channel?.close() } catch (IOException ignore) {}
+                pieces.unclaim(piece)
         }
         return true
     }

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

@@ -4,9 +4,13 @@ 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.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
@@ -17,11 +21,12 @@ import com.muwire.core.files.FileDownloadedEvent
 
 import groovy.util.logging.Log
 import net.i2p.data.Destination
+import net.i2p.util.ConcurrentHashSet
 
 @Log
 public class Downloader {
-    public enum DownloadState { CONNECTING, DOWNLOADING, FAILED, CANCELLED, FINISHED }
+    public enum DownloadState { CONNECTING, HASHLIST, DOWNLOADING, FAILED, CANCELLED, FINISHED }
-    private enum WorkerState { CONNECTING, DOWNLOADING, FINISHED}
+    private enum WorkerState { CONNECTING, HASHLIST, DOWNLOADING, FINISHED}
     
     private static final ExecutorService executorService = Executors.newCachedThreadPool({r ->
         Thread rv = new Thread(r)
@@ -34,19 +39,23 @@ public class Downloader {
     private final DownloadManager downloadManager 
     private final Persona me   
     private final File file
-    private final Pieces downloaded, claimed
+    private final Pieces pieces
     private final long length
-    private final InfoHash infoHash
+    private InfoHash infoHash
     private final int pieceSize
     private final I2PConnector connector
     private final Set<Destination> destinations
     private final int nPieces
     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 final AtomicBoolean eventFired = new AtomicBoolean()
+    private boolean piecesFileClosed
 
     public Downloader(EventBus eventBus, DownloadManager downloadManager, 
         Persona me, File file, long length, InfoHash infoHash, 
@@ -61,6 +70,8 @@ public class Downloader {
         this.connector = connector
         this.destinations = destinations
         this.piecesFile = new File(incompletes, file.getName()+".pieces")
+        this.incompleteFile = new File(incompletes, file.getName()+".part")
+        this.pieceSizePow2 = pieceSizePow2
         this.pieceSize = 1 << pieceSizePow2
         
         int nPieces
@@ -70,8 +81,15 @@ public class Downloader {
             nPieces = length / pieceSize + 1
         this.nPieces = nPieces
         
-        downloaded = new Pieces(nPieces, Constants.DOWNLOAD_SEQUENTIAL_RATIO)
+        pieces = 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() {
@@ -88,22 +106,26 @@ public class Downloader {
     void readPieces() {
         if (!piecesFile.exists())
             return
-        piecesFile.withReader { 
+        piecesFile.eachLine { 
-            int piece = Integer.parseInt(it.readLine())
+            int piece = Integer.parseInt(it)
-            downloaded.markDownloaded(piece)
+            pieces.markDownloaded(piece)
         }
     }
     
     void writePieces() {
-        piecesFile.withPrintWriter { writer ->
+        synchronized(piecesFile) {
-            downloaded.getDownloaded().each { piece -> 
+            if (piecesFileClosed)
-                writer.println(piece)
+                return
+            piecesFile.withPrintWriter { writer ->
+                pieces.getDownloaded().each { piece ->
+                    writer.println(piece)
+                }
             }
         }
     }
     
     public long donePieces() {
-        downloaded.donePieces()
+        pieces.donePieces()
     }
     
     
@@ -126,7 +148,7 @@ public class Downloader {
             allFinished &= it.currentState == WorkerState.FINISHED
         }
         if (allFinished) {
-            if (downloaded.isComplete())
+            if (pieces.isComplete())
                 return DownloadState.FINISHED
             return DownloadState.FAILED
         }
@@ -143,11 +165,31 @@ public class Downloader {
         if (oneDownloading)
             return DownloadState.DOWNLOADING
         
+        // at least one is requesting hashlist
+        boolean oneHashlist = false
+        activeWorkers.values().each { 
+            if (it.currentState == WorkerState.HASHLIST) {
+                oneHashlist = true
+                return
+            }
+        }
+        if (oneHashlist)
+            return DownloadState.HASHLIST
+            
         return DownloadState.CONNECTING
     }
     
     public void cancel() {
         cancelled = true
+        stop()
+        synchronized(piecesFile) {
+            piecesFileClosed = true
+            piecesFile.delete()
+        }
+        incompleteFile.delete()
+    }
+    
+    void stop() {
         activeWorkers.values().each { 
             it.cancel()
         }
@@ -163,11 +205,18 @@ public class Downloader {
     }
     
     public void resume() {
-        activeWorkers.each { destination, worker ->
+        destinations.each { destination ->
-            if (worker.currentState == WorkerState.FINISHED) {
+            def worker = activeWorkers.get(destination)
-                def newWorker = new DownloadWorker(destination)
+            if (worker != null) {
-                activeWorkers.put(destination, newWorker)
+                if (worker.currentState == WorkerState.FINISHED) {
-                executorService.submit(newWorker)
+                    def newWorker = new DownloadWorker(destination)
+                    activeWorkers.put(destination, newWorker)
+                    executorService.submit(newWorker)
+                }
+            } else {
+                worker = new DownloadWorker(destination)
+                activeWorkers.put(destination, worker)
+                executorService.submit(worker)
             }
         }
     }
@@ -189,24 +238,43 @@ public class Downloader {
             Endpoint endpoint = null
             try {
                 endpoint = connector.connect(destination)
+                while(getInfoHash().hashList == null) {
+                    currentState = WorkerState.HASHLIST
+                    HashListSession session = new HashListSession(me.toBase64(), infoHash, endpoint)
+                    InfoHash received = session.request()
+                    setInfoHash(received)
+                }
                 currentState = WorkerState.DOWNLOADING
                 boolean requestPerformed
-                while(!downloaded.isComplete()) {
+                while(!pieces.isComplete()) {
-                    currentSession = new DownloadSession(me.toBase64(), downloaded, claimed, infoHash, endpoint, file, pieceSize, length)
+                    currentSession = new DownloadSession(me.toBase64(), pieces, getInfoHash(), endpoint, incompleteFile, pieceSize, length)
                     requestPerformed = currentSession.request()
                     if (!requestPerformed)
                         break
+                    successfulDestinations.add(endpoint.destination)
                     writePieces()
                 }
             } catch (Exception bad) {
                 log.log(Level.WARNING,"Exception while downloading",bad)
             } finally {
                 currentState = WorkerState.FINISHED
-                if (downloaded.isComplete() && !eventFired) {
+                if (pieces.isComplete() && eventFired.compareAndSet(false, true)) {
-                    piecesFile.delete()
+                    synchronized(piecesFile) {
-                    eventFired = true
+                        piecesFileClosed = true
-                    eventBus.publish(new FileDownloadedEvent(downloadedFile : new DownloadedFile(file, infoHash, Collections.emptySet())))
+                        piecesFile.delete()
-                }
+                    }
+                    try {
+                        Files.move(incompleteFile.toPath(), file.toPath(), StandardCopyOption.ATOMIC_MOVE)
+                    } catch (AtomicMoveNotSupportedException e) {
+                        Files.copy(incompleteFile.toPath(), file.toPath(), StandardCopyOption.REPLACE_EXISTING)
+                        incompleteFile.delete()
+                    }
+                    eventBus.publish(
+                        new FileDownloadedEvent(
+                            downloadedFile : new DownloadedFile(file, getInfoHash(), pieceSizePow2, successfulDestinations),
+                        downloader : Downloader.this))
+                            
+                } 
                 endpoint?.close()
             }
         }

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

@@ -0,0 +1,82 @@
+package com.muwire.core.download
+
+import java.nio.ByteBuffer
+import java.nio.charset.StandardCharsets
+import java.security.MessageDigest
+import java.security.NoSuchAlgorithmException
+
+import com.muwire.core.Constants
+import com.muwire.core.InfoHash
+import com.muwire.core.connection.Endpoint
+
+import groovy.util.logging.Log
+
+import static com.muwire.core.util.DataUtil.readTillRN
+
+import net.i2p.data.Base64
+
+@Log
+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) {
+            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])
+        }
+        
+        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]
+        while(hashListBuf.hasRemaining()) {
+            if (hashListBuf.remaining() > tmp.length)
+                tmp = new byte[hashListBuf.remaining()]
+            int read = is.read(tmp)
+            if (read == -1)
+                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")
+        received
+    }
+}

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

@@ -1,7 +1,7 @@
 package com.muwire.core.download
 
 class Pieces {
-    private final BitSet bitSet
+    private final BitSet done, claimed
     private final int nPieces
     private final float ratio
     private final Random random = new Random()
@@ -13,52 +13,53 @@ class Pieces {
     Pieces(int nPieces, float ratio) {
         this.nPieces = nPieces
         this.ratio = ratio
-        bitSet = new BitSet(nPieces)
+        done = new BitSet(nPieces)
+        claimed = new BitSet(nPieces)
     }
     
-    synchronized int getRandomPiece() {
+    synchronized int claim() {
-        int cardinality = bitSet.cardinality()
+        int claimedCardinality = claimed.cardinality()
-        if (cardinality == nPieces)
+        if (claimedCardinality == nPieces)
             return -1
         
         // if fuller than ratio just do sequential
-        if ( (1.0f * cardinality) / nPieces > ratio) {
+        if ( (1.0f * claimedCardinality) / nPieces > ratio) {
-            return bitSet.nextClearBit(0)
+            int rv = claimed.nextClearBit(0)
+            claimed.set(rv)
+            return rv
         }
         
         while(true) {
             int start = random.nextInt(nPieces)
-            if (bitSet.get(start))
+            if (claimed.get(start))
                 continue
+            claimed.set(start)
             return start
         }
     }
     
-    def getDownloaded() {
+    synchronized def getDownloaded() {
         def rv = []
-        for (int i = bitSet.nextSetBit(0); i >= 0; i = bitSet.nextSetBit(i+1)) {
+        for (int i = done.nextSetBit(0); i >= 0; i = done.nextSetBit(i+1)) {
             rv << i
         }
         rv
     }
     
     synchronized void markDownloaded(int piece) {
-        bitSet.set(piece)
+        done.set(piece)
+        claimed.set(piece)
     }
     
-    synchronized void clear(int piece) {
+    synchronized void unclaim(int piece) {
-        bitSet.clear(piece)
+        claimed.clear(piece)
     }
     
     synchronized boolean isComplete() {
-        bitSet.cardinality() == nPieces
+        done.cardinality() == nPieces
-    }
-    
-    synchronized boolean isMarked(int piece) {
-        bitSet.get(piece)
     }
     
     synchronized int donePieces() {
-        bitSet.cardinality()
+        done.cardinality()
     }
 }

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

@@ -0,0 +1,7 @@
+package com.muwire.core.download
+
+import com.muwire.core.Event
+
+class UIDownloadCancelledEvent extends Event {
+    Downloader downloader
+}

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

@@ -3,8 +3,11 @@ 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
 }

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

@@ -0,0 +1,139 @@
+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.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.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 EventBus eventBus
+    private final FileManager fileManager
+    private final Thread watcherThread, publisherThread
+    private final Map<File, Long> waitingFiles = new ConcurrentHashMap<>()
+    private WatchService watchService
+    private volatile boolean shutdown
+    
+    DirectoryWatcher(EventBus eventBus, FileManager fileManager) {
+        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 start() {
+        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
+        Path path = e.file.getCanonicalFile().toPath()
+        path.register(watchService, kinds)
+        
+    }
+
+    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 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())
+    }
+    
+    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

@@ -2,10 +2,11 @@ package com.muwire.core.files
 
 import com.muwire.core.DownloadedFile
 import com.muwire.core.Event
+import com.muwire.core.download.Downloader
 
 import net.i2p.data.Destination
 
 class FileDownloadedEvent extends Event {
-
+    Downloader downloader
 	DownloadedFile downloadedFile
 }

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

@@ -1,6 +1,9 @@
 package com.muwire.core.files
 
 import com.muwire.core.InfoHash
+
+import net.i2p.data.Base64
+
 import java.nio.MappedByteBuffer
 import java.nio.channels.FileChannel
 import java.nio.channels.FileChannel.MapMode
@@ -17,12 +20,12 @@ class FileHasher {
 	 * @return the size of each piece in power of 2
 	 */
 	static int getPieceSize(long size) {
-		if (size <= 0x1 << 25)
+		if (size <= 0x1 << 30)
-			return 18
+			return 17
 		
-		for (int i = 26; i <= 37; i++) {
+		for (int i = 31; i <= 37; i++) {
 			if (size <= 0x1L << i) {
-				return i-7
+				return i-13
 			}
 		}
 		
@@ -67,4 +70,18 @@ class FileHasher {
 		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()
+        def infohash = hasher.hashFile(file)
+        println Base64.encode(infohash.getRoot())
+    }
 }

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

@@ -4,6 +4,7 @@ import com.muwire.core.EventBus
 import com.muwire.core.InfoHash
 import com.muwire.core.MuWireSettings
 import com.muwire.core.SharedFile
+import com.muwire.core.UILoadedEvent
 import com.muwire.core.search.ResultsEvent
 import com.muwire.core.search.SearchEvent
 import com.muwire.core.search.SearchIndex
@@ -26,20 +27,20 @@ class FileManager {
 		this.eventBus = eventBus
 	}
 	
-	void onFileHashedEvent(FileHashedEvent e) {
+    void onFileHashedEvent(FileHashedEvent e) {
-        if (settings.shareDownloadedFiles) {
+        if (e.sharedFile != null)
-            if (e.sharedFile != null)
+            addToIndex(e.sharedFile)
-                addToIndex(e.sharedFile)
+    }
-        }
-	}
 	
 	void onFileLoadedEvent(FileLoadedEvent e) {
 		addToIndex(e.loadedFile)
 	}
 	
-	void onFileDownloadedEvent(FileDownloadedEvent e) {
+    void onFileDownloadedEvent(FileDownloadedEvent e) {
-		addToIndex(e.downloadedFile)
+        if (settings.shareDownloadedFiles) {
-	}
+            addToIndex(e.downloadedFile)
+        }
+    }
 	
 	private void addToIndex(SharedFile sf) {
         log.info("Adding shared file " + sf.getFile())
@@ -105,20 +106,33 @@ class FileManager {
 		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)
+				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)
+				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 { 
+            if (it.getPieceSize() != 0)
+                rv.add(it)
+        }
+        rv
+    }
 }

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

@@ -32,7 +32,7 @@ class HasherService {
 	private void process(File f) {
 		f = f.getCanonicalFile()
 		if (f.isDirectory()) {
-			f.listFiles().each {onFileSharedEvent new FileSharedEvent(file: it) }
+			f.listFiles().each {eventBus.publish new FileSharedEvent(file: it) }
 		} else {
 			if (f.length() == 0) {
 				eventBus.publish new FileHashedEvent(error: "Not sharing empty file $f")
@@ -40,7 +40,7 @@ class HasherService {
 				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))
+				eventBus.publish new FileHashedEvent(sharedFile: new SharedFile(f, hash, FileHasher.getPieceSize(f.length())))
 			}
 		}
 	}

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

@@ -11,6 +11,7 @@ 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
@@ -36,14 +37,14 @@ class PersisterService extends Service {
 		timer = new Timer("file persister", true)
 	}
 	
-	void start() {
-		timer.schedule({load()} as TimerTask, 1)
-	}
-	
 	void stop() {
 		timer.cancel()
 	}
-	
+
+    void onUILoadedEvent(UILoadedEvent e) {
+        timer.schedule({load()} as TimerTask, 1)
+    }
+    	
 	void load() {
 		if (location.exists() && location.isFile()) {
 			def slurper = new JsonSlurper()
@@ -62,7 +63,9 @@ class PersisterService extends Service {
 			} catch (IllegalArgumentException|NumberFormatException e) {
                 log.log(Level.WARNING, "couldn't load files",e)
 			}
-		}
+		} else {
+            listener.publish(new AllFilesLoadedEvent())
+        }
 		timer.schedule({persistFiles()} as TimerTask, 0, interval)
 		loaded = true
 	}
@@ -98,14 +101,19 @@ class PersisterService extends Service {
 		if (!Arrays.equals(root, ih.getRoot()))
 			return null
 			
-		if (json.sources != 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, sourceSet)
+			DownloadedFile df = new DownloadedFile(file, ih, pieceSize, sourceSet)
 			return new FileLoadedEvent(loadedFile : df)
 		}
+        
 		 
-		SharedFile sf = new SharedFile(file, ih)
+		SharedFile sf = new SharedFile(file, ih, pieceSize)
 		return new FileLoadedEvent(loadedFile: sf)
 		
 	}
@@ -132,6 +140,7 @@ class PersisterService extends Service {
 		json.length = f.length()
 		InfoHash ih = sf.getInfoHash()
 		json.infoHash = Base64.encode ih.getRoot()
+        json.pieceSize = sf.getPieceSize()
 		byte [] tmp = new byte [32]
 		json.hashList = []
 		for (int i = 0;i < ih.getHashList().length / 32; i++) {

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

@@ -13,4 +13,8 @@ class QueryEvent extends Event {
     Persona originator
 	Destination receivedOn
 
+    String toString() {
+        "searchEvent: $searchEvent firstHop:$firstHop, replyTo:${replyTo.toBase32()}" +
+        "originator: ${originator.getHumanReadableName()} receivedOn: ${receivedOn.toBase32()}"
+    }
 }

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

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

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

@@ -1,5 +1,7 @@
 package com.muwire.core.search
 
+import java.util.stream.Collectors
+
 import javax.naming.directory.InvalidSearchControlsException
 
 import com.muwire.core.InfoHash
@@ -7,13 +9,25 @@ 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 {
         if (json.type != "Result")
             throw new InvalidSearchResultException("not a result json")
-        if (json.version != 1)
+        switch(json.version) {
-            throw new InvalidSearchResultException("unknown version $json.version")
+            case 1:
+                return parseV1(p, uuid, json)
+            case 2:
+                return parseV2(p, uuid, json)
+            default:
+                throw new InvalidSearchResultException("unknown version $json.version")
+
+        }
+
+    }
+    
+    private static parseV1(Persona p, UUID uuid, def json) {
         if (json.name == null)
             throw new InvalidSearchResultException("name missing")
         if (json.size == null)
@@ -47,9 +61,45 @@ class ResultsParser {
                  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")
+        if (json.size == null)
+            throw new InvalidSearchResultException("length missing")
+        if (json.infohash == null)
+            throw new InvalidSearchResultException("infohash missing")
+        if (json.pieceSize == null)
+            throw new InvalidSearchResultException("pieceSize missing")
+        if (json.hashList != null)
+            throw new InvalidSearchResultException("V2 result with hashlist")
+        try {
+            String name = DataUtil.readi18nString(Base64.decode(json.name))
+            long size = json.size
+            byte [] infoHash = Base64.decode(json.infohash)
+            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())
+            
+            return new UIResultEvent( sender : p,
+                name : name,
+                size : size,
+                infohash : new InfoHash(infoHash),
+                pieceSize : pieceSize,
+                sources : sources,
+                uuid: uuid)
+        } catch (Exception e) {
+            throw new InvalidSearchResultException("parsing search result failed",e)
+        }
+    }
 }

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

@@ -11,7 +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.stream.Collectors
 
+import com.muwire.core.DownloadedFile
 import com.muwire.core.EventBus
 import com.muwire.core.InfoHash
 
@@ -46,22 +48,30 @@ class ResultsSender {
         this.me = me
     }
     
-    void sendResults(UUID uuid, SharedFile[] results, Destination target) {
+    void sendResults(UUID uuid, SharedFile[] results, Destination target, boolean oobInfohash) {
-        log.info("Sending $results.length results for uuid $uuid to ${target.toBase32()}")
+        log.info("Sending $results.length results for uuid $uuid to ${target.toBase32()} oobInfohash : $oobInfohash")
         if (target.equals(me.destination)) {
             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 uiResultEvent = new UIResultEvent( sender : me,
                     name : it.getFile().getName(),
                     size : length,
                     infohash : it.getInfoHash(),
-                    pieceSize : FileHasher.getPieceSize(length),
+                    pieceSize : pieceSize,
-                    uuid : uuid
+                    uuid : uuid,
+                    sources : suggested
                     )
                     eventBus.publish(uiResultEvent)
             }
         } else {
-            executor.execute(new ResultSendJob(uuid : uuid, results : results, target: target))
+            executor.execute(new ResultSendJob(uuid : uuid, results : results, 
+                target: target, oobInfohash : oobInfohash))
         }
     }
     
@@ -69,6 +79,7 @@ class ResultsSender {
         UUID uuid
         SharedFile [] results
         Destination target
+        boolean oobInfohash
         
         @Override
         public void run() {
@@ -91,19 +102,24 @@ class ResultsSender {
                     String encodedName = Base64.encode(baos.toByteArray())
                     def obj = [:]
                     obj.type = "Result"
-                    obj.version = 1
+                    obj.version = oobInfohash ? 2 : 1
                     obj.name = encodedName
                     obj.infohash = Base64.encode(it.getInfoHash().getRoot())
                     obj.size = it.getFile().length()
-                    obj.pieceSize = FileHasher.getPieceSize(it.getFile().length())
+                    obj.pieceSize = it.getPieceSize()
-                    byte [] hashList = it.getInfoHash().getHashList()
+                    if (!oobInfohash) {
-                    def hashListB64 = []
+                        byte [] hashList = it.getInfoHash().getHashList()
-                    for (int i = 0; i < hashList.length / InfoHash.SIZE; i++) {
+                        def hashListB64 = []
-                        System.arraycopy(hashList, InfoHash.SIZE * i, tmp, 0, InfoHash.SIZE)
+                        for (int i = 0; i < hashList.length / InfoHash.SIZE; i++) {
-                        hashListB64 << Base64.encode(tmp)
+                            System.arraycopy(hashList, InfoHash.SIZE * i, tmp, 0, InfoHash.SIZE)
+                            hashListB64 << Base64.encode(tmp)
+                        }
+                        obj.hashList = hashListB64
                     }
-                    obj.hashList = hashListB64
+                    
-
+                    if (it instanceof DownloadedFile)
+                        obj.sources = it.sources.stream().map({dest -> dest.toBase64()}).collect(Collectors.toSet())
+                    
                     def json = jsonOutput.toJson(obj)
                     os.writeShort((short)json.length())
                     os.write(json.getBytes(StandardCharsets.US_ASCII))

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

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

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

@@ -42,7 +42,7 @@ class SearchIndex {
 		terms.each {
 			Set<String> forWord = keywords.getOrDefault(it,[])
 			if (rv == null) {
-				rv = forWord
+				rv = new HashSet<>(forWord)
 			} else {
 				rv.retainAll(forWord)
 			}

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

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

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

@@ -0,0 +1,8 @@
+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,11 +4,19 @@ 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
+    
+    @Override
+    public String toString() {
+        super.toString() + "name:$name size:$size sender:${sender.getHumanReadableName()} pieceSize $pieceSize"
+    }
 }

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

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

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

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

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

@@ -0,0 +1,5 @@
+package com.muwire.core.upload
+
+class ContentRequest extends Request {
+    Range range
+}

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

@@ -0,0 +1,73 @@
+package com.muwire.core.upload
+
+import java.nio.ByteBuffer
+import java.nio.channels.FileChannel
+import java.nio.charset.StandardCharsets
+import java.nio.file.Files
+import java.nio.file.StandardOpenOption
+
+import com.muwire.core.connection.Endpoint
+
+class ContentUploader extends Uploader {
+    
+    private final File file
+    private final ContentRequest request
+    
+    ContentUploader(File file, ContentRequest request, Endpoint endpoint) {
+        super(endpoint)
+        this.file = file
+        this.request = request
+    }
+    
+    @Override
+    void respond() {
+        OutputStream os = endpoint.getOutputStream()
+        Range range = request.getRange()
+        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\r\n".getBytes(StandardCharsets.US_ASCII))
+
+        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)
+            byte [] tmp = new byte[0x1 << 13]
+            while(mapped.hasRemaining()) {
+                int start = mapped.position()
+                synchronized(this) {
+                    mapped.get(tmp, 0, Math.min(tmp.length, mapped.remaining()))
+                }
+                int read = mapped.position() - start
+                endpoint.getOutputStream().write(tmp, 0, read)
+            }
+        } finally {
+            try {channel?.close() } catch (IOException ignored) {}
+            endpoint.getOutputStream().flush()
+        }
+    }
+
+    @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()
+    }
+
+}

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

@@ -0,0 +1,4 @@
+package com.muwire.core.upload
+
+class HashListRequest extends Request {
+}

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

@@ -0,0 +1,55 @@
+package com.muwire.core.upload
+
+import java.nio.ByteBuffer
+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()
+            synchronized(this) {
+                mapped.get(tmp, 0, Math.min(tmp.length, mapped.remaining()))
+            }
+            int read = mapped.position() - start
+            endpoint.getOutputStream().write(tmp, 0, read)
+        }
+        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()
+    }
+    
+    
+}

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

@@ -16,57 +16,12 @@ class Request {
     private static final byte N = "\n".getBytes(StandardCharsets.US_ASCII)[0]
     
     InfoHash infoHash
-    Range range
     Persona downloader
     Map<String, String> headers
     
-    static Request parse(InfoHash infoHash, InputStream is) throws IOException {
+    static Request parseContentRequest(InfoHash infoHash, InputStream is) throws IOException {
-        Map<String,String> headers = new HashMap<>()
+        
-        byte [] tmp = new byte[Constants.MAX_HEADER_SIZE]
+        Map<String, String> headers = parseHeaders(is)
-        while(headers.size() < Constants.MAX_HEADERS) {
-            boolean r = false
-            boolean n = false
-            int idx = 0
-            while (true) {
-                byte read = is.read()
-                if (read == -1)
-                    throw new IOException("Stream closed")
-                    
-                if (!r && read == N)
-                    throw new IOException("Received N before R")
-                if (read == R) {
-                    if (r) 
-                        throw new IOException("double R")
-                    r = true
-                    continue
-                }
-                
-                if (r && !n) {
-                    if (read != N) 
-                        throw new IOException("R not followed by N")
-                    n = true
-                    break
-                }
-                if (idx == 0x1 << 14)
-                    throw new IOException("Header too long")    
-                tmp[idx++] = read
-            }
-            
-            if (idx == 0)
-                break
-                
-            String header = new String(tmp, 0, idx, StandardCharsets.US_ASCII)
-            log.fine("Read header $header")
-            
-            int keyIdx = header.indexOf(":")
-            if (keyIdx < 1)
-                throw new IOException("Header key not found")
-            if (keyIdx == header.length())
-                throw new IOException("Header value not found")
-            String key = header.substring(0, keyIdx)
-            String value = header.substring(keyIdx + 1)
-            headers.put(key, value)
-        }
         
         if (!headers.containsKey("Range"))
             throw new IOException("Range header not found")
@@ -93,7 +48,69 @@ class Request {
             def decoded = Base64.decode(encoded)
             downloader = new Persona(new ByteArrayInputStream(decoded))
         }
-        new Request( infoHash : infoHash, range : new Range(start, end), headers : headers, downloader : downloader)
+        new ContentRequest( infoHash : infoHash, range : new Range(start, end), 
+            headers : headers, downloader : downloader)
+    }
+    
+    static Request parseHashListRequest(InfoHash infoHash, InputStream is) throws IOException {
+        Map<String,String> headers = parseHeaders(is)
+        Persona downloader = null
+        if (headers.containsKey("X-Persona")) {
+            def encoded = headers["X-Persona"].trim()
+            def decoded = Base64.decode(encoded)
+            downloader = new Persona(new ByteArrayInputStream(decoded))
+        }
+        new HashListRequest(infoHash : infoHash, headers : headers, downloader : downloader)
+    }
+    
+    private static Map<String, String> parseHeaders(InputStream is) {
+        Map<String,String> headers = new HashMap<>()
+        byte [] tmp = new byte[Constants.MAX_HEADER_SIZE]
+        while(headers.size() < Constants.MAX_HEADERS) {
+            boolean r = false
+            boolean n = false
+            int idx = 0
+            while (true) {
+                byte read = is.read()
+                if (read == -1)
+                    throw new IOException("Stream closed")
+                    
+                if (!r && read == N)
+                    throw new IOException("Received N before R")
+                if (read == R) {
+                    if (r)
+                        throw new IOException("double R")
+                    r = true
+                    continue
+                }
+                
+                if (r && !n) {
+                    if (read != N)
+                        throw new IOException("R not followed by N")
+                    n = true
+                    break
+                }
+                if (idx == 0x1 << 14)
+                    throw new IOException("Header too long")
+                tmp[idx++] = read
+            }
+            
+            if (idx == 0)
+                break
+                
+            String header = new String(tmp, 0, idx, StandardCharsets.US_ASCII)
+            log.fine("Read header $header")
+            
+            int keyIdx = header.indexOf(":")
+            if (keyIdx < 1)
+                throw new IOException("Header key not found")
+            if (keyIdx == header.length())
+                throw new IOException("Header value not found")
+            String key = header.substring(0, keyIdx)
+            String value = header.substring(keyIdx + 1)
+            headers.put(key, value)
+        }
+        headers
     }
     
 }

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

@@ -23,9 +23,9 @@ public class UploadManager {
         this.fileManager = fileManager
     }
     
-    public void processEndpoint(Endpoint e) throws IOException {
+    public void processGET(Endpoint e) throws IOException {
         byte [] infoHashStringBytes = new byte[44]
-                DataInputStream dis = new DataInputStream(e.getInputStream())
+        DataInputStream dis = new DataInputStream(e.getInputStream())
         boolean first = true
         while(true) {
             if (first)
@@ -61,13 +61,13 @@ public class UploadManager {
                 return
             }
 
-            Request request = Request.parse(new InfoHash(infoHashRoot), e.getInputStream())
+            Request request = Request.parseContentRequest(new InfoHash(infoHashRoot), e.getInputStream())
             if (request.downloader != null && request.downloader.destination != e.destination) {
                 log.info("Downloader persona doesn't match their destination")
                 e.close()
                 return
             }
-            Uploader uploader = new Uploader(sharedFiles.iterator().next().file, request, e)
+            Uploader uploader = new ContentUploader(sharedFiles.iterator().next().file, request, e)
             eventBus.publish(new UploadEvent(uploader : uploader))
             try {
                 uploader.respond()
@@ -75,7 +75,92 @@ public class UploadManager {
                 eventBus.publish(new UploadFinishedEvent(uploader : uploader))
             }
         }
+    }
+    
+    public void processHashList(Endpoint e) {
+        byte [] infoHashStringBytes = new byte[44]
+        DataInputStream dis = new DataInputStream(e.getInputStream())
+        dis.readFully(infoHashStringBytes)
+        String infoHashString = new String(infoHashStringBytes, StandardCharsets.US_ASCII)
+        log.info("Responding to hashlist request for root $infoHashString")
         
+        byte [] infoHashRoot = Base64.decode(infoHashString)
+        Set<SharedFile> sharedFiles = fileManager.getSharedFiles(infoHashRoot)
+        if (sharedFiles == null || sharedFiles.isEmpty()) {
+            log.info "file not found"
+            e.getOutputStream().write("404 File Not Found\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
+            e.getOutputStream().flush()
+            e.close()
+            return
+        }
+        
+        byte [] rn = new byte[2]
+        dis.readFully(rn)
+        if (rn != "\r\n".getBytes(StandardCharsets.US_ASCII)) {
+            log.warning("Malformed HASHLIST header")
+            e.close()
+            return
+        }
+        
+        Request request = Request.parseHashListRequest(new InfoHash(infoHashRoot), e.getInputStream())
+        if (request.downloader != null && request.downloader.destination != e.destination) {
+            log.info("Downloader persona doesn't match their destination")
+            e.close()
+            return
+        }
+        Uploader uploader = new HashListUploader(e, sharedFiles.iterator().next().infoHash, request)
+        eventBus.publish(new UploadEvent(uploader : uploader))
+        try {
+            uploader.respond()
+        } finally {
+            eventBus.publish(new UploadFinishedEvent(uploader : uploader))
+        }
+        
+        // proceed with content
+        while(true) {
+            byte[] get = new byte[4]
+            dis.readFully(get)
+            if (get != "GET ".getBytes(StandardCharsets.US_ASCII)) {
+                log.warning("received a method other than GET on subsequent call")
+                e.close()
+                return
+            }
+            dis.readFully(infoHashStringBytes)
+            infoHashString = new String(infoHashStringBytes, StandardCharsets.US_ASCII)
+            log.info("Responding to upload request for root $infoHashString")
+
+            infoHashRoot = Base64.decode(infoHashString)
+            sharedFiles = fileManager.getSharedFiles(infoHashRoot)
+            if (sharedFiles == null || sharedFiles.isEmpty()) {
+                log.info "file not found"
+                e.getOutputStream().write("404 File Not Found\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
+                e.getOutputStream().flush()
+                e.close()
+                return
+            }
+
+            rn = new byte[2]
+            dis.readFully(rn)
+            if (rn != "\r\n".getBytes(StandardCharsets.US_ASCII)) {
+                log.warning("Malformed GET header")
+                e.close()
+                return
+            }
+
+            request = Request.parseContentRequest(new InfoHash(infoHashRoot), e.getInputStream())
+            if (request.downloader != null && request.downloader.destination != e.destination) {
+                log.info("Downloader persona doesn't match their destination")
+                e.close()
+                return
+            }
+            uploader = new ContentUploader(sharedFiles.iterator().next().file, request, e)
+            eventBus.publish(new UploadEvent(uploader : uploader))
+            try {
+                uploader.respond()
+            } finally {
+                eventBus.publish(new UploadFinishedEvent(uploader : uploader))
+            }
+        }
     }
 }
 

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

@@ -8,52 +8,28 @@ import java.nio.file.StandardOpenOption
 
 import com.muwire.core.connection.Endpoint
 
-class Uploader {
+abstract class Uploader {
-    private final File file
+    protected final Endpoint endpoint
-    private final Request request
+    protected ByteBuffer mapped
-    private final Endpoint endpoint
-    private ByteBuffer mapped
     
-    Uploader(File file, Request request, Endpoint endpoint) {
+    Uploader(Endpoint endpoint) {
-        this.file = file
-        this.request = request
         this.endpoint = endpoint
     }
     
-    void respond() {
+    abstract void respond()
-        OutputStream os = endpoint.getOutputStream()
+        
-        Range range = request.getRange()
-        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\r\n".getBytes(StandardCharsets.US_ASCII))        
-
-        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)
-            byte [] tmp = new byte[0x1 << 13]
-            while(mapped.hasRemaining()) {
-                int start = mapped.position()
-                synchronized(this) {
-                    mapped.get(tmp, 0, Math.min(tmp.length, mapped.remaining()))
-                }
-                int read = mapped.position() - start
-                endpoint.getOutputStream().write(tmp, 0, read)
-            }
-        } finally {
-            try {channel?.close() } catch (IOException ignored) {}
-            endpoint.getOutputStream().flush()
-        }     
-    }
-    
     public synchronized int getPosition() {
         if (mapped == null)
             return -1
         mapped.position()
     }
+    
+    abstract String getName();
+    
+    /**
+     * @return an integer between 0 and 100
+     */
+    abstract int getProgress();
+    
+    abstract String getDownloader();
 }

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

@@ -9,8 +9,8 @@ public class DownloadedFile extends SharedFile {
 	
 	private final Set<Destination> sources;
 
-	public DownloadedFile(File file, InfoHash infoHash, Set<Destination> sources) {
+	public DownloadedFile(File file, InfoHash infoHash, int pieceSize, Set<Destination> sources) {
-		super(file, infoHash);
+		super(file, infoHash, pieceSize);
 		this.sources = sources;
 	}
 	

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

@@ -7,6 +7,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import net.i2p.data.Base32;
+import net.i2p.data.Base64;
 
 public class InfoHash {
 
@@ -76,14 +77,16 @@ public class InfoHash {
 	}
 	
 	public String toString() {
-		String rv = "InfoHash[root:"+Base32.encode(root) + " hashList:";
+		String rv = "InfoHash[root:"+Base64.encode(root) + " hashList:";
-		List<String> b32HashList = new ArrayList<>(hashList.length / SIZE);
+		List<String> b64HashList = new ArrayList<>();
-		byte [] tmp = new byte[SIZE];
+		if (hashList != null) {       
-		for (int i = 0; i < hashList.length / SIZE; i++) {
+		    byte [] tmp = new byte[SIZE];
-			System.arraycopy(hashList, SIZE * i, tmp, 0, SIZE);
+		    for (int i = 0; i < hashList.length / SIZE; i++) {
-			b32HashList.add(Base32.encode(tmp));
+		        System.arraycopy(hashList, SIZE * i, tmp, 0, SIZE);
+		        b64HashList.add(Base64.encode(tmp));
+		    }
 		}
-		rv += b32HashList.toString();
+		rv += b64HashList.toString();
 		rv += "]";
 		return rv;
 	}

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

@@ -6,10 +6,12 @@ public class SharedFile {
 
 	private final File file;
 	private final InfoHash infoHash;
+	private final int pieceSize;
 	
-	public SharedFile(File file, InfoHash infoHash) {
+	public SharedFile(File file, InfoHash infoHash, int pieceSize) {
 		this.file = file;
 		this.infoHash = infoHash;
+		this.pieceSize = pieceSize;
 	}
 
 	public File getFile() {
@@ -20,4 +22,20 @@ public class SharedFile {
 		return infoHash;
 	}
 	
+	public int getPieceSize() {
+	    return pieceSize;
+	}
+	
+	@Override
+	public int hashCode() {
+	    return file.hashCode() ^ infoHash.hashCode();
+	}
+	
+	@Override
+	public boolean equals(Object o) {
+	    if (!(o instanceof SharedFile))
+	        return false;
+	    SharedFile other = (SharedFile)o;
+	    return file.equals(other.file) && infoHash.equals(other.infoHash);
+	}
 }

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

@@ -43,6 +43,9 @@ class ConnectionAcceptorTest {
     
     def uploadManagerMock
     UploadManager uploadManager
+    
+    def connectionEstablisherMock
+    ConnectionEstablisher connectionEstablisher
 	
 	ConnectionAcceptor acceptor
 	List<ConnectionEvent> connectionEvents
@@ -57,6 +60,7 @@ class ConnectionAcceptorTest {
 		trustServiceMock = new MockFor(TrustService.class)
         searchManagerMock = new MockFor(SearchManager.class)
         uploadManagerMock = new MockFor(UploadManager.class)
+        connectionEstablisherMock = new MockFor(ConnectionEstablisher.class)
 	}
 	
 	@After
@@ -68,6 +72,7 @@ class ConnectionAcceptorTest {
 		trustServiceMock.verify trustService
         searchManagerMock.verify searchManager
         uploadManagerMock.verify uploadManager
+        connectionEstablisherMock.verify connectionEstablisher
 		Thread.sleep(100)
 	}
 	
@@ -87,8 +92,10 @@ class ConnectionAcceptorTest {
 		trustService = trustServiceMock.proxyInstance()
         searchManager = searchManagerMock.proxyInstance()
         uploadManager = uploadManagerMock.proxyInstance()
+        connectionEstablisher = connectionEstablisherMock.proxyInstance()
 		
-		acceptor = new ConnectionAcceptor(eventBus, connectionManager, settings, i2pAcceptor, hostCache, trustService, searchManager, uploadManager)
+		acceptor = new ConnectionAcceptor(eventBus, connectionManager, settings, i2pAcceptor, 
+            hostCache, trustService, searchManager, uploadManager, connectionEstablisher)
 		acceptor.start()
 		Thread.sleep(100)
 	}
@@ -108,6 +115,7 @@ class ConnectionAcceptorTest {
 			new Endpoint(destinations.dest1, is, os, null)
 		}
 		i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
+        connectionEstablisherMock.demand.isInProgress(destinations.dest1) { false }
         connectionManagerMock.demand.isConnected { dest ->
             assert dest == destinations.dest1
             false
@@ -150,6 +158,7 @@ class ConnectionAcceptorTest {
 			new Endpoint(destinations.dest1, is, os, null)
 		}
 		i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
+        connectionEstablisherMock.demand.isInProgress(destinations.dest1) { false }
         connectionManagerMock.demand.isConnected { dest ->
             assert dest == destinations.dest1
             false
@@ -264,6 +273,7 @@ class ConnectionAcceptorTest {
 			new Endpoint(destinations.dest1, is, os, null)
 		}
 		i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
+        connectionEstablisherMock.demand.isInProgress(destinations.dest1) { false }
         connectionManagerMock.demand.isConnected { dest ->
             assert dest == destinations.dest1
             false
@@ -310,6 +320,7 @@ class ConnectionAcceptorTest {
 			new Endpoint(destinations.dest1, is, os, null)
 		}
 		i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
+        connectionEstablisherMock.demand.isInProgress(destinations.dest1) { false }
         connectionManagerMock.demand.isConnected { dest ->
             assert dest == destinations.dest1
             false
@@ -356,6 +367,7 @@ class ConnectionAcceptorTest {
 			new Endpoint(destinations.dest1, is, os, null)
 		}
 		i2pAcceptorMock.demand.accept { Thread.sleep(Integer.MAX_VALUE) }
+        connectionEstablisherMock.demand.isInProgress(destinations.dest1) { false }
         connectionManagerMock.demand.isConnected { dest ->
             assert dest == destinations.dest1
             false

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

@@ -24,9 +24,9 @@ class FileHasherTest extends GroovyTestCase {
 	
 	@Test
 	void testPieceSize() {
-		assert 18 == FileHasher.getPieceSize(1000000)
+		assert 17 == FileHasher.getPieceSize(1000000)
-		assert 20 == FileHasher.getPieceSize(100000000)
+		assert 17 == FileHasher.getPieceSize(100000000)
-		assert 30 == FileHasher.getPieceSize(FileHasher.MAX_SIZE)
+		assert 27 == FileHasher.getPieceSize(FileHasher.MAX_SIZE)
 		shouldFail IllegalArgumentException, {
 			FileHasher.getPieceSize(Long.MAX_VALUE)
 		}
@@ -48,7 +48,7 @@ class FileHasherTest extends GroovyTestCase {
 		fos.write b
 		fos.close()
 		def ih = hasher.hashFile tmp
-		assert ih.getHashList().length == 32
+		assert ih.getHashList().length == 64
 	}
 	
 	@Test
@@ -58,7 +58,7 @@ class FileHasherTest extends GroovyTestCase {
 		fos.write b
 		fos.close()
 		def ih = hasher.hashFile tmp
-		assert ih.getHashList().length == 64
+		assert ih.getHashList().length == 96
 	}
 	
 	@Test
@@ -68,7 +68,7 @@ class FileHasherTest extends GroovyTestCase {
 		fos.write b
 		fos.close()
 		def ih = hasher.hashFile tmp
-		assert ih.getHashList().length == 64
+		assert ih.getHashList().length == 128
 	}
 	
 	@Test
@@ -78,6 +78,6 @@ class FileHasherTest extends GroovyTestCase {
 		fos.write b
 		fos.close()
 		def ih = hasher.hashFile tmp
-		assert ih.getHashList().length == 32 * 3
+		assert ih.getHashList().length == 160
 	}
 }

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

@@ -5,6 +5,7 @@ import org.junit.Test
 
 import com.muwire.core.EventBus
 import com.muwire.core.InfoHash
+import com.muwire.core.MuWireSettings
 import com.muwire.core.SharedFile
 import com.muwire.core.search.ResultsEvent
 import com.muwire.core.search.SearchEvent
@@ -26,7 +27,7 @@ class FileManagerTest {
 	void before() {
 		eventBus = new EventBus()
 		eventBus.register(ResultsEvent.class, listener)
-		manager = new FileManager(eventBus)
+		manager = new FileManager(eventBus, new MuWireSettings())
 		results = null
 	}
 	
@@ -34,7 +35,7 @@ class FileManagerTest {
 	void testHash1Result() {
 		File f = new File("a b.c")
 		InfoHash ih = InfoHash.fromHashList(new byte[32])
-		SharedFile sf = new SharedFile(f,ih)
+		SharedFile sf = new SharedFile(f,ih, 0)
 		FileHashedEvent fhe = new FileHashedEvent(sharedFile: sf)
 		manager.onFileHashedEvent(fhe)
 		
@@ -53,8 +54,8 @@ class FileManagerTest {
 	@Test
 	void testHash2Results() {
 		InfoHash ih = InfoHash.fromHashList(new byte[32])
-		SharedFile sf1 = new SharedFile(new File("a b.c"), ih)
+		SharedFile sf1 = new SharedFile(new File("a b.c"), ih, 0)
-		SharedFile sf2 = new SharedFile(new File("d e.f"), ih)
+		SharedFile sf2 = new SharedFile(new File("d e.f"), ih, 0)
 		manager.onFileLoadedEvent new FileLoadedEvent(loadedFile : sf1)
 		manager.onFileLoadedEvent new FileLoadedEvent(loadedFile : sf2)
 
@@ -75,7 +76,7 @@ class FileManagerTest {
 	void testHash0Results() {
 		File f = new File("a b.c")
 		InfoHash ih = InfoHash.fromHashList(new byte[32])
-		SharedFile sf = new SharedFile(f,ih)
+		SharedFile sf = new SharedFile(f,ih, 0)
 		FileHashedEvent fhe = new FileHashedEvent(sharedFile: sf)
 		manager.onFileHashedEvent(fhe)
 		
@@ -89,7 +90,7 @@ class FileManagerTest {
 	void testKeyword1Result() {
 		File f = new File("a b.c")
 		InfoHash ih = InfoHash.fromHashList(new byte[32])
-		SharedFile sf = new SharedFile(f,ih)
+		SharedFile sf = new SharedFile(f,ih,0)
 		FileHashedEvent fhe = new FileHashedEvent(sharedFile: sf)
 		manager.onFileHashedEvent(fhe)
 		
@@ -107,12 +108,12 @@ class FileManagerTest {
 	void testKeyword2Results() {
 		File f1 = new File("a b.c")
 		InfoHash ih1 = InfoHash.fromHashList(new byte[32])
-		SharedFile sf1 = new SharedFile(f1, ih1)
+		SharedFile sf1 = new SharedFile(f1, ih1, 0)
 		manager.onFileLoadedEvent new FileLoadedEvent(loadedFile: sf1)
 		
 		File f2 = new File("c d.e")
 		InfoHash ih2 = InfoHash.fromHashList(new byte[64])
-		SharedFile sf2 = new SharedFile(f2, ih2)
+		SharedFile sf2 = new SharedFile(f2, ih2, 0)
 		manager.onFileLoadedEvent new FileLoadedEvent(loadedFile: sf2)
 		
 		UUID uuid = UUID.randomUUID()
@@ -130,7 +131,7 @@ class FileManagerTest {
 	void testKeyword0Results() {
 		File f = new File("a b.c")
 		InfoHash ih = InfoHash.fromHashList(new byte[32])
-		SharedFile sf = new SharedFile(f,ih)
+		SharedFile sf = new SharedFile(f,ih,0)
 		FileHashedEvent fhe = new FileHashedEvent(sharedFile: sf)
 		manager.onFileHashedEvent(fhe)
 		
@@ -143,8 +144,8 @@ class FileManagerTest {
 	@Test
 	void testRemoveFileExistingHash() {
 		InfoHash ih = InfoHash.fromHashList(new byte[32])
-		SharedFile sf1 = new SharedFile(new File("a b.c"), ih)
+		SharedFile sf1 = new SharedFile(new File("a b.c"), ih, 0)
-		SharedFile sf2 = new SharedFile(new File("d e.f"), ih)
+		SharedFile sf2 = new SharedFile(new File("d e.f"), ih, 0)
 		manager.onFileLoadedEvent new FileLoadedEvent(loadedFile : sf1)
 		manager.onFileLoadedEvent new FileLoadedEvent(loadedFile : sf2)
 		
@@ -161,12 +162,12 @@ class FileManagerTest {
 	void testRemoveFile() {
 		File f1 = new File("a b.c")
 		InfoHash ih1 = InfoHash.fromHashList(new byte[32])
-		SharedFile sf1 = new SharedFile(f1, ih1)
+		SharedFile sf1 = new SharedFile(f1, ih1, 0)
 		manager.onFileLoadedEvent new FileLoadedEvent(loadedFile: sf1)
 		
 		File f2 = new File("c d.e")
 		InfoHash ih2 = InfoHash.fromHashList(new byte[64])
-		SharedFile sf2 = new SharedFile(f2, ih2)
+		SharedFile sf2 = new SharedFile(f2, ih2, 0)
 		manager.onFileLoadedEvent new FileLoadedEvent(loadedFile: sf2)
 		
 		manager.onFileUnsharedEvent new FileUnsharedEvent(unsharedFile: sf2)

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

@@ -8,6 +8,7 @@ import org.junit.Before
 import org.junit.Test
 
 import com.muwire.core.EventBus
+import com.muwire.core.MuWireSettings
 
 class HasherServiceTest {
 
@@ -24,7 +25,7 @@ class HasherServiceTest {
 	void before() {
         eventBus = new EventBus()
 		hasher = new FileHasher()
-		service = new HasherService(hasher, eventBus)
+		service = new HasherService(hasher, eventBus, new FileManager(eventBus, new MuWireSettings()))
         eventBus.register(FileHashedEvent.class, listener)
 		service.start()
 	}

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

@@ -99,7 +99,7 @@ class PersisterServiceLoadingTest {
 		FileHasher fh = new FileHasher()
 		InfoHash ih1 = fh.hashFile(sharedFile1)
 		
-		assert ih1.getHashList().length == 2 * 32
+		assert ih1.getHashList().length == 96
 		
 		def json = [:]
 		json.file = getSharedFileJsonName(sharedFile1)
@@ -111,7 +111,9 @@ class PersisterServiceLoadingTest {
 		String hash1 = Base64.encode(tmp)
 		System.arraycopy(ih1.getHashList(), 32, tmp, 0, 32)
 		String hash2 = Base64.encode(tmp)
-		json.hashList = [hash1, hash2]
+        System.arraycopy(ih1.getHashList(), 64, tmp, 0, 32)
+        String hash3 = Base64.encode(tmp)
+		json.hashList = [hash1, hash2, hash3]
 		
 		json = JsonOutput.toJson(json)
 		

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

@@ -8,6 +8,7 @@ import com.muwire.core.Destinations
 import com.muwire.core.DownloadedFile
 import com.muwire.core.EventBus
 import com.muwire.core.InfoHash
+import com.muwire.core.MuWireSettings
 import com.muwire.core.SharedFile
 import com.muwire.core.util.DataUtil
 
@@ -31,7 +32,7 @@ class PersisterServiceSavingTest {
 		f = new File("build.gradle")
 		f = f.getCanonicalFile()
 		ih = fh.hashFile(f)
-		fileSource = new FileManager(eventBus) {
+		fileSource = new FileManager(eventBus, new MuWireSettings()) {
 					Map<File, SharedFile> getSharedFiles() {
 						Map<File, SharedFile> rv = new HashMap<>()
 						rv.put(f, sf)
@@ -54,7 +55,7 @@ class PersisterServiceSavingTest {
 	
 	@Test
 	void testSavingSharedFile() {
-		sf = new SharedFile(f, ih)
+		sf = new SharedFile(f, ih, 0)
 		
 		ps = new PersisterService(persisted, eventBus, 100, fileSource)
 		ps.start()
@@ -73,7 +74,7 @@ class PersisterServiceSavingTest {
 	@Test
 	void testSavingDownloadedFile() {
 		Destinations dests = new Destinations()
-		sf = new DownloadedFile(f, ih, new HashSet([dests.dest1, dests.dest2]))
+		sf = new DownloadedFile(f, ih, 0, new HashSet([dests.dest1, dests.dest2]))
 		
 		ps = new PersisterService(persisted, eventBus, 100, fileSource)
 		ps.start()

core/src/test/groovy/com/muwire/core/search/SearchIndexTest.groovy

@@ -30,7 +30,18 @@ class SearchIndexTest {
 		assert found.size() == 2
 		assert found.contains("a b.c")
 		assert found.contains("c d.e")
+        
 	}
+    
+    @Test
+    public void testDrillDownDoesNotModifyIndex() {
+        initIndex(["a b.c", "c d.e"])
+        index.search(["c","e"])
+        def found = index.search(["c"])
+        assert found.size() == 2
+        assert found.contains("a b.c")
+        assert found.contains("c d.e")
+    }
 	
 	@Test
 	void testDrillDown() {

doc/infohash-upgrade.md

@@ -0,0 +1,37 @@
+# InfoHash Upgrade
+
+An infohash is a list of hashes of the pieces of the file.  In MuWire 0.1.0 the piece size is determined by policy based on the file size, with the intention being to keep the list of hashes to maximum 128 in number.  The reason for this is that infohashes get returned with search results, and smaller piece size will result in larger infohash which will slow down the transmission of search results.
+
+### The problem
+
+This presents the following problem - larger files have larger piece sizes: a 2GB file will have a 16MB piece size, a 4GB file 32MB and so on.  Pieces are atomic, i.e. if a download fails halfway through a piece it will resume since the beginning of the piece.  Unfortunately in the current state of I2P the failure rate of streaming connections is too high and transmitting an entire piece over a single connection is not likely to succeed as the size of the piece increases.  This makes downloading multi-gigabyte files nearly impossible.
+
+### Out-of-band request proposal
+
+Barring any improvement to the reliability of I2P connections, the following approach can be used to enable smaller piece sizes and the corresponding increase in download success rate of large files:
+
+* Search results do carry the full infohash of the file, instead they carry just the root and the number of 32-byte hashes in the infohash
+* When a downloader begins a download, it issues a request for the full infohash first.  Only after that is fetched and verified, the download proceeds as usual.
+
+Such approach is more complicated in nature than the current simplistic one, but it has the additional benefit of reducing the size of search results.
+
+### Wire protocol changes
+
+A new request method - "HASHLIST" is introduced.  It is immediately followed by the Base64 encoded root of the infohash and '\r\n'.  The request may contain HTTP headers in the same format as in HTTP 1.1.  One such header may be the X-Persona header, but that is optional.  After all the headers a blank line with just '\r\n' is sent.
+
+The response is identical to that of regular GET request, with the same response codes.  The response may also carry headers, and is also followed by a blank line with '\r\n'.  What follows immediately after that is a binary representation of the hashlist.  After sending the full hashlist, the uploader keeps the connection open in anticipation of the first content GET request.
+
+The downloader verifies the hashlist by hashing it with SHA256 and comparing it to the advertised infohash root.  If there is a match, it proceeds with the rest of the download as in MuWire 0.1.0.
+
+### Necessary changes to MuWire 0.1.0
+
+To accommodate this proposal in a backwards compatible manner, it is necessary to first de-hardcode the piece count computation logic which is currently hardcoded in a few places.  Then it is necessary to:
+
+* persist the piece size to disk when a file is being shared so that it can be returned in search results
+* search queries need to carry a flag of some kind that indicates support for out-of-band infohash support
+  * that in turn requires nodes to support passing of that flag as the queries are being routed through the network
+* the returned results need to indicate whether they are returning a full infohash or just a root; the "version" field in the json can be used for that
+
+### Roadmap
+
+Support for this proposal is currently intended for MuWire 0.2.0.  However, in order to make rollout smooth, in MuWire 0.1.1 support for the first two items will be introduced.  Since there already are users on the network who have shared files without persisting the size of their pieces on disk, those files will not be eligible to participate in this scheme unless re-shared (which implies re-hashing).

doc/wire-protocol.md

@@ -131,12 +131,18 @@ Sent by a leaf or ultrapeer when performing a search.  Contains the reply-to per
     firstHop: false,
     keywords : ["keyword1","keyword2"...]
     infohash: "asdfasdf...",
-    replyTo : "asdfasf...b64"
+    replyTo : "asdfasf...b64",
+    originator : "asfasdf...",
+    "oobHashlist" : true
 }
 ```
 
 A search can contain either the query entered by the user in the UI or the infohash if the user is looking for a specific file.  If both are present, the infohash takes precedence and the keyword query is ignored.
 
+The "originator" field contains the Base64-encoded persona of the originator of the query.  It is used for display purposes only.  The I2P destination in that persona must match the one in the "replyTo" field.
+
+The oobHashlist flag indicates support for out-of-band hashlist delivery, which is not yet implemented.  Nevertheless, this flag gets propagated through the network for future-proofing.
+
 ### Ultrapeer to leaf
 
 The "Search" message is also sent from an ultrapeer to a leaf.
@@ -175,6 +181,8 @@ Search results are sent through and HTTP POST method from the responder to the o
 * The "altlocs" list contains list of alternate personas that the responder thinks may also have the file.
 * The "pieceSize" field is the size of the each individual file piece (except possibly the last) in powers of 2
 
+Results version 1 contain the full hashlist, version 2 does not contain that list.  See the "infohash-upgrade" document for more information.
+
 ### "Who do you trust" query - any node to any node
 (See the "web-of-trust" document for more info on this query)
 

gradle.properties

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

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

@@ -7,12 +7,15 @@ import griffon.core.mvc.MVCGroup
 import griffon.core.mvc.MVCGroupConfiguration
 import griffon.inject.MVCMember
 import griffon.metadata.ArtifactProviderFor
+import net.i2p.data.Base64
+
 import javax.annotation.Nonnull
 import javax.inject.Inject
 
 import com.muwire.core.Constants
 import com.muwire.core.Core
 import com.muwire.core.download.DownloadStartedEvent
+import com.muwire.core.download.UIDownloadCancelledEvent
 import com.muwire.core.download.UIDownloadEvent
 import com.muwire.core.search.QueryEvent
 import com.muwire.core.search.SearchEvent
@@ -36,21 +39,58 @@ class MainFrameController {
         cardsPanel.getLayout().show(cardsPanel, "search window")
         
         def search = builder.getVariable("search-field").text
+        search = search.trim()
+        if (search.length() == 0)
+            return
         def uuid = UUID.randomUUID()
         Map<String, Object> params = new HashMap<>()
         params["search-terms"] = search
         params["uuid"] = uuid.toString()
         def group = mvcGroup.createMVCGroup("SearchTab", uuid.toString(), params)
         model.results[uuid.toString()] = group
+
+        boolean hashSearch = false
+        byte [] root = null
+        if (search.length() == 44 && search.indexOf(" ") < 0) {
+            try {
+                root = Base64.decode(search)
+                hashSearch = true
+            } catch (Exception e) {
+                // not a hash search
+            }
+        }
         
-        // this can be improved a lot
+        def searchEvent
-        def terms = search.toLowerCase().trim().split(Constants.SPLIT_PATTERN)
+        if (hashSearch) {
-        def searchEvent = new SearchEvent(searchTerms : terms, uuid : uuid)
+            searchEvent = new SearchEvent(searchHash : root, uuid : uuid, oobInfohash: true)
+        } else {
+            // this can be improved a lot
+            def replaced = search.toLowerCase().trim().replaceAll(Constants.SPLIT_PATTERN, " ")
+            def terms = replaced.split(" ")
+            searchEvent = new SearchEvent(searchTerms : terms, uuid : uuid, oobInfohash: true)
+        }
         core.eventBus.publish(new QueryEvent(searchEvent : searchEvent, firstHop : true, 
             replyTo: core.me.destination, receivedOn: core.me.destination,
             originator : core.me))
     }
     
+    void search(String infoHash, String tabTitle) {
+        def cardsPanel = builder.getVariable("cards-panel")
+        cardsPanel.getLayout().show(cardsPanel, "search window")
+        def uuid = UUID.randomUUID()
+        Map<String, Object> params = new HashMap<>()
+        params["search-terms"] = tabTitle
+        params["uuid"] = uuid.toString()
+        def group = mvcGroup.createMVCGroup("SearchTab", uuid.toString(), params)
+        model.results[uuid.toString()] = group
+        
+        def searchEvent = new SearchEvent(searchHash : Base64.decode(infoHash), uuid:uuid,
+            oobInfohash: true)
+        core.eventBus.publish(new QueryEvent(searchEvent : searchEvent, firstHop : true,
+            replyTo: core.me.destination, receivedOn: core.me.destination,
+            originator : core.me))
+    }
+    
     private def selectedResult() {
         def selected = builder.getVariable("result-tabs").getSelectedComponent()
         def group = selected.getClientProperty("mvc-group")
@@ -58,28 +98,40 @@ class MainFrameController {
         int row = table.getSelectedRow()
         if (row == -1)
             return
+        def sortEvt = group.view.lastSortEvent
+        if (sortEvt != null) {
+            row = group.view.resultsTable.rowSorter.convertRowIndexToModel(row)
+        } 
         group.model.results[row]        
     }
     
-    private def selectedDownload() {
+    private int selectedDownload() {
-        def selected = builder.getVariable("downloads-table").getSelectedRow()
+        def downloadsTable = builder.getVariable("downloads-table")
-        model.downloads[selected].downloader
+        def selected = downloadsTable.getSelectedRow()
+        def sortEvt = mvcGroup.view.lastDownloadSortEvent
+        if (sortEvt != null)
+            selected = downloadsTable.rowSorter.convertRowIndexToModel(selected)
+        selected
     }
     
     @ControllerAction
     void download() {
         def result = selectedResult()
         if (result == null)
-            return // TODO disable button
+            return
-            
+        
+        if (!model.canDownload(result.infohash))
+            return   
+             
         def file = new File(application.context.get("muwire-settings").downloadLocation, result.name)
         
         def selected = builder.getVariable("result-tabs").getSelectedComponent()
         def group = selected.getClientProperty("mvc-group")
         
         def resultsBucket = group.model.hashBucket[result.infohash]
+        def sources = group.model.sourcesBucket[result.infohash]
          
-        core.eventBus.publish(new UIDownloadEvent(result : resultsBucket, target : file))
+        core.eventBus.publish(new UIDownloadEvent(result : resultsBucket, sources: sources, target : file))
     }
     
     @ControllerAction
@@ -100,13 +152,15 @@ class MainFrameController {
     
     @ControllerAction 
     void cancel() {
-        def downloader = selectedDownload()
+        def downloader = model.downloads[selectedDownload()].downloader
         downloader.cancel()
+        model.downloadInfoHashes.remove(downloader.getInfoHash())
+        core.eventBus.publish(new UIDownloadCancelledEvent(downloader : downloader))
     }
     
     @ControllerAction
     void resume() {
-        def downloader = selectedDownload()
+        def downloader = model.downloads[selectedDownload()].downloader
         downloader.resume()
     }
 
@@ -137,6 +191,17 @@ class MainFrameController {
         markTrust("trusted-table", TrustLevel.NEUTRAL, model.trusted)
     }
     
+    void unshareSelectedFiles() {
+        println "unsharing selected files"
+    }
+    
+    void saveMuWireSettings() {
+        File f = new File(core.home, "MuWire.properties")
+        f.withOutputStream { 
+            core.muOptions.write(it)
+        }
+    }
+    
     void mvcGroupInit(Map<String, String> args) {
         application.addPropertyChangeListener("core", {e-> 
             core = e.getNewValue()

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

@@ -66,6 +66,42 @@ class OptionsController {
             settings.write(it)
         }
         
+        // UI Setttings
+        
+        UISettings uiSettings = application.context.get("ui-settings")
+        text = view.lnfField.text
+        model.lnf = text
+        uiSettings.lnf = text
+        
+        text = view.fontField.text
+        model.font = text
+        uiSettings.font = text
+        
+        boolean showMonitor = view.monitorCheckbox.model.isSelected()
+        model.showMonitor = showMonitor
+        uiSettings.showMonitor = showMonitor
+        
+        boolean clearCancelledDownloads = view.clearCancelledDownloadsCheckbox.model.isSelected()
+        model.clearCancelledDownloads = clearCancelledDownloads
+        uiSettings.clearCancelledDownloads = clearCancelledDownloads
+        
+        boolean clearFinishedDownloads = view.clearFinishedDownloadsCheckbox.model.isSelected()
+        model.clearFinishedDownloads = clearFinishedDownloads
+        uiSettings.clearFinishedDownloads = clearFinishedDownloads
+        
+        boolean excludeLocalResult = view.excludeLocalResultCheckbox.model.isSelected()
+        model.excludeLocalResult = excludeLocalResult
+        uiSettings.excludeLocalResult = excludeLocalResult
+        
+        boolean showSearchHashes = view.showSearchHashesCheckbox.model.isSelected()
+        model.showSearchHashes = showSearchHashes
+        uiSettings.showSearchHashes = showSearchHashes
+        
+        File uiSettingsFile = new File(core.home, "gui.properties")
+        uiSettingsFile.withOutputStream { 
+            uiSettings.write(it)
+        }
+        
         cancel()
     }
     

gui/griffon-app/lifecycle/Initialize.groovy

@@ -1,17 +1,25 @@
 import griffon.core.GriffonApplication
 import groovy.util.logging.Log
+import net.i2p.util.SystemVersion
 
 import org.codehaus.griffon.runtime.core.AbstractLifecycleHandler
 
 import com.muwire.core.Core
 import com.muwire.core.MuWireSettings
+import com.muwire.gui.UISettings
 
 import javax.annotation.Nonnull
 import javax.inject.Inject
+import javax.swing.JTable
+import javax.swing.LookAndFeel
+import javax.swing.UIManager
 
 import static griffon.util.GriffonApplicationUtils.isMacOSX
 import static groovy.swing.SwingBuilder.lookAndFeel
 
+import java.awt.Font
+import java.util.logging.Level
+
 @Log
 class Initialize extends AbstractLifecycleHandler {
     @Inject
@@ -21,11 +29,87 @@ class Initialize extends AbstractLifecycleHandler {
 
     @Override
     void execute() {
-        if (isMacOSX()) {
+        log.info "Loading home dir"
-            lookAndFeel('nimbus') // otherwise the file chooser doesn't open???
+        def portableHome = System.getProperty("portable.home")
-        } else {
+        def home = portableHome == null ?
-            lookAndFeel('system', 'gtk')
+            selectHome() :
+            portableHome
+            
+        home = new File(home)
+        if (!home.exists()) {
+            log.info("creating home dir $home")
+            home.mkdirs()
         }
+        
+        application.context.put("muwire-home", home.getAbsolutePath())
+        
+        def guiPropsFile = new File(home, "gui.properties")
+        UISettings uiSettings
+        if (guiPropsFile.exists()) {
+            Properties props = new Properties()
+            guiPropsFile.withInputStream { props.load(it) }
+            uiSettings = new UISettings(props)
+            
+            log.info("settting user-specified lnf $uiSettings.lnf")
+            try {
+                lookAndFeel(uiSettings.lnf)
+            } catch (Throwable bad) {
+                log.log(Level.WARNING,"couldn't set desired look and feeel, switching to defaults", bad)
+                uiSettings.lnf = lookAndFeel("system","gtk","metal").getID()
+            }
+            
+            if (uiSettings.font != null) {
+                log.info("setting user-specified font $uiSettings.font")
+                Font font = new Font(uiSettings.font, Font.PLAIN, 12)
+                def defaults = UIManager.getDefaults()
+                defaults.put("Button.font", font)
+                defaults.put("RadioButton.font", font)
+                defaults.put("Label.font", font)
+                defaults.put("CheckBox.font", font)
+                defaults.put("Table.font", font)
+                defaults.put("TableHeader.font", font)
+                // TODO: add others
+            }
+        } else {
+            Properties props = new Properties()
+            uiSettings = new UISettings(props)
+            log.info "will try default lnfs"
+            if (isMacOSX()) {
+                if (SystemVersion.isJava9()) {
+                    uiSettings.lnf = "metal"
+                    lookAndFeel("metal")
+                } else {
+                    uiSettings.lnf = "nimbus"
+                    lookAndFeel('nimbus') // otherwise the file chooser doesn't open???
+                }
+            } else {
+                LookAndFeel chosen = lookAndFeel('system', 'gtk')
+                uiSettings.lnf = chosen.getID()
+                log.info("ended up applying $chosen.name")
+            }
+        }
+        
+        application.context.put("ui-settings", uiSettings)
+    }
+    
+    private static String selectHome() {
+        def home = new File(System.properties["user.home"])
+        def defaultHome = new File(home, ".MuWire")
+        if (defaultHome.exists())
+            return defaultHome.getAbsolutePath()
+        if (SystemVersion.isMac()) {
+            def library = new File(home, "Library")
+            def appSupport = new File(library, "Application Support")
+            def muwire = new File(appSupport,"MuWire")
+            return muwire.getAbsolutePath()
+        }
+        if (SystemVersion.isWindows()) {
+            def appData = new File(home,"AppData")
+            def roaming = new File(appData, "Roaming")
+            def muwire = new File(roaming, "MuWire")
+            return muwire.getAbsolutePath()
+        }
+        defaultHome.getAbsolutePath()
     }
 }
 

gui/griffon-app/lifecycle/Ready.groovy

@@ -1,11 +1,14 @@
+
 import griffon.core.GriffonApplication
 import griffon.core.env.Metadata
 import groovy.util.logging.Log
+import net.i2p.util.SystemVersion
 
 import org.codehaus.griffon.runtime.core.AbstractLifecycleHandler
 
 import com.muwire.core.Core
 import com.muwire.core.MuWireSettings
+import com.muwire.core.UILoadedEvent
 import com.muwire.core.files.FileSharedEvent
 
 import javax.annotation.Nonnull
@@ -32,17 +35,8 @@ class Ready extends AbstractLifecycleHandler {
     @Override
     void execute() {
         log.info "starting core services"
-        def portableHome = System.getProperty("portable.home")
-        def home = portableHome == null ? 
-            System.getProperty("user.home") + File.separator + ".MuWire" :
-            portableHome
-            
-        home = new File(home)
-        if (!home.exists()) {
-            log.info("creating home dir")
-            home.mkdir()
-        }
         
+        def home = new File(application.getContext().getAsString("muwire-home"))
         def props = new Properties()
         def propsFile = new File(home, "MuWire.properties")
         if (propsFile.exists()) {
@@ -111,11 +105,7 @@ class Ready extends AbstractLifecycleHandler {
             it.propertyChange(new PropertyChangeEvent(this, "core", null, core)) 
         }
         
-        if (props.sharedFiles != null) {
+        core.eventBus.publish(new UILoadedEvent())
-            props.sharedFiles.split(",").each {
-                core.eventBus.publish(new FileSharedEvent(file : new File(it)))
-            }
-        }
     }
 }
 

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

@@ -9,6 +9,7 @@ import javax.swing.JTable
 
 import com.muwire.core.Core
 import com.muwire.core.InfoHash
+import com.muwire.core.MuWireSettings
 import com.muwire.core.Persona
 import com.muwire.core.connection.ConnectionAttemptStatus
 import com.muwire.core.connection.ConnectionEvent
@@ -19,7 +20,9 @@ import com.muwire.core.files.FileDownloadedEvent
 import com.muwire.core.files.FileHashedEvent
 import com.muwire.core.files.FileLoadedEvent
 import com.muwire.core.files.FileSharedEvent
+import com.muwire.core.files.FileUnsharedEvent
 import com.muwire.core.search.QueryEvent
+import com.muwire.core.search.UIResultBatchEvent
 import com.muwire.core.search.UIResultEvent
 import com.muwire.core.trust.TrustEvent
 import com.muwire.core.trust.TrustService
@@ -29,17 +32,22 @@ import com.muwire.core.upload.UploadFinishedEvent
 
 import griffon.core.GriffonApplication
 import griffon.core.artifact.GriffonModel
+import griffon.core.env.Metadata
 import griffon.core.mvc.MVCGroup
 import griffon.inject.MVCMember
 import griffon.transform.FXObservable
 import griffon.transform.Observable
+import net.i2p.data.Base64
 import net.i2p.data.Destination
 import griffon.metadata.ArtifactProviderFor
 
 @ArtifactProviderFor(GriffonModel)
 class MainFrameModel {
+    @Inject Metadata metadata
     @MVCMember @Nonnull
     FactoryBuilderSupport builder
+    @MVCMember @Nonnull
+    MainFrameController controller
     @Inject @Nonnull GriffonApplication application
     @Observable boolean coreInitialized = false
     
@@ -47,6 +55,7 @@ class MainFrameModel {
     def downloads = []
     def uploads = []
     def shared = []
+    def watched = []
     def connectionList = []
     def searches = new LinkedList()
     def trusted = []
@@ -54,15 +63,20 @@ class MainFrameModel {
     
     @Observable int connections
     @Observable String me
-    @Observable boolean searchButtonsEnabled
+    @Observable boolean downloadActionEnabled
+    @Observable boolean trustButtonsEnabled
     @Observable boolean cancelButtonEnabled
     @Observable boolean retryButtonEnabled
     
     private final Set<InfoHash> infoHashes = new HashSet<>()
+    
+    private final Set<InfoHash> downloadInfoHashes = new HashSet<>()
 
     volatile Core core    
 
     private long lastRetryTime = System.currentTimeMillis()
+    
+    UISettings uiSettings
         
     void updateTablePreservingSelection(String tableName) {
         def downloadTable = builder.getVariable(tableName)
@@ -73,11 +87,28 @@ class MainFrameModel {
     
     void mvcGroupInit(Map<String, Object> args) {
         
+        uiSettings = application.context.get("ui-settings")
+        
         Timer timer = new Timer("download-pumper", true)
         timer.schedule({
             runInsideUIAsync {
                 if (!mvcGroup.alive)
                     return
+                
+                // remove cancelled or finished downloads
+                def toRemove = []    
+                downloads.each {
+                    if (uiSettings.clearCancelledDownloads &&
+                        it.downloader.getCurrentState() == Downloader.DownloadState.CANCELLED)
+                        toRemove << it
+                    if (uiSettings.clearFinishedDownloads &&
+                        it.downloader.getCurrentState() == Downloader.DownloadState.FINISHED)
+                        toRemove << it
+                }
+                toRemove.each {
+                    downloads.remove(it)
+                }    
+                
                 builder.getVariable("uploads-table")?.model.fireTableDataChanged()
                 
                 updateTablePreservingSelection("downloads-table")
@@ -91,6 +122,7 @@ class MainFrameModel {
             core = e.getNewValue()
             me = core.me.getHumanReadableName()
             core.eventBus.register(UIResultEvent.class, this)
+            core.eventBus.register(UIResultBatchEvent.class, this)
             core.eventBus.register(DownloadStartedEvent.class, this)
             core.eventBus.register(ConnectionEvent.class, this)
             core.eventBus.register(DisconnectionEvent.class, this)
@@ -102,9 +134,10 @@ class MainFrameModel {
             core.eventBus.register(QueryEvent.class, this)
             core.eventBus.register(UpdateAvailableEvent.class, this)
             core.eventBus.register(FileDownloadedEvent.class, this)
+            core.eventBus.register(FileUnsharedEvent.class, this)
             
             timer.schedule({
-                int retryInterval = application.context.get("muwire-settings").downloadRetryInterval
+                int retryInterval = core.muOptions.downloadRetryInterval
                 if (retryInterval > 0) {
                     retryInterval *= 60000
                     long now = System.currentTimeMillis()
@@ -127,6 +160,10 @@ class MainFrameModel {
             runInsideUIAsync {
                 trusted.addAll(core.trustService.good.values())
                 distrusted.addAll(core.trustService.bad.values())
+                
+                watched.addAll(core.muOptions.watchedDirectories)
+                builder.getVariable("watched-directories-table").model.fireTableDataChanged()
+                watched.each { core.eventBus.publish(new FileSharedEvent(file : new File(it))) }
             }
         })
         
@@ -137,9 +174,15 @@ class MainFrameModel {
         resultsGroup?.model.handleResult(e)
     }
     
+    void onUIResultBatchEvent(UIResultBatchEvent e) {
+        MVCGroup resultsGroup = results.get(e.uuid)
+        resultsGroup?.model.handleResultBatch(e.results)
+    }
+    
     void onDownloadStartedEvent(DownloadStartedEvent e) {
         runInsideUIAsync {
             downloads << e
+            downloadInfoHashes.add(e.downloader.infoHash)
         }
     }
     
@@ -154,7 +197,8 @@ class MainFrameModel {
                 topPanel.getLayout().show(topPanel, "top-search-panel")
             }
             
-            connectionList.add(e.endpoint.destination)
+            UIConnection con = new UIConnection(destination : e.endpoint.destination, incoming : e.incoming)
+            connectionList.add(con)
             JTable table = builder.getVariable("connections-table")
             table.model.fireTableDataChanged()
         }
@@ -169,7 +213,8 @@ class MainFrameModel {
                 topPanel.getLayout().show(topPanel, "top-connect-panel")
             }
             
-            connectionList.remove(e.destination)
+            UIConnection con = new UIConnection(destination : e.destination)
+            connectionList.remove(con)
             JTable table = builder.getVariable("connections-table")
             table.model.fireTableDataChanged()
         }
@@ -199,6 +244,17 @@ class MainFrameModel {
         }
     }
     
+    void onFileUnsharedEvent(FileUnsharedEvent e) {
+        InfoHash infohash = e.unsharedFile.infoHash
+        if (!infoHashes.remove(infohash))
+            return
+        runInsideUIAsync {
+            shared.remove(e.unsharedFile)
+            JTable table = builder.getVariable("shared-files-table")
+            table.model.fireTableDataChanged()
+        }
+    }
+    
     void onUploadEvent(UploadEvent e) {
         runInsideUIAsync {
             uploads << e.uploader
@@ -235,14 +291,23 @@ class MainFrameModel {
     void onQueryEvent(QueryEvent e) {
         if (e.replyTo == core.me.destination)
             return
-        StringBuilder sb = new StringBuilder()
+        
-        e.searchEvent.searchTerms?.each {
+        def search
-            sb.append(it)
+        if (e.searchEvent.searchHash != null) {
-            sb.append(" ")
+            if (!uiSettings.showSearchHashes) {
+                return
+            }
+            search = Base64.encode(e.searchEvent.searchHash)
+        } else {
+            StringBuilder sb = new StringBuilder()
+            e.searchEvent.searchTerms?.each {
+                sb.append(it)
+                sb.append(" ")
+            }
+            search = sb.toString()
+            if (search.trim().size() == 0)
+                return
         }
-        def search = sb.toString()
-        if (search.trim().size() == 0)
-            return
         runInsideUIAsync {
             searches.addFirst(new IncomingSearch(search : search, replyTo : e.replyTo, originator : e.originator))
             while(searches.size() > 200)
@@ -260,7 +325,13 @@ class MainFrameModel {
     
     void onUpdateAvailableEvent(UpdateAvailableEvent e) {
         runInsideUIAsync {
-            JOptionPane.showMessageDialog(null, "A new version of MuWire is available from $e.signer.  Please update to $e.version")
+            
+            int option = JOptionPane.showConfirmDialog(null, 
+                "MuWire $e.version is available from $e.signer.  You have "+ metadata["application.version"]+" Update?",
+                "New MuWire version availble", JOptionPane.OK_CANCEL_OPTION)
+            if (option == JOptionPane.CANCEL_OPTION)
+                return
+            controller.search(e.infoHash,"MuWire update")
         }
     }
     
@@ -274,4 +345,26 @@ class MainFrameModel {
             table.model.fireTableDataChanged()
         }
     }
+    
+    private static class UIConnection {
+        Destination destination
+        boolean incoming
+        
+        @Override
+        public int hashCode() {
+            destination.hashCode()
+        }
+        
+        @Override
+        public boolean equals(Object o) {
+            if (!(o instanceof UIConnection))
+                return false
+            UIConnection other = (UIConnection) o
+            return destination == other.destination
+        }
+    }
+    
+    boolean canDownload(InfoHash hash) {
+        !downloadInfoHashes.contains(hash)
+    }
 }

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

@@ -20,6 +20,15 @@ class OptionsModel {
     @Observable String outboundLength
     @Observable String outboundQuantity
     
+    // gui options
+    @Observable boolean showMonitor
+    @Observable String lnf
+    @Observable String font
+    @Observable boolean clearCancelledDownloads
+    @Observable boolean clearFinishedDownloads
+    @Observable boolean excludeLocalResult
+    @Observable boolean showSearchHashes
+    
     void mvcGroupInit(Map<String, String> args) {
         MuWireSettings settings = application.context.get("muwire-settings")
         downloadRetryInterval = settings.downloadRetryInterval
@@ -32,5 +41,14 @@ class OptionsModel {
         inboundQuantity = core.i2pOptions["inbound.quantity"]
         outboundLength = core.i2pOptions["outbound.length"]
         outboundQuantity = core.i2pOptions["outbound.quantity"]
+        
+        UISettings uiSettings = application.context.get("ui-settings")
+        showMonitor = uiSettings.showMonitor
+        lnf = uiSettings.lnf
+        font = uiSettings.font
+        clearCancelledDownloads = uiSettings.clearCancelledDownloads
+        clearFinishedDownloads = uiSettings.clearFinishedDownloads
+        excludeLocalResult = uiSettings.excludeLocalResult
+        showSearchHashes = uiSettings.showSearchHashes
     }
 }

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

@@ -19,13 +19,16 @@ class SearchTabModel {
     FactoryBuilderSupport builder
     
     Core core
+    UISettings uiSettings
     String uuid
     def results = []
     def hashBucket = [:]
+    def sourcesBucket = [:]
     
     
     void mvcGroupInit(Map<String, String> args) {
         core = mvcGroup.parentGroup.model.core
+        uiSettings = application.context.get("ui-settings")
         mvcGroup.parentGroup.model.results[UUID.fromString(uuid)] = mvcGroup
     }
     
@@ -34,6 +37,9 @@ class SearchTabModel {
     }
     
     void handleResult(UIResultEvent e) {
+        if (uiSettings.excludeLocalResult &&
+            core.fileManager.rootToFiles.containsKey(e.infohash))
+            return
         runInsideUIAsync {
             def bucket = hashBucket.get(e.infohash)
             if (bucket == null) {
@@ -41,10 +47,44 @@ class SearchTabModel {
                 hashBucket[e.infohash] = bucket
             }
             bucket << e
+            
+            Set sourceBucket = sourcesBucket.get(e.infohash)
+            if (sourceBucket == null) {
+                sourceBucket = new HashSet()
+                sourcesBucket.put(e.infohash, sourceBucket)
+            }
+            sourceBucket.addAll(e.sources)
                             
             results << e
             JTable table = builder.getVariable("results-table")
             table.model.fireTableDataChanged()
         }
     }
+    
+    void handleResultBatch(UIResultEvent[] batch) {
+        runInsideUIAsync {
+            batch.each { 
+                if (uiSettings.excludeLocalResult && 
+                    core.fileManager.rootToFiles.containsKey(it.infohash))
+                    return
+                def bucket = hashBucket.get(it.infohash)
+                if (bucket == null) {
+                    bucket = []
+                    hashBucket[it.infohash] = bucket
+                }
+                
+                Set sourceBucket = sourcesBucket.get(it.infohash)
+                if (sourceBucket == null) {
+                    sourceBucket = new HashSet()
+                    sourcesBucket.put(it.infohash, sourceBucket)
+                }
+                sourceBucket.addAll(it.sources)
+                
+                bucket << it
+                results << it
+            }
+            JTable table = builder.getVariable("results-table")
+            table.model.fireTableDataChanged()
+        }
+    }
 }

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

@@ -3,6 +3,7 @@ package com.muwire.gui
 import griffon.core.artifact.GriffonView
 import griffon.inject.MVCMember
 import griffon.metadata.ArtifactProviderFor
+import net.i2p.data.Base64
 import net.i2p.data.DataHelper
 
 import javax.swing.BorderFactory
@@ -10,7 +11,10 @@ import javax.swing.Box
 import javax.swing.BoxLayout
 import javax.swing.JFileChooser
 import javax.swing.JLabel
+import javax.swing.JMenuItem
+import javax.swing.JPopupMenu
 import javax.swing.JSplitPane
+import javax.swing.JTable
 import javax.swing.ListSelectionModel
 import javax.swing.SwingConstants
 import javax.swing.border.Border
@@ -26,6 +30,10 @@ import java.awt.FlowLayout
 import java.awt.GridBagConstraints
 import java.awt.GridBagLayout
 import java.awt.Insets
+import java.awt.Toolkit
+import java.awt.datatransfer.StringSelection
+import java.awt.event.MouseAdapter
+import java.awt.event.MouseEvent
 import java.nio.charset.StandardCharsets
 
 import javax.annotation.Nonnull
@@ -37,7 +45,12 @@ class MainFrameView {
     @MVCMember @Nonnull
     MainFrameModel model
     
+    def downloadsTable
+    def lastDownloadSortEvent
+    def lastSharedSortEvent
+    
     void initUI() {
+        UISettings settings = application.context.get("ui-settings")
         builder.with {
             application(size : [1024,768], id: 'main-frame',
             locationRelativeTo : null,
@@ -60,7 +73,8 @@ class MainFrameView {
                         gridLayout(rows:1, cols: 2)
                         button(text: "Searches", actionPerformed : showSearchWindow)
                         button(text: "Uploads", actionPerformed : showUploadsWindow)
-                        button(text: "Monitor", actionPerformed : showMonitorWindow)
+                        if (settings.showMonitor)
+                            button(text: "Monitor", actionPerformed : showMonitorWindow)
                         button(text: "Trust", actionPerformed : showTrustWindow)
                     }
                     panel(id: "top-panel", constraints: BorderLayout.CENTER) {
@@ -91,22 +105,22 @@ class MainFrameView {
                                 borderLayout()
                                 tabbedPane(id : "result-tabs", constraints: BorderLayout.CENTER)
                                 panel(constraints : BorderLayout.SOUTH) {
-                                    button(text : "Download", enabled : bind {model.searchButtonsEnabled}, downloadAction)
+                                    button(text : "Download", enabled : bind {model.downloadActionEnabled}, downloadAction)
-                                    button(text : "Trust", enabled: bind {model.searchButtonsEnabled }, trustAction)
+                                    button(text : "Trust", enabled: bind {model.trustButtonsEnabled }, trustAction)
-                                    button(text : "Distrust", enabled : bind {model.searchButtonsEnabled}, distrustAction)
+                                    button(text : "Distrust", enabled : bind {model.trustButtonsEnabled}, distrustAction)
                                 }
                             }
                             panel (constraints : JSplitPane.BOTTOM) {
                                 borderLayout()
                                 scrollPane (constraints : BorderLayout.CENTER) {
-                                    table(id : "downloads-table") {
+                                    downloadsTable = table(id : "downloads-table", autoCreateRowSorter : true) {
                                         tableModel(list: model.downloads) {
                                             closureColumn(header: "Name", preferredWidth: 350, type: String, read : {row -> row.downloader.file.getName()})
-                                            closureColumn(header: "Status", preferredWidth: 50, type: String, read : {row -> row.downloader.getCurrentState()})
+                                            closureColumn(header: "Status", preferredWidth: 50, type: String, read : {row -> row.downloader.getCurrentState().toString()})
                                             closureColumn(header: "Progress", preferredWidth: 20, type: String, read: { row ->
                                                 int pieces = row.downloader.nPieces
                                                 int done = row.downloader.donePieces()
-                                                "$done/$pieces pieces"
+                                                "$done/$pieces pieces".toString()
                                             })
                                             closureColumn(header: "Sources", preferredWidth : 10, type: Integer, read : {row -> row.downloader.activeWorkers()})
                                             closureColumn(header: "Speed", preferredWidth: 50, type:String, read :{row -> 
@@ -125,17 +139,32 @@ class MainFrameView {
                     panel (constraints: "uploads window"){
                         gridLayout(cols : 1, rows : 2)
                         panel {
-                            borderLayout()
+                            gridLayout(cols : 2, rows : 1) 
-                            panel (constraints : BorderLayout.NORTH) {
+                            panel {
-                                button(text : "Click here to share files", actionPerformed : shareFiles)
+                                borderLayout()
+                                panel (constraints : BorderLayout.NORTH) {
+                                    button(text : "Add directories to watch", actionPerformed : watchDirectories)
+                                }
+                                scrollPane (constraints : BorderLayout.CENTER) {
+                                    table(id : "watched-directories-table", autoCreateRowSorter: true) {
+                                        tableModel(list : model.watched) {
+                                            closureColumn(header: "Watched Directories", type : String, read : { it })
+                                        }
+                                    }
+                                }
                             }
-                            scrollPane ( constraints : BorderLayout.CENTER) {
+                            panel {
-                                table(id : "shared-files-table") {
+                                borderLayout()
-                                     tableModel(list : model.shared) {
+                                panel (constraints : BorderLayout.NORTH) {
-                                         closureColumn(header : "Name", preferredWidth : 550, type : String, read : {row -> row.file.getAbsolutePath()})
+                                    button(text : "Share files", actionPerformed : shareFiles)
-                                         closureColumn(header : "Size", preferredWidth : 50, type : String, 
+                                }
-                                             read : {row -> DataHelper.formatSize2Decimal(row.file.length(),false) + "B"})
+                                scrollPane(constraints : BorderLayout.CENTER) {
-                                     }   
+                                    table(id : "shared-files-table", autoCreateRowSorter: true) {
+                                        tableModel(list : model.shared) {
+                                            closureColumn(header : "Name", preferredWidth : 500, type : String, read : {row -> row.file.getAbsolutePath()})
+                                            closureColumn(header : "Size", preferredWidth : 100, type : Long, read : {row -> row.file.length() })
+                                        }
+                                    }
                                 }
                             }
                         }
@@ -147,16 +176,13 @@ class MainFrameView {
                             scrollPane (constraints : BorderLayout.CENTER) {
                                 table(id : "uploads-table") {
                                     tableModel(list : model.uploads) {
-                                        closureColumn(header : "Name", type : String, read : {row -> row.file.getName() })
+                                        closureColumn(header : "Name", type : String, read : {row -> row.getName() })
                                         closureColumn(header : "Progress", type : String, read : { row ->
-                                            int position = row.getPosition()
+                                            int percent = row.getProgress()
-                                            def range = row.request.getRange()
-                                            int total = range.end - range.start
-                                            int percent = (int)((position * 100.0) / total)
                                             "$percent%"
                                         })
                                         closureColumn(header : "Downloader", type : String, read : { row -> 
-                                            row.request.downloader?.getHumanReadableName()
+                                            row.getDownloader()
                                         })
                                     }
                                 }
@@ -173,7 +199,13 @@ class MainFrameView {
                             scrollPane(constraints : BorderLayout.CENTER) {
                                 table(id : "connections-table") {
                                     tableModel(list : model.connectionList) {
-                                        closureColumn(header : "Destination", type: String, read : { row -> row.toBase32() })
+                                        closureColumn(header : "Destination", preferredWidth: 250, type: String, read : { row -> row.destination.toBase32() })
+                                        closureColumn(header : "Direction", preferredWidth: 20, type: String, read : { row ->
+                                            if (row.incoming)
+                                                return "In"
+                                            else 
+                                                return "Out"
+                                        })
                                     }
                                 }
                             }
@@ -207,7 +239,7 @@ class MainFrameView {
                         panel (border : etchedBorder()){
                             borderLayout()
                             scrollPane(constraints : BorderLayout.CENTER) {
-                                table(id : "trusted-table") {
+                                table(id : "trusted-table", autoCreateRowSorter : true) {
                                     tableModel(list : model.trusted) {
                                         closureColumn(header : "Trusted Users", type : String, read : { it.getHumanReadableName() } )
                                     }
@@ -222,7 +254,7 @@ class MainFrameView {
                         panel (border : etchedBorder()){
                             borderLayout()
                             scrollPane(constraints : BorderLayout.CENTER) {
-                                table(id : "distrusted-table") {
+                                table(id : "distrusted-table", autoCreateRowSorter : true) {
                                     tableModel(list : model.distrusted) {
                                         closureColumn(header: "Distrusted Users", type : String, read : { it.getHumanReadableName() } )
                                     }
@@ -254,16 +286,24 @@ class MainFrameView {
         def selectionModel = downloadsTable.getSelectionModel()
         selectionModel.setSelectionMode(ListSelectionModel.SINGLE_SELECTION)
         selectionModel.addListSelectionListener({
-            int selectedRow = downloadsTable.getSelectedRow()
+            int selectedRow = selectedDownloaderRow()
-            def downloader = model.downloads[selectedRow].downloader
+            if (selectedRow < 0) {
+                model.cancelButtonEnabled = false
+                model.retryButtonEnabled = false
+                return
+            }
+            def downloader = model.downloads[selectedRow]?.downloader
+            if (downloader == null)
+                return
             switch(downloader.getCurrentState()) {
                 case Downloader.DownloadState.CONNECTING :
                 case Downloader.DownloadState.DOWNLOADING :
+                case Downloader.DownloadState.HASHLIST:
                 model.cancelButtonEnabled = true
                 model.retryButtonEnabled = false
                 break
                 case Downloader.DownloadState.FAILED:
-                model.cancelButtonEnabled = false
+                model.cancelButtonEnabled = true
                 model.retryButtonEnabled = true
                 break
                 default:
@@ -274,9 +314,152 @@ class MainFrameView {
         
         def centerRenderer = new DefaultTableCellRenderer()
         centerRenderer.setHorizontalAlignment(JLabel.CENTER)
-        builder.getVariable("downloads-table").setDefaultRenderer(Integer.class, centerRenderer)
+        downloadsTable.setDefaultRenderer(Integer.class, centerRenderer)
+        
+        downloadsTable.rowSorter.addRowSorterListener({evt -> lastDownloadSortEvent = evt})
+        downloadsTable.rowSorter.setSortsOnUpdates(true)
+        
+        downloadsTable.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseReleased(MouseEvent e) {
+                if (e.isPopupTrigger())
+                    showDownloadsMenu(e)
+            }
+            @Override
+            public void mousePressed(MouseEvent e) {
+                if (e.isPopupTrigger())
+                    showDownloadsMenu(e)
+            }
+        })
+        
+        // shared files table
+        def sharedFilesTable = builder.getVariable("shared-files-table")
+        sharedFilesTable.columnModel.getColumn(1).setCellRenderer(new SizeRenderer())
+        
+        sharedFilesTable.rowSorter.addRowSorterListener({evt -> lastSharedSortEvent = evt})
+        sharedFilesTable.rowSorter.setSortsOnUpdates(true)
+        
+        JPopupMenu sharedFilesMenu = new JPopupMenu()
+//        JMenuItem unshareSelectedFiles = new JMenuItem("Unshare selected files")
+//        unshareSelectedFiles.addActionListener({mvcGroup.controller.unshareSelectedFiles()})
+        JMenuItem copyHashToClipboard = new JMenuItem("Copy hash to clipboard")
+        copyHashToClipboard.addActionListener({mvcGroup.view.copyHashToClipboard(sharedFilesTable)})
+        sharedFilesMenu.add(copyHashToClipboard)
+        sharedFilesTable.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseReleased(MouseEvent e) {
+                if (e.isPopupTrigger())
+                    showPopupMenu(sharedFilesMenu, e)
+            }
+            @Override
+            public void mousePressed(MouseEvent e) {
+                if (e.isPopupTrigger())
+                    showPopupMenu(sharedFilesMenu, e)
+            }
+        })
+        
+        // searches table
+        def searchesTable = builder.getVariable("searches-table")
+        JPopupMenu searchTableMenu = new JPopupMenu()
+        JMenuItem copySearchToClipboard = new JMenuItem("Copy search to clipboard")
+        copySearchToClipboard.addActionListener({mvcGroup.view.copySearchToClipboard(searchesTable)})
+        searchTableMenu.add(copySearchToClipboard)
+        searchesTable.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseReleased(MouseEvent e) {
+                if (e.isPopupTrigger())
+                    showPopupMenu(searchTableMenu, e)
+            }
+            @Override
+            public void mousePressed(MouseEvent e) {
+                if (e.isPopupTrigger())
+                    showPopupMenu(searchTableMenu, e)
+            }
+        })
+        
+    }
+    
+    private static void showPopupMenu(JPopupMenu menu, MouseEvent event) {
+        menu.show(event.getComponent(), event.getX(), event.getY())
+    }
+    
+    def copyHashToClipboard(JTable sharedFilesTable) {
+        int selected = sharedFilesTable.getSelectedRow()
+        if (selected < 0)
+            return
+        if (lastSharedSortEvent != null) 
+            selected = sharedFilesTable.rowSorter.convertRowIndexToModel(selected)
+        String root = Base64.encode(model.shared[selected].infoHash.getRoot())
+        StringSelection selection = new StringSelection(root)
+        def clipboard = Toolkit.getDefaultToolkit().getSystemClipboard()
+        clipboard.setContents(selection, null)
+    }
+    
+    def copySearchToClipboard(JTable searchesTable) {
+        int selected = searchesTable.getSelectedRow()
+        if (selected < 0)
+            return
+        String search = model.searches[selected].search
+        StringSelection selection = new StringSelection(search)
+        def clipboard = Toolkit.getDefaultToolkit().getSystemClipboard()
+        clipboard.setContents(selection, null)
     }
 
+    int selectedDownloaderRow() {
+        int selected = builder.getVariable("downloads-table").getSelectedRow()
+        if (lastDownloadSortEvent != null)
+            selected = lastDownloadSortEvent.convertPreviousRowIndexToModel(selected)
+        selected
+    }
+    
+    def showDownloadsMenu(MouseEvent e) {
+        int selected = selectedDownloaderRow()
+        if (selected < 0)
+            return
+        boolean cancelEnabled = false
+        boolean retryEnabled = false
+        Downloader downloader = model.downloads[selected].downloader
+        switch(downloader.currentState) {
+            case Downloader.DownloadState.DOWNLOADING:
+            case Downloader.DownloadState.HASHLIST:
+            case Downloader.DownloadState.CONNECTING:
+                cancelEnabled = true
+                retryEnabled = false
+                break
+            case Downloader.DownloadState.FAILED:
+                cancelEnabled = true
+                retryEnabled = true
+                break
+            default :
+                cancelEnabled = false
+                retryEnabled = false
+        }
+        
+        JPopupMenu menu = new JPopupMenu()
+        JMenuItem copyHashToClipboard = new JMenuItem("Copy hash to clipboard")
+        copyHashToClipboard.addActionListener({
+            String hash = Base64.encode(downloader.infoHash.getRoot())
+            StringSelection selection = new StringSelection(hash)
+            def clipboard = Toolkit.getDefaultToolkit().getSystemClipboard()
+            clipboard.setContents(selection, null)
+        })
+        menu.add(copyHashToClipboard)
+        
+        if (cancelEnabled) {
+            JMenuItem cancel = new JMenuItem("Cancel")
+            cancel.addActionListener({mvcGroup.controller.cancel()})
+            menu.add(cancel)
+        }
+        
+        if (retryEnabled) {
+            JMenuItem retry = new JMenuItem("Retry")
+            retry.addActionListener({mvcGroup.controller.resume()})
+            menu.add(retry)
+        }
+        
+        showPopupMenu(menu, e)
+    }
+    
     def showSearchWindow = {
         def cardsPanel = builder.getVariable("cards-panel")
         cardsPanel.getLayout().show(cardsPanel, "search window")
@@ -299,11 +482,26 @@ class MainFrameView {
     
     def shareFiles = {
         def chooser = new JFileChooser()
-        chooser.setDialogTitle("Select file or directory to share")
+        chooser.setDialogTitle("Select file to share")
-        chooser.setFileSelectionMode(JFileChooser.FILES_AND_DIRECTORIES)
+        chooser.setFileSelectionMode(JFileChooser.FILES_ONLY)
         int rv = chooser.showOpenDialog(null)
         if (rv == JFileChooser.APPROVE_OPTION) {
             model.core.eventBus.publish(new FileSharedEvent(file : chooser.getSelectedFile()))
         }
     }
+    
+    def watchDirectories = {
+        def chooser = new JFileChooser()
+        chooser.setDialogTitle("Select directory to watch")
+        chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY)
+        int rv = chooser.showOpenDialog(null)
+        if (rv == JFileChooser.APPROVE_OPTION) {
+            File f = chooser.getSelectedFile()
+            model.watched << f.getAbsolutePath()
+            application.context.get("muwire-settings").watchedDirectories << f.getAbsolutePath()
+            mvcGroup.controller.saveMuWireSettings()
+            builder.getVariable("watched-directories-table").model.fireTableDataChanged()
+            model.core.eventBus.publish(new FileSharedEvent(file : f))
+        }
+    }
 }

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

@@ -25,6 +25,8 @@ class OptionsView {
     def d
     def p
     def i
+    def u
+    
     def retryField
     def updateField
     def allowUntrustedCheckbox
@@ -35,6 +37,14 @@ class OptionsView {
     def outboundLengthField
     def outboundQuantityField
 
+    def lnfField
+    def monitorCheckbox
+    def fontField
+    def clearCancelledDownloadsCheckbox
+    def clearFinishedDownloadsCheckbox
+    def excludeLocalResultCheckbox
+    def showSearchHashesCheckbox
+    
     def buttonsPanel    
     
     def mainFrame
@@ -53,7 +63,7 @@ class OptionsView {
             updateField = textField(text : bind {model.updateCheckInterval }, columns : 2, constraints : gbc(gridx : 1, gridy: 1))
             label(text : "hours", constraints : gbc(gridx: 2, gridy : 1))
 
-            label(text : "Only allow trusted connections", constraints : gbc(gridx: 0, gridy : 2))
+            label(text : "Allow only trusted connections", constraints : gbc(gridx: 0, gridy : 2))
             allowUntrustedCheckbox = checkBox(selected : bind {model.onlyTrusted}, constraints : gbc(gridx: 1, gridy : 2))
             
             label(text : "Share downloaded files", constraints : gbc(gridx : 0, gridy:3))
@@ -72,6 +82,24 @@ class OptionsView {
             label(text : "Outbound Quantity", constraints : gbc(gridx:0, gridy:4))
             outboundQuantityField = textField(text : bind {model.outboundQuantity}, columns : 2, constraints : gbc(gridx:1, gridy:4))
         }
+        u = builder.panel {
+            gridBagLayout()
+            label(text : "Changing these settings requires a restart", constraints : gbc(gridx : 0, gridy : 0, gridwidth: 2))
+            label(text : "Look And Feel", constraints : gbc(gridx: 0, gridy:1))
+            lnfField = textField(text : bind {model.lnf}, columns : 4, constraints : gbc(gridx : 1, gridy : 1))
+            label(text : "Font", constraints : gbc(gridx: 0, gridy : 2))
+            fontField = textField(text : bind {model.font}, columns : 4, constraints : gbc(gridx : 1, gridy:2))
+            label(text : "Show Monitor", constraints : gbc(gridx :0, gridy: 3))
+            monitorCheckbox = checkBox(selected : bind {model.showMonitor}, constraints : gbc(gridx : 1, gridy: 3))
+            label(text : "Clear Cancelled Downloads", constraints: gbc(gridx: 0, gridy:4))
+            clearCancelledDownloadsCheckbox = checkBox(selected : bind {model.clearCancelledDownloads}, constraints : gbc(gridx : 1, gridy:4))
+            label(text : "Clear Finished Downloads", constraints: gbc(gridx: 0, gridy:5))
+            clearFinishedDownloadsCheckbox = checkBox(selected : bind {model.clearFinishedDownloads}, constraints : gbc(gridx : 1, gridy:5))
+            label(text : "Exclude Local Files From Results", constraints: gbc(gridx:0, gridy:6))
+            excludeLocalResultCheckbox = checkBox(selected : bind {model.excludeLocalResult}, constraints : gbc(gridx: 1, gridy : 6))
+            label(text : "Show Hash Searches In Monitor", constraints: gbc(gridx:0, gridy:7))
+            showSearchHashesCheckbox = checkBox(selected : bind {model.showSearchHashes}, constraints : gbc(gridx: 1, gridy: 7))
+        }
         buttonsPanel = builder.panel {
             gridBagLayout()
             button(text : "Save", constraints : gbc(gridx : 1, gridy: 2), saveAction)
@@ -81,8 +109,9 @@ class OptionsView {
     
     void mvcGroupInit(Map<String,String> args) {
         def tabbedPane = new JTabbedPane()
-        tabbedPane.addTab("MuWire Options", p)
+        tabbedPane.addTab("MuWire", p)
-        tabbedPane.addTab("I2P Options", i)
+        tabbedPane.addTab("I2P", i)
+        tabbedPane.addTab("GUI", u)
                 
         JPanel panel = new JPanel()
         panel.setLayout(new BorderLayout())

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

@@ -4,14 +4,26 @@ import griffon.core.artifact.GriffonView
 import griffon.core.mvc.MVCGroup
 import griffon.inject.MVCMember
 import griffon.metadata.ArtifactProviderFor
+import net.i2p.data.Base64
 import net.i2p.data.DataHelper
 
+import javax.swing.JComponent
 import javax.swing.JLabel
+import javax.swing.JMenuItem
+import javax.swing.JPopupMenu
+import javax.swing.JTable
 import javax.swing.ListSelectionModel
 import javax.swing.SwingConstants
 import javax.swing.table.DefaultTableCellRenderer
 
+import com.muwire.core.util.DataUtil
+
 import java.awt.BorderLayout
+import java.awt.Color
+import java.awt.Toolkit
+import java.awt.datatransfer.StringSelection
+import java.awt.event.MouseAdapter
+import java.awt.event.MouseEvent
 
 import javax.annotation.Nonnull
 
@@ -26,19 +38,21 @@ class SearchTabView {
     def parent
     def searchTerms
     def resultsTable
+    def lastSortEvent
     
     void initUI() {
         builder.with {
             def resultsTable
             def pane = scrollPane {
-                resultsTable = table(id : "results-table") {
+                resultsTable = table(id : "results-table", autoCreateRowSorter : true) {
                     tableModel(list: model.results) {
                         closureColumn(header: "Name", preferredWidth: 350, type: String, read : {row -> row.name.replace('<','_')})
-                        closureColumn(header: "Size", preferredWidth: 50, type: String, read : {row -> DataHelper.formatSize2Decimal(row.size, false)+"B"})
+                        closureColumn(header: "Size", preferredWidth: 20, type: Long, read : {row -> row.size})
-                        closureColumn(header: "Sources", preferredWidth: 10, type : Integer, read : { row -> model.hashBucket[row.infohash].size()})
+                        closureColumn(header: "Direct Sources", preferredWidth: 50, type : Integer, read : { row -> model.hashBucket[row.infohash].size()})
+                        closureColumn(header: "Possible Sources", preferredWidth : 50, type : Integer, read : {row -> model.sourcesBucket[row.infohash].size()})
                         closureColumn(header: "Sender", preferredWidth: 170, type: String, read : {row -> row.sender.getHumanReadableName()})
                         closureColumn(header: "Trust", preferredWidth: 50, type: String, read : {row ->
-                          model.core.trustService.getLevel(row.sender.destination)
+                          model.core.trustService.getLevel(row.sender.destination).toString()
                         })
                     }
                 }
@@ -53,7 +67,13 @@ class SearchTabView {
             def selectionModel = resultsTable.getSelectionModel()
             selectionModel.setSelectionMode(ListSelectionModel.SINGLE_SELECTION)
             selectionModel.addListSelectionListener( {
-                mvcGroup.parentGroup.model.searchButtonsEnabled = true
+                int row = resultsTable.getSelectedRow()
+                if (row < 0)
+                    return
+                if (lastSortEvent != null)
+                    row = resultsTable.rowSorter.convertRowIndexToModel(row)
+                mvcGroup.parentGroup.model.trustButtonsEnabled = true
+                mvcGroup.parentGroup.model.downloadActionEnabled = mvcGroup.parentGroup.model.canDownload(model.results[row].infohash)
             })
         }
     }
@@ -84,12 +104,60 @@ class SearchTabView {
         resultsTable.columnModel.getColumn(1).setCellRenderer(centerRenderer)
         resultsTable.setDefaultRenderer(Integer.class,centerRenderer)
         resultsTable.columnModel.getColumn(4).setCellRenderer(centerRenderer)
+        
+        resultsTable.columnModel.getColumn(1).setCellRenderer(new SizeRenderer())
+        
+        
+        resultsTable.rowSorter.addRowSorterListener({ evt -> lastSortEvent = evt})
+        resultsTable.rowSorter.setSortsOnUpdates(true)
+        
+        
+        resultsTable.addMouseListener(new MouseAdapter() {
+            @Override
+            public void mouseClicked(MouseEvent e) {
+                if (e.button == MouseEvent.BUTTON3)
+                    showPopupMenu(e)
+                else if (e.button == MouseEvent.BUTTON1 && e.clickCount == 2)
+                    mvcGroup.parentGroup.controller.download()
+            }
+            @Override
+            public void mouseReleased(MouseEvent e) {
+                if (e.button == MouseEvent.BUTTON3)
+                    showPopupMenu(e)
+            }
+        })
     }
     
     def closeTab = {
         int index = parent.indexOfTab(searchTerms)
         parent.removeTabAt(index)
-        mvcGroup.parentGroup.model.searchButtonsEnabled = false
+        mvcGroup.parentGroup.model.trustButtonsEnabled = false
+        mvcGroup.parentGroup.model.downloadActionEnabled = false
         mvcGroup.destroy()
     }
+    
+    def showPopupMenu(MouseEvent e) {
+        JPopupMenu menu = new JPopupMenu()
+        if (mvcGroup.parentGroup.model.downloadActionEnabled) {
+            JMenuItem download = new JMenuItem("Download")
+            download.addActionListener({mvcGroup.parentGroup.controller.download()})
+            menu.add(download)
+        }
+        JMenuItem copyHashToClipboard = new JMenuItem("Copy hash to clipboard")
+        copyHashToClipboard.addActionListener({mvcGroup.view.copyHashToClipboard()})
+        menu.add(copyHashToClipboard)
+        menu.show(e.getComponent(), e.getX(), e.getY())
+    }
+    
+    def copyHashToClipboard() {
+        int selected = resultsTable.getSelectedRow()
+        if (selected < 0)
+            return
+        if (lastSortEvent != null)
+            selected = resultsTable.rowSorter.convertRowIndexToModel(selected)
+        String hash = Base64.encode(model.results[selected].infohash.getRoot())
+        StringSelection selection = new StringSelection(hash)
+        def clipboard = Toolkit.getDefaultToolkit().getSystemClipboard()
+        clipboard.setContents(selection, null)
+    }
 }

gui/src/main/groovy/com/muwire/gui/SizeRenderer.groovy

@@ -0,0 +1,29 @@
+package com.muwire.gui
+
+import javax.swing.JComponent
+import javax.swing.JLabel
+import javax.swing.JTable
+import javax.swing.table.DefaultTableCellRenderer
+
+import net.i2p.data.DataHelper
+
+class SizeRenderer extends DefaultTableCellRenderer {
+    SizeRenderer() {
+        setHorizontalAlignment(JLabel.CENTER)
+    }
+    @Override
+    JComponent getTableCellRendererComponent(JTable table, Object value,
+        boolean isSelected, boolean hasFocus, int row, int column) {
+        Long l = (Long) value
+        String formatted = DataHelper.formatSize2Decimal(l, false)+"B"
+        setText(formatted)
+        if (isSelected) {
+            setForeground(table.getSelectionForeground())
+            setBackground(table.getSelectionBackground())
+        } else {
+            setForeground(table.getForeground())
+            setBackground(table.getBackground())
+        }
+        this
+    }
+}

gui/src/main/groovy/com/muwire/gui/UISettings.groovy

@@ -0,0 +1,37 @@
+package com.muwire.gui
+
+class UISettings {
+    
+    String lnf
+    boolean showMonitor
+    String font
+    boolean clearCancelledDownloads
+    boolean clearFinishedDownloads
+    boolean excludeLocalResult
+    boolean showSearchHashes
+    
+    UISettings(Properties props) {
+        lnf = props.getProperty("lnf", "system")
+        showMonitor = Boolean.parseBoolean(props.getProperty("showMonitor", "true"))
+        font = props.getProperty("font",null)
+        clearCancelledDownloads = Boolean.parseBoolean(props.getProperty("clearCancelledDownloads","false"))
+        clearFinishedDownloads = Boolean.parseBoolean(props.getProperty("clearFinishedDownloads","false"))
+        excludeLocalResult = Boolean.parseBoolean(props.getProperty("excludeLocalResult","false"))
+        showSearchHashes = Boolean.parseBoolean(props.getProperty("showSearchHashes","false"))
+    }
+    
+    void write(OutputStream out) throws IOException {
+        Properties props = new Properties()
+        props.setProperty("lnf", lnf)
+        props.setProperty("showMonitor", String.valueOf(showMonitor))
+        props.setProperty("clearCancelledDownloads", String.valueOf(clearCancelledDownloads))
+        props.setProperty("clearFinishedDownloads", String.valueOf(clearFinishedDownloads))
+        props.setProperty("excludeLocalResult", String.valueOf(excludeLocalResult))
+        props.setProperty("showSearchHashes", String.valueOf(showSearchHashes))
+        if (font != null)
+            props.setProperty("font", font)
+            
+            
+        props.store(out, "UI Properties")
+    }
+}