force UTF8 for json serialization

README.md

@@ -4,26 +4,26 @@ MuWire is an easy to use file-sharing program which offers anonymity using [I2P
 
 It is inspired by the LimeWire Gnutella client and developped by a former LimeWire developer.
 
-The current stable release - 0.4.0 is avaiable for download at https://muwire.com.  You can find technical documentation in the "doc" folder.
+The current stable release - 0.1.5 is avaiable for download at http://muwire.com.  You can find technical documentation in the "doc" folder.
 
 ### Building
 
 You need JRE 8 or newer.  After installing that and setting up the appropriate paths, just type
 
 ```
-./gradlew clean assemble 
+./gradlew assemble 
 ```
 
 If you want to run the unit tests, type
 ```
-./gradlew clean build
+./gradlew build
 ```
 
 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 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.
+You need to have an I2P router up and running on the same machine.  After you build the application, look inside "gui/build/distributions".  Untar/unzip one of the "shadow" files and then run the jar contained inside by typing "java -jar MuWire-x.y.z.jar" in a terminal or command prompt.  If you use a custom I2CP host and port, create a file $HOME/.MuWire/i2p.properties and put "i2cp.tcp.host=<host>" and "i2cp.tcp.post=<port>" in there.
 
 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.
 
@@ -31,26 +31,3 @@ The first time you run MuWire it will ask you to select a nickname.  This nickna
 ### Known bugs and limitations
 
 * Many UI features you would expect are not there yet
-
-### Quick FAQ
-
-* why is MuWire slow ?
-  
-  - too few sources you're downloading from
-  - you can increase the number of tunnels by using more tunnels via Options->I2P Inbound/Outbound Quantity 
-    the default is 4 and you could raise up to as high as 16 ( Caution !!!!)
-
-* my search is not returning (enough) results !
-
-  - search is keyword or hash based
-  - keywords and hash(es) are NOT regexed or wildcarded so they have to be complete
-    so searching for 'musi' will not return results with 'music' - you have to search for 'music'
-  - ALL keywords have to match 
-  - only use space for keyword separation
-  - if you already have the file in question it is not displayed ( can be changed via Options )
-
-* what's this right click -> 'Copy hash to clipboard' for ?
-
-  - if you have a specific file you wish to share or download you can use the hash as a unique identifier
-    to make sure you have exactly the right file.
-  - you can share this hash with others to ensure they are getting the right file

TODO.md

@@ -4,6 +4,10 @@ Not in any particular order yet
 
 ### Big Items
 
+##### Alternate Locations
+
+This helps peers discover new sources for a file while the download is in progress.  Also makes sharing of partial files possible.
+
 ##### Bloom Filters
 
 This reduces query traffic by not sending last hop queries to peers that definitely do not have the file
@@ -28,13 +32,11 @@ For ease of deployment for new users, and so that users do not need to run a sep
 
 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
+* Automatic sharing of new files in shared directories (more like medium item)

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

@@ -4,7 +4,6 @@ import java.util.concurrent.CountDownLatch
 
 import com.muwire.core.Core
 import com.muwire.core.MuWireSettings
-import com.muwire.core.UILoadedEvent
 import com.muwire.core.connection.ConnectionAttemptStatus
 import com.muwire.core.connection.ConnectionEvent
 import com.muwire.core.connection.DisconnectionEvent
@@ -35,7 +34,7 @@ class Cli {
         
         Core core 
         try {
-            core = new Core(props, home, "0.4.1")
+            core = new Core(props, home, "0.2.1")
         } catch (Exception bad) {
             bad.printStackTrace(System.out)
             println "Failed to initialize core, exiting"
@@ -73,7 +72,7 @@ class Cli {
         
         Timer timer = new Timer("status-printer", true)
         timer.schedule({
-            println String.valueOf(new Date()) + " Connections $connectionsListener.connections Uploads $uploadsListener.uploads Shared $sharedListener.shared"
+            println "Connections $connectionsListener.connections Uploads $uploadsListener.uploads Shared $sharedListener.shared"
         } as TimerTask, 60000, 60000)
         
         def latch = new CountDownLatch(1)
@@ -85,7 +84,6 @@ class Cli {
         core.eventBus.register(AllFilesLoadedEvent.class, fileLoader)
         core.startServices()
         
-        core.eventBus.publish(new UILoadedEvent())        
         println "waiting for files to load"
         latch.await()
         // now we begin
@@ -119,11 +117,11 @@ class Cli {
         volatile int uploads
         public void onUploadEvent(UploadEvent e) {
             uploads++
-            println String.valueOf(new Date()) + " Starting upload of ${e.uploader.file.getName()} to ${e.uploader.request.downloader.getHumanReadableName()}"
+            println "Starting upload of ${e.uploader.file.getName()} to ${e.uploader.request.downloader.getHumanReadableName()}"
         }
         public void onUploadFinishedEvent(UploadFinishedEvent e) {
             uploads--
-            println String.valueOf(new Date()) + " Finished upload of ${e.uploader.file.getName()} to ${e.uploader.request.downloader.getHumanReadableName()}"
+            println "Finished upload of ${e.uploader.file.getName()} to ${e.uploader.request.downloader.getHumanReadableName()}"
         }
     }
     

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

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

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

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

core/build.gradle

@@ -2,7 +2,6 @@ apply plugin : 'application'
 mainClassName = 'com.muwire.core.Core'
 applicationDefaultJvmArgs = ['-Djava.util.logging.config.file=logging.properties']
 dependencies {
-    compile 'net.i2p:router:0.9.40'
     compile 'net.i2p.client:mstreaming:0.9.40'
     compile 'net.i2p.client:streaming:0.9.40'
 

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

@@ -9,5 +9,7 @@ class Constants {
     public static final int MAX_HEADER_SIZE = 0x1 << 14
     public static final int MAX_HEADERS = 16
     
-    public static final String SPLIT_PATTERN = "[\\*\\+\\-,\\.:;\\(\\)=_/\\\\\\!\\\"\\\'\\\$%\\|\\[\\]\\{\\}]"
+    public static final float DOWNLOAD_SEQUENTIAL_RATIO = 0.8f
+    
+    public static final String SPLIT_PATTERN = "[\\.,_-]"
 }

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

@@ -1,7 +1,6 @@
 package com.muwire.core
 
 import java.nio.charset.StandardCharsets
-import java.util.concurrent.atomic.AtomicBoolean
 
 import com.muwire.core.connection.ConnectionAcceptor
 import com.muwire.core.connection.ConnectionEstablisher
@@ -13,11 +12,8 @@ import com.muwire.core.connection.I2PConnector
 import com.muwire.core.connection.LeafConnectionManager
 import com.muwire.core.connection.UltrapeerConnectionManager
 import com.muwire.core.download.DownloadManager
-import com.muwire.core.download.SourceDiscoveredEvent
 import com.muwire.core.download.UIDownloadCancelledEvent
 import com.muwire.core.download.UIDownloadEvent
-import com.muwire.core.download.UIDownloadPausedEvent
-import com.muwire.core.download.UIDownloadResumedEvent
 import com.muwire.core.files.FileDownloadedEvent
 import com.muwire.core.files.FileHashedEvent
 import com.muwire.core.files.FileHasher
@@ -27,13 +23,9 @@ 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.AllFilesLoadedEvent
-import com.muwire.core.files.DirectoryUnsharedEvent
-import com.muwire.core.files.DirectoryWatcher
 import com.muwire.core.hostcache.CacheClient
 import com.muwire.core.hostcache.HostCache
 import com.muwire.core.hostcache.HostDiscoveredEvent
-import com.muwire.core.mesh.MeshManager
 import com.muwire.core.search.QueryEvent
 import com.muwire.core.search.ResultsEvent
 import com.muwire.core.search.ResultsSender
@@ -52,7 +44,6 @@ import net.i2p.client.I2PSession
 import net.i2p.client.streaming.I2PSocketManager
 import net.i2p.client.streaming.I2PSocketManagerFactory
 import net.i2p.client.streaming.I2PSocketOptions
-import net.i2p.client.streaming.I2PSocketManager.DisconnectListener
 import net.i2p.crypto.DSAEngine
 import net.i2p.crypto.SigType
 import net.i2p.data.Destination
@@ -60,9 +51,6 @@ import net.i2p.data.PrivateKey
 import net.i2p.data.Signature
 import net.i2p.data.SigningPrivateKey
 
-import net.i2p.router.Router
-import net.i2p.router.RouterContext
-
 @Log
 public class Core {
     
@@ -82,35 +70,13 @@ public class Core {
     private final ConnectionEstablisher connectionEstablisher
     private final HasherService hasherService
     private final DownloadManager downloadManager
-    private final DirectoryWatcher directoryWatcher
-    final FileManager fileManager
-    
-    private final Router router
-    
-    final AtomicBoolean shutdown = new AtomicBoolean()
         
     public Core(MuWireSettings props, File home, String myVersion) {
         this.home = home		
         this.muOptions = props
-        
-        if (!props.embeddedRouter) {
         log.info "Initializing I2P context"
         I2PAppContext.getGlobalContext().logManager()
         I2PAppContext.getGlobalContext()._logManager = new MuWireLogManager()
-            router = null
-        } else {
-            log.info("launching embedded router")
-            Properties routerProps = new Properties()
-            routerProps.setProperty("i2p.dir.config", home.getAbsolutePath())
-            routerProps.setProperty("i2np.inboundKBytesPerSecond", String.valueOf(props.inBw))
-            routerProps.setProperty("i2np.outboundKBytesPerSecond", String.valueOf(props.outBw))
-            routerProps.setProperty("i2cp.disableInterface", "true")
-            router = new Router(routerProps)
-            I2PAppContext.getGlobalContext().metaClass = new RouterContextMetaClass()
-            router.runRouter()
-            while(!router.isRunning())
-                Thread.sleep(100)
-        }
         
 		log.info("initializing I2P socket manager")
 		def i2pClient = new I2PClientFactory().createClient()
@@ -135,9 +101,9 @@ public class Core {
             i2pOptions["inbound.nickname"] = "MuWire"
             i2pOptions["outbound.nickname"] = "MuWire"
             i2pOptions["inbound.length"] = "3"
-            i2pOptions["inbound.quantity"] = "4"
+            i2pOptions["inbound.quantity"] = "2"
             i2pOptions["outbound.length"] = "3"
-            i2pOptions["outbound.quantity"] = "4"
+            i2pOptions["outbound.quantity"] = "2"
             i2pOptions["i2cp.tcp.host"] = "127.0.0.1"
             i2pOptions["i2cp.tcp.port"] = "7654"
         }
@@ -150,7 +116,6 @@ public class Core {
 		}
 		socketManager.getDefaultOptions().setReadTimeout(60000)
 		socketManager.getDefaultOptions().setConnectTimeout(30000)
-        socketManager.addDisconnectListener({eventBus.publish(new RouterDisconnectedEvent())} as DisconnectListener)
 		i2pSession = socketManager.getSession()
 		
         def destination = new Destination()
@@ -188,21 +153,15 @@ public class Core {
 		
 		
 		log.info "initializing file manager"
-		fileManager = new FileManager(eventBus, props)
+		FileManager fileManager = new FileManager(eventBus, props)
 		eventBus.register(FileHashedEvent.class, fileManager)
 		eventBus.register(FileLoadedEvent.class, fileManager)
 		eventBus.register(FileDownloadedEvent.class, fileManager)
 		eventBus.register(FileUnsharedEvent.class, fileManager)
 		eventBus.register(SearchEvent.class, fileManager)
-        eventBus.register(DirectoryUnsharedEvent.class, fileManager)
-        
-        log.info("initializing mesh manager")
-        MeshManager meshManager = new MeshManager(fileManager, home, props)
-        eventBus.register(SourceDiscoveredEvent.class, meshManager)
 		
 		log.info "initializing persistence service"
 		persisterService = new PersisterService(new File(home, "files.json"), eventBus, 15000, fileManager)
-        eventBus.register(UILoadedEvent.class, persisterService)
         
 		log.info("initializing host cache")
 		File hostStorage = new File(home, "hosts.json")
@@ -237,17 +196,14 @@ public class Core {
 		eventBus.register(ResultsEvent.class, searchManager)
 		
         log.info("initializing download manager")
-        downloadManager = new DownloadManager(eventBus, trustService, meshManager, props, i2pConnector, home, me)
+        downloadManager = new DownloadManager(eventBus, i2pConnector, home, me)
         eventBus.register(UIDownloadEvent.class, downloadManager)
         eventBus.register(UILoadedEvent.class, downloadManager)
         eventBus.register(FileDownloadedEvent.class, downloadManager)
         eventBus.register(UIDownloadCancelledEvent.class, downloadManager)
-        eventBus.register(SourceDiscoveredEvent.class, downloadManager)
-        eventBus.register(UIDownloadPausedEvent.class, downloadManager)
-        eventBus.register(UIDownloadResumedEvent.class, downloadManager)
         
         log.info("initializing upload manager")
-        UploadManager uploadManager = new UploadManager(eventBus, fileManager, meshManager, downloadManager)
+        UploadManager uploadManager = new UploadManager(eventBus, fileManager)
         
         log.info("initializing connection establisher")
         connectionEstablisher = new ConnectionEstablisher(eventBus, i2pConnector, props, connectionManager, hostCache)
@@ -257,11 +213,6 @@ 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)
-        eventBus.register(AllFilesLoadedEvent.class, directoryWatcher)
-        eventBus.register(DirectoryUnsharedEvent.class, directoryWatcher)
         
         log.info("initializing hasher service")
         hasherService = new HasherService(new FileHasher(), eventBus, fileManager)
@@ -272,6 +223,7 @@ public class Core {
         hasherService.start()
         trustService.start()
         trustService.waitForLoad()
+        persisterService.start()
         hostCache.start()
         connectionManager.start()
         cacheClient.start()
@@ -282,37 +234,14 @@ public class Core {
     }
     
     public void shutdown() {
-        if (!shutdown.compareAndSet(false, true)) {
-            log.info("already shutting down")
-            return
-        }
         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()
-        if (router != null) {
-            log.info("shutting down embedded router")
-            router.shutdown(0)
-        }
-    }
-
-    static class RouterContextMetaClass extends DelegatingMetaClass {
-        private final Object logManager = new MuWireLogManager()
-        RouterContextMetaClass() {
-            super(RouterContext.class)
-        }
-        
-        Object invokeMethod(Object object, String name, Object[] args) {
-            if (name == "logManager")
-                return logManager
-            super.invokeMethod(object, name, args)
-        }
     }
 
     static main(args) {
@@ -339,7 +268,7 @@ public class Core {
             }
         }
         
-        Core core = new Core(props, home, "0.4.1")
+        Core core = new Core(props, home, "0.2.1")
         core.startServices()
         
         // ... at the end, sleep or execute script

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

@@ -1,11 +1,6 @@
 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 {
 	
@@ -15,14 +10,10 @@ class MuWireSettings {
     int updateCheckInterval
     String nickname
     File downloadLocation
+    String sharedFiles
     CrawlerResponse crawlerResponse
     boolean shareDownloadedFiles
-    Set<String> watchedDirectories
+    boolean watchSharedDirectories
-    float downloadSequentialRatio
-    int hostClearInterval
-    int meshExpiration
-    boolean embeddedRouter
-    int inBw, outBw
     
 	MuWireSettings() {
         this(new Properties())
@@ -35,22 +26,11 @@ class MuWireSettings {
         nickname = props.getProperty("nickname","MuWireUser")
         downloadLocation = new File((String)props.getProperty("downloadLocation", 
             System.getProperty("user.home")))
-        downloadRetryInterval = Integer.parseInt(props.getProperty("downloadRetryInterval","1"))
+        sharedFiles = props.getProperty("sharedFiles")
-        updateCheckInterval = Integer.parseInt(props.getProperty("updateCheckInterval","24"))
+        downloadRetryInterval = Integer.parseInt(props.getProperty("downloadRetryInterval","15"))
+        updateCheckInterval = Integer.parseInt(props.getProperty("updateCheckInterval","36"))
         shareDownloadedFiles = Boolean.parseBoolean(props.getProperty("shareDownloadedFiles","true"))
-        downloadSequentialRatio = Float.valueOf(props.getProperty("downloadSequentialRatio","0.8"))
+        watchSharedDirectories = Boolean.parseBoolean(props.getProperty("watchSharedDirectories","true"))
-        hostClearInterval = Integer.valueOf(props.getProperty("hostClearInterval","60"))
-        meshExpiration = Integer.valueOf(props.getProperty("meshExpiration","60"))
-        embeddedRouter = Boolean.valueOf(props.getProperty("embeddedRouter","false"))
-        inBw = Integer.valueOf(props.getProperty("inBw","256"))
-        outBw = Integer.valueOf(props.getProperty("outBw","128"))
-        
-        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 {
@@ -63,20 +43,9 @@ class MuWireSettings {
         props.setProperty("downloadRetryInterval", String.valueOf(downloadRetryInterval))
         props.setProperty("updateCheckInterval", String.valueOf(updateCheckInterval))
         props.setProperty("shareDownloadedFiles", String.valueOf(shareDownloadedFiles))
-        props.setProperty("downloadSequentialRatio", String.valueOf(downloadSequentialRatio))
+        props.setProperty("watchSharedDirectories", String.valueOf(watchSharedDirectories))
-        props.setProperty("hostClearInterval", String.valueOf(hostClearInterval))
+        if (sharedFiles != null)
-        props.setProperty("meshExpiration", String.valueOf(meshExpiration))
+            props.setProperty("sharedFiles", sharedFiles)
-        props.setProperty("embeddedRouter", String.valueOf(embeddedRouter))
-        props.setProperty("inBw", String.valueOf(inBw))
-        props.setProperty("outBw", String.valueOf(outBw))
-        
-        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/RouterDisconnectedEvent.groovy

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

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

@@ -17,8 +17,6 @@ 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
@@ -227,15 +225,13 @@ 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)
-                results[i] = ResultsParser.parse(sender, resultsUUID, json)
+                eventBus.publish(ResultsParser.parse(sender, resultsUUID, json))
             }
-            eventBus.publish(new UIResultBatchEvent(uuid: resultsUUID, results: results))
         } catch (IOException | UnexpectedResultsException | InvalidSearchResultException bad) {
             log.log(Level.WARNING, "failed to process POST", bad)
         } finally {

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

@@ -2,6 +2,7 @@ package com.muwire.core.connection
 
 import java.io.InputStream
 import java.io.OutputStream
+import java.nio.charset.StandardCharsets
 
 import com.muwire.core.EventBus
 import com.muwire.core.MuWireSettings
@@ -66,7 +67,7 @@ class PeerConnection extends Connection {
 	protected void write(Object message) {
 		byte[] payload
 		if (message instanceof Map) {
-			payload = JsonOutput.toJson(message).bytes
+			payload = JsonOutput.toJson(message).getBytes(StandardCharsets.UTF_8)
 			DataUtil.packHeader(payload.length, writeHeader)
 			log.fine "$name writing message type ${message.type} length $payload.length"
 			writeHeader[0] &= (byte)0x7F

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

@@ -3,10 +3,6 @@ package com.muwire.core.download
 import com.muwire.core.connection.I2PConnector
 import com.muwire.core.files.FileDownloadedEvent
 import com.muwire.core.files.FileHasher
-import com.muwire.core.mesh.Mesh
-import com.muwire.core.mesh.MeshManager
-import com.muwire.core.trust.TrustLevel
-import com.muwire.core.trust.TrustService
 import com.muwire.core.util.DataUtil
 
 import groovy.json.JsonBuilder
@@ -18,33 +14,24 @@ import net.i2p.util.ConcurrentHashSet
 
 import com.muwire.core.EventBus
 import com.muwire.core.InfoHash
-import com.muwire.core.MuWireSettings
 import com.muwire.core.Persona
 import com.muwire.core.UILoadedEvent
 
-import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors
 
 public class DownloadManager {
     
     private final EventBus eventBus
-    private final TrustService trustService
-    private final MeshManager meshManager
-    private final MuWireSettings muSettings
     private final I2PConnector connector
     private final Executor executor
     private final File incompletes, home
     private final Persona me
     
-    private final Map<InfoHash, Downloader> downloaders = new ConcurrentHashMap<>()
+    private final Set<Downloader> downloaders = new ConcurrentHashSet<>()
     
-    public DownloadManager(EventBus eventBus, TrustService trustService, MeshManager meshManager, MuWireSettings muSettings,
+    public DownloadManager(EventBus eventBus, I2PConnector connector, File home, Persona me) {
-        I2PConnector connector, File home, Persona me) {
         this.eventBus = eventBus
-        this.trustService = trustService
-        this.meshManager = meshManager
-        this.muSettings = muSettings
         this.connector = connector
         this.incompletes = new File(home,"incompletes")
         this.home = home
@@ -71,30 +58,18 @@ public class DownloadManager {
         e.result.each { 
             destinations.add(it.sender.destination)
         }
-        destinations.addAll(e.sources)
-        destinations.remove(me.destination)
-        
-        Pieces pieces = getPieces(infohash, size, pieceSize)
         
         def downloader = new Downloader(eventBus, this, me, e.target, size,
             infohash, pieceSize, connector, destinations,
-            incompletes, pieces)
+            incompletes)
-        downloaders.put(infohash, downloader)
+        downloaders.add(downloader)
         persistDownloaders()
         executor.execute({downloader.download()} as Runnable)
         eventBus.publish(new DownloadStartedEvent(downloader : downloader))
     }
     
     public void onUIDownloadCancelledEvent(UIDownloadCancelledEvent e) {
-        downloaders.remove(e.downloader.infoHash)
+        downloaders.remove(e.downloader)
-        persistDownloaders()
-    }
-    
-    public void onUIDownloadPausedEvent(UIDownloadPausedEvent e) {
-        persistDownloaders()
-    }
-    
-    public void onUIDownloadResumedEvent(UIDownloadResumedEvent e) {
         persistDownloaders()
     }
     
@@ -122,54 +97,23 @@ public class DownloadManager {
                 byte [] root = Base64.decode(json.hashRoot)
                 infoHash = new InfoHash(root)
             }
-            
-            Pieces pieces = getPieces(infoHash, (long)json.length, json.pieceSizePow2)
-            
             def downloader = new Downloader(eventBus, this, me, file, (long)json.length,
-                infoHash, json.pieceSizePow2, connector, destinations, incompletes, pieces)
+                infoHash, json.pieceSizePow2, connector, destinations, incompletes)
-            if (json.paused != null)
+            downloaders.add(downloader)
-                downloader.paused = json.paused
-            downloaders.put(infoHash, downloader)
-            downloader.readPieces()
-            if (!downloader.paused)
             downloader.download()
             eventBus.publish(new DownloadStartedEvent(downloader : downloader))
         }
     }
     
-    private Pieces getPieces(InfoHash infoHash, long length, int pieceSizePow2) {
-        int pieceSize = 0x1 << pieceSizePow2
-        int nPieces = (int)(length / pieceSize)
-        if (length % pieceSize != 0)
-            nPieces++
-        Mesh mesh = meshManager.getOrCreate(infoHash, nPieces)
-        mesh.pieces
-    }
-    
-    void onSourceDiscoveredEvent(SourceDiscoveredEvent e) {
-        Downloader downloader = downloaders.get(e.infoHash)
-        if (downloader == null)
-            return
-        boolean ok = false
-        switch(trustService.getLevel(e.source.destination)) {
-            case TrustLevel.TRUSTED: ok = true; break
-            case TrustLevel.NEUTRAL: ok = muSettings.allowUntrusted; break
-            case TrustLevel.DISTRUSTED: ok = false; break
-        }
-        
-        if (ok)
-            downloader.addSource(e.source.destination)
-    }
-    
     void onFileDownloadedEvent(FileDownloadedEvent e) {
-        downloaders.remove(e.downloader.infoHash)
+        downloaders.remove(e.downloader)
         persistDownloaders()
     }
     
     private void persistDownloaders() {
         File downloadsFile = new File(home,"downloads.json")
         downloadsFile.withPrintWriter { writer -> 
-            downloaders.values().each { downloader ->
+            downloaders.each { downloader ->
                 if (!downloader.cancelled) {
                     def json = [:]
                     json.file = Base64.encode(DataUtil.encodei18nString(downloader.file.getAbsolutePath()))
@@ -186,8 +130,6 @@ public class DownloadManager {
                         json.hashList = Base64.encode(infoHash.hashList)
                     else
                         json.hashRoot = Base64.encode(infoHash.getRoot())
-                        
-                    json.paused = downloader.paused
                     writer.println(JsonOutput.toJson(json))
                 }
             }
@@ -195,7 +137,7 @@ public class DownloadManager {
     }
     
     public void shutdown() {
-        downloaders.values().each { it.stop() }
+        downloaders.each { it.stop() }
         Downloader.executorService.shutdownNow()
     }
 }

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

@@ -3,12 +3,8 @@ package com.muwire.core.download;
 import net.i2p.data.Base64
 
 import com.muwire.core.Constants
-import com.muwire.core.EventBus
 import com.muwire.core.InfoHash
-import com.muwire.core.Persona
 import com.muwire.core.connection.Endpoint
-import com.muwire.core.util.DataUtil
-
 import static com.muwire.core.util.DataUtil.readTillRN
 
 import groovy.util.logging.Log
@@ -20,22 +16,19 @@ import java.nio.file.Files
 import java.nio.file.StandardOpenOption
 import java.security.MessageDigest
 import java.security.NoSuchAlgorithmException
-import java.util.logging.Level
 
 @Log
 class DownloadSession {
     
     private static int SAMPLES = 10
     
-    private final EventBus eventBus
     private final String meB64
-    private final Pieces pieces
+    private final Pieces downloaded, claimed
     private final InfoHash infoHash
     private final Endpoint endpoint
     private final File file
     private final int pieceSize
     private final long fileLength
-    private final Set<Integer> available
     private final MessageDigest digest
     
     private final LinkedList<Long> timestamps = new LinkedList<>()
@@ -43,17 +36,16 @@ class DownloadSession {
     
     private ByteBuffer mapped
     
-    DownloadSession(EventBus eventBus, String meB64, Pieces pieces, InfoHash infoHash, Endpoint endpoint, File file, 
+    DownloadSession(String meB64, Pieces downloaded, Pieces claimed, InfoHash infoHash, Endpoint endpoint, File file, 
-        int pieceSize, long fileLength, Set<Integer> available) {
+        int pieceSize, long fileLength) {
-        this.eventBus = eventBus
         this.meB64 = meB64
-        this.pieces = pieces
+        this.downloaded = downloaded
+        this.claimed = claimed
         this.endpoint = endpoint
         this.infoHash = infoHash
         this.file = file
         this.pieceSize = pieceSize
         this.fileLength = fileLength
-        this.available = available
         try {
             digest = MessageDigest.getInstance("SHA-256")
         } catch (NoSuchAlgorithmException impossible) {
@@ -72,13 +64,18 @@ class DownloadSession {
         InputStream is = endpoint.getInputStream()
         
         int piece
-        if (available.isEmpty())
+        while(true) {
-            piece = pieces.claim()
+            piece = downloaded.getRandomPiece()
-        else
+            if (claimed.isMarked(piece)) {
-            piece = pieces.claim(new HashSet<>(available))
+                if (downloaded.donePieces() + claimed.donePieces() == downloaded.nPieces) {
-        if (piece == -1)
+                    log.info("all pieces claimed")
                     return false
-        boolean unclaim = true
+                }
+                continue
+            }
+            break
+        }
+        claimed.markDownloaded(piece)
         
         log.info("will download piece $piece")
         
@@ -88,81 +85,48 @@ 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))
-            os.write("X-Persona: $meB64\r\n".getBytes(StandardCharsets.US_ASCII))
+            os.write("X-Persona: $meB64\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
-            String xHave = DataUtil.encodeXHave(pieces.getDownloaded(), pieces.nPieces)
-            os.write("X-Have: $xHave\r\n\r\n".getBytes(StandardCharsets.US_ASCII)) 
             os.flush()
-            String codeString = readTillRN(is)
+            String code = readTillRN(is)
-            int space = codeString.indexOf(' ')
+            if (code.startsWith("404 ")) {
-            if (space > 0)
-                codeString = codeString.substring(0, space)
-            
-            int code = Integer.parseInt(codeString.trim())
-            
-            if (code == 404) {
                 log.warning("file not found")
                 endpoint.close()
-                return false
+                return
             }
                 
-            if (!(code == 200 || code == 416)) {
+            if (code.startsWith("416 ")) {
+                log.warning("range $start-$end cannot be satisfied")
+                return // leave endpoint open
+            }
+            
+            if (!code.startsWith("200 ")) {
                 log.warning("unknown code $code")
                 endpoint.close()
                 return false
             }
 
             // parse all headers
-            Map<String,String> headers = new HashMap<>()
+            Set<String> headers = new HashSet<>()
             String header
-            while((header = readTillRN(is)) != "" && headers.size() < Constants.MAX_HEADERS) {
+            while((header = readTillRN(is)) != "" && headers.size() < Constants.MAX_HEADERS) 
-                int colon = header.indexOf(':')
+                headers.add(header)
-                if (colon == -1 || colon == header.length() - 1)
+
-                    throw new IOException("invalid header $header")
+            long receivedStart = -1
-                String key = header.substring(0, colon)
+            long receivedEnd = -1
-                String value = header.substring(colon + 1) 
+            for (String receivedHeader : headers) {
-                headers[key] = value.trim()
+                def group = (receivedHeader =~ /^Content-Range: (\d+)-(\d+)$/)
+                if (group.size() != 1) {
+                    log.info("ignoring header $receivedHeader")
+                    continue
                 } 
 
-            // prase X-Alt if present
+                receivedStart = Long.parseLong(group[0][1])
-            if (headers.containsKey("X-Alt")) {
+                receivedEnd = Long.parseLong(group[0][2])
-                headers["X-Alt"].split(",").each {
-                    if (it.length() > 0) {
-                        byte [] raw = Base64.decode(it)
-                        Persona source = new Persona(new ByteArrayInputStream(raw))
-                        eventBus.publish(new SourceDiscoveredEvent(infoHash : infoHash, source : source))
             }
-                }
-            }
-
-            // parse X-Have if present
-            if (headers.containsKey("X-Have")) { 
-                DataUtil.decodeXHave(headers["X-Have"]).each {
-                    available.add(it)
-                }
-                if (!available.contains(piece))
-                    return true // try again next time
-            } else {
-                if (code != 200)
-                    throw new IOException("Code $code but no X-Have")
-                available.clear()
-            }
-            
-            if (code != 200)
-                return true
-            
-            String range = headers["Content-Range"]
-            if (range == null) 
-                throw new IOException("Code 200 but no Content-Range")
-            
-            def group = (range =~ /^(\d+)-(\d+)$/)
-            if (group.size() != 1) 
-                throw new IOException("invalid Content-Range header $range")
-
-            long receivedStart = Long.parseLong(group[0][1])
-            long receivedEnd = Long.parseLong(group[0][2])
             
             if (receivedStart != start || receivedEnd != end) {
                 log.warning("We don't support mismatching ranges yet")
@@ -171,8 +135,6 @@ class DownloadSession {
             }
             
             // start the download
-            FileChannel channel
-            try {
             channel = Files.newByteChannel(file.toPath(), EnumSet.of(StandardOpenOption.READ, StandardOpenOption.WRITE, 
                 StandardOpenOption.SPARSE, StandardOpenOption.CREATE)) // TODO: double-check, maybe CREATE_NEW
             mapped = channel.map(FileChannel.MapMode.READ_WRITE, start, end - start + 1)
@@ -203,15 +165,12 @@ class DownloadSession {
             System.arraycopy(infoHash.getHashList(), piece * 32, expected, 0, 32)    
             if (hash != expected) 
                 throw new BadHashException()
+            
+            downloaded.markDownloaded(piece)        
         } finally {
+            claimed.clear(piece)
             try { channel?.close() } catch (IOException ignore) {}
         }
-            pieces.markDownloaded(piece)
-            unclaim = false
-        } finally {
-            if (unclaim)
-                pieces.unclaim(piece)
-        }
         return true
     }
     

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

@@ -4,13 +4,9 @@ import com.muwire.core.InfoHash
 import com.muwire.core.Persona
 import com.muwire.core.connection.Endpoint
 
-import java.nio.file.AtomicMoveNotSupportedException
-import java.nio.file.Files
-import java.nio.file.StandardCopyOption
 import java.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
@@ -18,15 +14,13 @@ import com.muwire.core.DownloadedFile
 import com.muwire.core.EventBus
 import com.muwire.core.connection.I2PConnector
 import com.muwire.core.files.FileDownloadedEvent
-import com.muwire.core.util.DataUtil
 
 import groovy.util.logging.Log
 import net.i2p.data.Destination
-import net.i2p.util.ConcurrentHashSet
 
 @Log
 public class Downloader {
-    public enum DownloadState { CONNECTING, HASHLIST, DOWNLOADING, FAILED, CANCELLED, PAUSED, FINISHED }
+    public enum DownloadState { CONNECTING, HASHLIST, DOWNLOADING, FAILED, CANCELLED, FINISHED }
     private enum WorkerState { CONNECTING, HASHLIST, DOWNLOADING, FINISHED}
     
     private static final ExecutorService executorService = Executors.newCachedThreadPool({r ->
@@ -40,7 +34,7 @@ public class Downloader {
     private final DownloadManager downloadManager 
     private final Persona me   
     private final File file
-    private final Pieces pieces
+    private final Pieces downloaded, claimed
     private final long length
     private InfoHash infoHash
     private final int pieceSize
@@ -48,20 +42,17 @@ public class Downloader {
     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, paused
+    private volatile boolean cancelled
-    private final AtomicBoolean eventFired = new AtomicBoolean()
+    private volatile boolean eventFired
-    private boolean piecesFileClosed
 
     public Downloader(EventBus eventBus, DownloadManager downloadManager, 
         Persona me, File file, long length, InfoHash infoHash, 
         int pieceSizePow2, I2PConnector connector, Set<Destination> destinations,
-        File incompletes, Pieces pieces) {
+        File incompletes) {
         this.eventBus = eventBus
         this.me = me
         this.downloadManager = downloadManager
@@ -71,11 +62,18 @@ 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
-        this.pieces = pieces
+        
-        this.nPieces = pieces.nPieces
+        int nPieces
+        if (length % pieceSize == 0)
+            nPieces = length / pieceSize
+        else
+            nPieces = length / pieceSize + 1
+        this.nPieces = nPieces
+        
+        downloaded = new Pieces(nPieces, Constants.DOWNLOAD_SEQUENTIAL_RATIO)
+        claimed = new Pieces(nPieces)
     }
     
     public synchronized InfoHash getInfoHash() {
@@ -102,24 +100,20 @@ public class Downloader {
             return
         piecesFile.eachLine { 
             int piece = Integer.parseInt(it)
-            pieces.markDownloaded(piece)
+            downloaded.markDownloaded(piece)
         }
     }
     
     void writePieces() {
-        synchronized(piecesFile) {
-            if (piecesFileClosed)
-                return
         piecesFile.withPrintWriter { writer ->
-                pieces.getDownloaded().each { piece ->
+            downloaded.getDownloaded().each { piece -> 
                 writer.println(piece)
             }
         }
     }
-    }
     
     public long donePieces() {
-        pieces.donePieces()
+        downloaded.donePieces()
     }
     
     
@@ -137,15 +131,12 @@ public class Downloader {
     public DownloadState getCurrentState() {
         if (cancelled)
             return DownloadState.CANCELLED
-        if (paused)
-            return DownloadState.PAUSED
-            
         boolean allFinished = true
         activeWorkers.values().each { 
             allFinished &= it.currentState == WorkerState.FINISHED
         }
         if (allFinished) {
-            if (pieces.isComplete())
+            if (downloaded.isComplete())
                 return DownloadState.FINISHED
             return DownloadState.FAILED
         }
@@ -179,18 +170,9 @@ public class Downloader {
     public void cancel() {
         cancelled = true
         stop()
-        synchronized(piecesFile) {
+        file.delete()
-            piecesFileClosed = true
         piecesFile.delete()
     }
-        incompleteFile.delete()
-        pieces.clearAll()
-    }
-    
-    public void pause() {
-        paused = true
-        stop()
-    }
     
     void stop() {
         activeWorkers.values().each { 
@@ -208,8 +190,6 @@ public class Downloader {
     }
     
     public void resume() {
-        paused = false
-        readPieces()
         destinations.each { destination ->
             def worker = activeWorkers.get(destination)
             if (worker != null) {
@@ -226,21 +206,12 @@ public class Downloader {
         }
     }
     
-    void addSource(Destination d) {
-        if (activeWorkers.containsKey(d))
-            return
-        DownloadWorker newWorker = new DownloadWorker(d)
-        activeWorkers.put(d, newWorker)
-        executorService.submit(newWorker)
-    }
-    
     class DownloadWorker implements Runnable {
         private final Destination destination
         private volatile WorkerState currentState
         private volatile Thread downloadThread
         private Endpoint endpoint
         private volatile DownloadSession currentSession
-        private final Set<Integer> available = new HashSet<>()
                 
         DownloadWorker(Destination destination) {
             this.destination = destination
@@ -260,33 +231,23 @@ public class Downloader {
                 }
                 currentState = WorkerState.DOWNLOADING
                 boolean requestPerformed
-                while(!pieces.isComplete()) {
+                while(!downloaded.isComplete()) {
-                    currentSession = new DownloadSession(eventBus, me.toBase64(), pieces, getInfoHash(), 
+                    currentSession = new DownloadSession(me.toBase64(), downloaded, claimed, getInfoHash(), endpoint, file, pieceSize, length)
-                        endpoint, incompleteFile, pieceSize, length, available)
                     requestPerformed = currentSession.request()
                     if (!requestPerformed)
                         break
-                    successfulDestinations.add(endpoint.destination)
                     writePieces()
                 }
             } catch (Exception bad) {
-                log.log(Level.WARNING,"Exception while downloading",DataUtil.findRoot(bad))
+                log.log(Level.WARNING,"Exception while downloading",bad)
             } finally {
                 currentState = WorkerState.FINISHED
-                if (pieces.isComplete() && eventFired.compareAndSet(false, true)) {
+                if (downloaded.isComplete() && !eventFired) {
-                    synchronized(piecesFile) {
-                        piecesFileClosed = true
                     piecesFile.delete()
-                    }
+                    eventFired = true
-                    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),
+                            downloadedFile : new DownloadedFile(file, getInfoHash(), pieceSizePow2, Collections.emptySet()),
                         downloader : Downloader.this))
                             
                 } 

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,148 +1,4 @@
 package com.muwire.core.files
 
-import java.nio.file.FileSystem
-import java.nio.file.FileSystems
-import java.nio.file.Path
-import java.nio.file.Paths
-import static java.nio.file.StandardWatchEventKinds.*
-
-import java.nio.file.ClosedWatchServiceException
-import java.nio.file.WatchEvent
-import java.nio.file.WatchKey
-import java.nio.file.WatchService
-import java.util.concurrent.ConcurrentHashMap
-
-import com.muwire.core.EventBus
-import com.muwire.core.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 final Map<File, WatchKey> watchedDirectories = 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 onAllFilesLoadedEvent(AllFilesLoadedEvent e) {
-        watchService = FileSystems.getDefault().newWatchService()
-        watcherThread.start()
-        publisherThread.start()
-    }
-    
-    void stop() {
-        shutdown = true
-        watcherThread?.interrupt()
-        publisherThread?.interrupt()
-        watchService?.close()
-    }
-    
-    void onFileSharedEvent(FileSharedEvent e) {
-        if (!e.file.isDirectory())
-            return
-        Path path = e.file.getCanonicalFile().toPath()
-        WatchKey wk = path.register(watchService, kinds)
-        watchedDirectories.put(e.file, wk)
-        
-    }
-    
-    void onDirectoryUnsharedEvent(DirectoryUnsharedEvent e) {
-        WatchKey wk = watchedDirectories.remove(e.directory)
-        wk?.cancel()
-    }
-
-    private void watch() {
-        try {
-            while(!shutdown) {
-                WatchKey key = watchService.take()
-                key.pollEvents().each {
-                    switch(it.kind()) {
-                        case ENTRY_CREATE: processCreated(key.watchable(), it.context()); break
-                        case ENTRY_MODIFY: processModified(key.watchable(), it.context()); break
-                        case ENTRY_DELETE: processDeleted(key.watchable(), it.context()); break
-                    }
-                }
-                key.reset()
-            }
-        } catch (InterruptedException|ClosedWatchServiceException e) {
-            if (!shutdown)
-                throw e
-        }
-    }
-    
-
-    private void processCreated(Path parent, Path path) {
-        File f= join(parent, path)
-        log.fine("created entry $f")
-        if (f.isDirectory())
-            f.toPath().register(watchService, kinds)
-        else
-            waitingFiles.put(f, System.currentTimeMillis())
-    }
-        
-    private void processModified(Path parent, Path path) {
-        File f = join(parent, path)
-        log.fine("modified entry $f")
-        waitingFiles.put(f, System.currentTimeMillis())
-    }
-    
-    private void processDeleted(Path parent, Path path) {
-        File f = join(parent, path)
-        log.fine("deleted entry $f")
-        SharedFile sf = fileManager.fileToSharedFile.get(f)
-        if (sf != null)
-            eventBus.publish(new FileUnsharedEvent(unsharedFile : sf))
-    }
-    
-    private static File join(Path parent, Path path) {
-        File parentFile = parent.toFile().getCanonicalFile()
-        new File(parentFile, path.toFile().getName())
-    }
-    
-    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/FileHashedEvent.groovy

@@ -7,10 +7,4 @@ class FileHashedEvent extends Event {
 
 	SharedFile sharedFile
 	String error
-    
-    @Override
-    public String toString() {
-        super.toString() + " sharedFile " + sharedFile?.file.getAbsolutePath() + " error: $error"
-    }
-    
 }

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

@@ -135,16 +135,4 @@ class FileManager {
         }
         rv
     }
-    
-    void onDirectoryUnsharedEvent(DirectoryUnsharedEvent e) {
-        e.directory.listFiles().each { 
-            if (it.isDirectory())
-                eventBus.publish(new DirectoryUnsharedEvent(directory : it))
-            else {
-                SharedFile sf = fileToSharedFile.get(it)
-                if (sf != null)
-                    eventBus.publish(new FileUnsharedEvent(unsharedFile : sf))
-            }
-        }
-    }
 }

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

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

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 {eventBus.publish new FileSharedEvent(file: it) }
+			f.listFiles().each {onFileSharedEvent new FileSharedEvent(file: it) }
 		} else {
 			if (f.length() == 0) {
 				eventBus.publish new FileHashedEvent(error: "Not sharing empty file $f")

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

@@ -11,7 +11,6 @@ import com.muwire.core.EventBus
 import com.muwire.core.InfoHash
 import com.muwire.core.Service
 import com.muwire.core.SharedFile
-import com.muwire.core.UILoadedEvent
 import com.muwire.core.util.DataUtil
 
 import groovy.json.JsonOutput
@@ -37,12 +36,12 @@ class PersisterService extends Service {
 		timer = new Timer("file persister", true)
 	}
 	
-	void stop() {
+	void start() {
-		timer.cancel()
+		timer.schedule({load()} as TimerTask, 1)
 	}
 	
-    void onUILoadedEvent(UILoadedEvent e) {
+	void stop() {
-        timer.schedule({load()} as TimerTask, 1)
+		timer.cancel()
 	}
 	
 	void load() {

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

@@ -7,25 +7,20 @@ class Host {
 	private static final int MAX_FAILURES = 3
 	
 	final Destination destination
-    private final int clearInterval
 	int failures,successes
-    long lastAttempt
 	
-	public Host(Destination destination, int clearInterval) {
+	public Host(Destination destination) {
 		this.destination = destination
-        this.clearInterval = clearInterval
 	}
 
 	synchronized void onConnect() {
 		failures = 0
 		successes++
-        lastAttempt = System.currentTimeMillis()
 	}
 	
 	synchronized void onFailure() {
 		failures++
 		successes = 0
-        lastAttempt = System.currentTimeMillis()
 	}
 	
 	synchronized boolean isFailed() {
@@ -39,8 +34,4 @@ class Host {
     synchronized void clearFailures() {
         failures = 0
     }
-    
-    synchronized void canTryAgain() {
-        System.currentTimeMillis() - lastAttempt > (clearInterval * 60 * 1000)
-    }
 }

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

@@ -52,7 +52,7 @@ class HostCache extends Service {
             hosts.get(e.destination).clearFailures()
             return
 		}
-		Host host = new Host(e.destination, settings.hostClearInterval)
+		Host host = new Host(e.destination)
 		if (allowHost(host)) {
 			hosts.put(e.destination, host)
 		}
@@ -64,7 +64,7 @@ class HostCache extends Service {
 		Destination dest = e.endpoint.destination
 		Host host = hosts.get(dest)
 		if (host == null) {
-			host = new Host(dest, settings.hostClearInterval)
+			host = new Host(dest)
 			hosts.put(dest, host)
 		}
 
@@ -106,11 +106,9 @@ class HostCache extends Service {
 			storage.eachLine {
 				def entry = slurper.parseText(it)
 				Destination dest = new Destination(entry.destination)
-				Host host = new Host(dest, settings.hostClearInterval)
+				Host host = new Host(dest)
 				host.failures = Integer.valueOf(String.valueOf(entry.failures))
 				host.successes = Integer.valueOf(String.valueOf(entry.successes))
-                if (entry.lastAttempt != null)
-                    host.lastAttempt = entry.lastAttempt
 				if (allowHost(host))
 					hosts.put(dest, host)
 			}
@@ -120,7 +118,7 @@ class HostCache extends Service {
 	}
 	
 	private boolean allowHost(Host host) {
-		if (host.isFailed() && !host.canTryAgain())
+		if (host.isFailed())
 			return false
 		if (host.destination == myself)
 			return false
@@ -145,7 +143,6 @@ class HostCache extends Service {
 					map.destination = dest.toBase64()
 					map.failures = host.failures
 					map.successes = host.successes
-                    map.lastAttempt = host.lastAttempt
 					def json = JsonOutput.toJson(map)
 					writer.println json
 				}

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

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

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

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

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

@@ -1,7 +1,5 @@
 package com.muwire.core.search
 
-import java.util.stream.Collectors
-
 import javax.naming.directory.InvalidSearchControlsException
 
 import com.muwire.core.InfoHash
@@ -9,7 +7,6 @@ import com.muwire.core.Persona
 import com.muwire.core.util.DataUtil
 
 import net.i2p.data.Base64
-import net.i2p.data.Destination
 
 class ResultsParser {
     public static UIResultEvent parse(Persona p, UUID uuid, def json) throws InvalidSearchResultException {
@@ -61,7 +58,6 @@ class ResultsParser {
                  size : size,
                  infohash : parsedIH,
                  pieceSize : pieceSize,
-                 sources : Collections.emptySet(),
                  uuid : uuid)
         } catch (Exception e) {
             throw new InvalidSearchResultException("parsing search result failed",e)
@@ -86,17 +82,11 @@ class ResultsParser {
             if (infoHash.length != InfoHash.SIZE)
                 throw new InvalidSearchResultException("invalid infohash size $infoHash.length")
             int pieceSize = json.pieceSize
-            
-            Set<Destination> sources = Collections.emptySet()
-            if (json.sources != null) 
-                sources = json.sources.stream().map({new Destination(it)}).collect(Collectors.toSet())
-            
             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,10 +11,7 @@ import java.util.concurrent.Executor
 import java.util.concurrent.Executors
 import java.util.concurrent.ThreadFactory
 import java.util.concurrent.atomic.AtomicInteger
-import java.util.logging.Level
-import java.util.stream.Collectors
 
-import com.muwire.core.DownloadedFile
 import com.muwire.core.EventBus
 import com.muwire.core.InfoHash
 
@@ -57,16 +54,12 @@ class ResultsSender {
                 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 : pieceSize,
-                    uuid : uuid,
+                    uuid : uuid
-                    sources : suggested
                     )
                     eventBus.publish(uiResultEvent)
             }
@@ -84,7 +77,6 @@ class ResultsSender {
         
         @Override
         public void run() {
-            try {
             byte [] tmp = new byte[InfoHash.SIZE]
             JsonOutput jsonOutput = new JsonOutput()
             Endpoint endpoint = null;
@@ -118,10 +110,6 @@ class ResultsSender {
                         }
                         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))
@@ -130,9 +118,6 @@ class ResultsSender {
             } finally {
                 endpoint?.close()
             }
-            } catch (Exception e) {
-                log.log(Level.WARNING, "problem sending results",e)
-            }
         }
     }
 }

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

@@ -33,10 +33,7 @@ class SearchIndex {
 	
 	private static String[] split(String source) {
 		source = source.replaceAll(Constants.SPLIT_PATTERN, " ").toLowerCase()
-		String [] split = source.split(" ")
+		source.split(" ")
-        def rv = []
-        split.each { if (it.length() > 0) rv << it }
-        rv.toArray(new String[0])
 	}
 	
 	String[] search(List<String> terms) {

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

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

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

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

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

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

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

@@ -5,56 +5,32 @@ import java.nio.channels.FileChannel
 import java.nio.charset.StandardCharsets
 import java.nio.file.Files
 import java.nio.file.StandardOpenOption
-import java.util.stream.Collectors
 
-import com.muwire.core.Persona
 import com.muwire.core.connection.Endpoint
-import com.muwire.core.mesh.Mesh
-import com.muwire.core.util.DataUtil
-
-import net.i2p.data.Destination
 
 class ContentUploader extends Uploader {
     
     private final File file
     private final ContentRequest request
-    private final Mesh mesh
-    private final int pieceSize
     
-    ContentUploader(File file, ContentRequest request, Endpoint endpoint, Mesh mesh, int pieceSize) {
+    ContentUploader(File file, ContentRequest request, Endpoint endpoint) {
         super(endpoint)
         this.file = file
         this.request = request
-        this.mesh = mesh
-        this.pieceSize = pieceSize
     }
     
     @Override
     void respond() {
         OutputStream os = endpoint.getOutputStream()
         Range range = request.getRange()
-        boolean satisfiable = true
+        if (range.start >= file.length() || range.end >= file.length()) {
-        final long length = file.length()
+            os.write("416 Range Not Satisfiable\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
-        if (range.start >= length || range.end >= length)
-            satisfiable = false
-        if (satisfiable) {
-            int startPiece = range.start / (0x1 << pieceSize)
-            int endPiece = range.end / (0x1 << pieceSize)
-            for (int i = startPiece; i <= endPiece; i++)
-                satisfiable &= mesh.pieces.isDownloaded(i)
-        }
-        if (!satisfiable) {
-            os.write("416 Range Not Satisfiable\r\n".getBytes(StandardCharsets.US_ASCII))
-            writeMesh(request.downloader)
-            os.write("\r\n".getBytes(StandardCharsets.US_ASCII))
             os.flush()
             return
         }
 
         os.write("200 OK\r\n".getBytes(StandardCharsets.US_ASCII))
-        os.write("Content-Range: $range.start-$range.end\r\n".getBytes(StandardCharsets.US_ASCII))
+        os.write("Content-Range: $range.start-$range.end\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
-        writeMesh(request.downloader)
-        os.write("\r\n".getBytes(StandardCharsets.US_ASCII))
 
         FileChannel channel
         try {
@@ -75,44 +51,4 @@ class ContentUploader extends Uploader {
         }
     }
 
-    private void writeMesh(Persona toExclude) {
-        String xHave = DataUtil.encodeXHave(mesh.pieces.getDownloaded(), mesh.pieces.nPieces)
-        endpoint.getOutputStream().write("X-Have: $xHave\r\n".getBytes(StandardCharsets.US_ASCII))
-        
-        Set<Persona> sources = mesh.getRandom(3, toExclude)
-        if (!sources.isEmpty()) {
-            String xAlts = sources.stream().map({ it.toBase64() }).collect(Collectors.joining(","))
-            endpoint.getOutputStream().write("X-Alt: $xAlts\r\n".getBytes(StandardCharsets.US_ASCII))
-        }
-    }
-
-    @Override
-    public String getName() {
-        return file.getName();
-    }
-
-    @Override
-    public synchronized int getProgress() {
-        if (mapped == null)
-            return 0
-        int position = mapped.position()
-        int total = request.getRange().end - request.getRange().start
-        (int)(position * 100.0 / total)
-    }
-
-    @Override
-    public String getDownloader() {
-        request.downloader.getHumanReadableName()
-    }
-
-    @Override
-    public int getDonePieces() {
-        return request.have;
-    }
-
-    @Override
-    public int getTotalPieces() {
-        return mesh.pieces.nPieces;
-    }
-
 }

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

@@ -6,8 +6,6 @@ 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
@@ -16,7 +14,6 @@ class HashListUploader extends Uploader {
         super(endpoint)
         this.infoHash = infoHash
         mapped = ByteBuffer.wrap(infoHash.getHashList())
-        this.request = request
     }
     
     void respond() {
@@ -35,31 +32,4 @@ class HashListUploader extends Uploader {
         }
         endpoint.getOutputStream().flush()
     }
-
-    @Override
-    public String getName() {
-        return "Hash list for " + Base64.encode(infoHash.getRoot());
-    }
-
-    @Override
-    public synchronized int getProgress() {
-        (int)(mapped.position() * 100.0 / mapped.capacity())
-    }
-
-    @Override
-    public String getDownloader() {
-        request.downloader.getHumanReadableName()
-    }
-
-    @Override
-    public int getDonePieces() {
-        return 0;
-    }
-
-    @Override
-    public int getTotalPieces() {
-        return 1;
-    }
-    
-    
 }

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

@@ -5,7 +5,6 @@ import java.nio.charset.StandardCharsets
 import com.muwire.core.Constants
 import com.muwire.core.InfoHash
 import com.muwire.core.Persona
-import com.muwire.core.util.DataUtil
 
 import groovy.util.logging.Log
 import net.i2p.data.Base64
@@ -49,14 +48,8 @@ class Request {
             def decoded = Base64.decode(encoded)
             downloader = new Persona(new ByteArrayInputStream(decoded))
         }
-        
-        int have = 0
-        if (headers.containsKey("X-Have")) {
-            def encoded = headers["X-Have"].trim()
-            have = DataUtil.decodeXHave(encoded).size()
-        }
         new ContentRequest( infoHash : infoHash, range : new Range(start, end), 
-            headers : headers, downloader : downloader, have : have)
+            headers : headers, downloader : downloader)
     }
     
     static Request parseHashListRequest(InfoHash infoHash, InputStream is) throws IOException {

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

@@ -6,12 +6,7 @@ import com.muwire.core.EventBus
 import com.muwire.core.InfoHash
 import com.muwire.core.SharedFile
 import com.muwire.core.connection.Endpoint
-import com.muwire.core.download.DownloadManager
-import com.muwire.core.download.Downloader
-import com.muwire.core.download.SourceDiscoveredEvent
 import com.muwire.core.files.FileManager
-import com.muwire.core.mesh.Mesh
-import com.muwire.core.mesh.MeshManager
 
 import groovy.util.logging.Log
 import net.i2p.data.Base64
@@ -20,17 +15,12 @@ import net.i2p.data.Base64
 public class UploadManager {
     private final EventBus eventBus
     private final FileManager fileManager
-    private final MeshManager meshManager
-    private final DownloadManager downloadManager
     
     public UploadManager() {}
     
-    public UploadManager(EventBus eventBus, FileManager fileManager, 
+    public UploadManager(EventBus eventBus, FileManager fileManager) {
-        MeshManager meshManager, DownloadManager downloadManager) {
         this.eventBus = eventBus
         this.fileManager = fileManager
-        this.meshManager = meshManager
-        this.downloadManager = downloadManager
     }
     
     public void processGET(Endpoint e) throws IOException {
@@ -54,10 +44,8 @@ public class UploadManager {
             log.info("Responding to upload request for root $infoHashString")
 
             byte [] infoHashRoot = Base64.decode(infoHashString)
-            InfoHash infoHash = new InfoHash(infoHashRoot)
             Set<SharedFile> sharedFiles = fileManager.getSharedFiles(infoHashRoot)
-            Downloader downloader = downloadManager.downloaders.get(infoHash)
+            if (sharedFiles == null || sharedFiles.isEmpty()) {
-            if (downloader == null && (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()
@@ -73,31 +61,13 @@ public class UploadManager {
                 return
             }
 
-            ContentRequest request = Request.parseContentRequest(infoHash, 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 ContentUploader(sharedFiles.iterator().next().file, request, e)
-            if (request.have > 0) 
-                eventBus.publish(new SourceDiscoveredEvent(infoHash : request.infoHash, source : request.downloader))
-            
-            Mesh mesh
-            File file
-            int pieceSize
-            if (downloader != null) {
-                mesh = meshManager.get(infoHash)
-                file = downloader.incompleteFile
-                pieceSize = downloader.pieceSizePow2
-            } else {
-                SharedFile sharedFile = sharedFiles.iterator().next();
-                mesh = meshManager.getOrCreate(request.infoHash, sharedFile.NPieces)
-                file = sharedFile.file
-                pieceSize = sharedFile.pieceSize
-            }
-                
-            Uploader uploader = new ContentUploader(file, request, e, mesh, pieceSize)
             eventBus.publish(new UploadEvent(uploader : uploader))
             try {
                 uploader.respond()
@@ -115,10 +85,8 @@ public class UploadManager {
         log.info("Responding to hashlist request for root $infoHashString")
         
         byte [] infoHashRoot = Base64.decode(infoHashString)
-        InfoHash infoHash = new InfoHash(infoHashRoot)
-        Downloader downloader = downloadManager.downloaders.get(infoHash)
         Set<SharedFile> sharedFiles = fileManager.getSharedFiles(infoHashRoot)
-        if (downloader == null && (sharedFiles == null || sharedFiles.isEmpty())) {
+        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()
@@ -134,30 +102,13 @@ public class UploadManager {
             return
         }
         
-        Request request = Request.parseHashListRequest(infoHash, e.getInputStream())
+        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)
-        InfoHash fullInfoHash
-        if (downloader == null) {
-            fullInfoHash = sharedFiles.iterator().next().infoHash
-        } else {
-            byte [] hashList = downloader.getInfoHash().getHashList()
-            if (hashList != null && hashList.length > 0)
-                fullInfoHash = downloader.getInfoHash()
-            else {
-                log.info("infohash not found in downloader")
-                e.getOutputStream().write("404 File Not Found\r\n\r\n".getBytes(StandardCharsets.US_ASCII))
-                e.getOutputStream().flush()
-                e.close()
-                return
-            }
-        }
-        
-        Uploader uploader = new HashListUploader(e, fullInfoHash, request)
         eventBus.publish(new UploadEvent(uploader : uploader))
         try {
             uploader.respond()
@@ -179,10 +130,8 @@ public class UploadManager {
             log.info("Responding to upload request for root $infoHashString")
 
             infoHashRoot = Base64.decode(infoHashString)
-            infoHash = new InfoHash(infoHashRoot)
             sharedFiles = fileManager.getSharedFiles(infoHashRoot)
-            downloader = downloadManager.downloaders.get(infoHash)
+            if (sharedFiles == null || sharedFiles.isEmpty()) {
-            if (downloader == null && (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()
@@ -204,25 +153,7 @@ public class UploadManager {
                 e.close()
                 return
             }
-            
+            uploader = new ContentUploader(sharedFiles.iterator().next().file, request, e)
-            if (request.have > 0)
-                eventBus.publish(new SourceDiscoveredEvent(infoHash : request.infoHash, source : request.downloader))
-            
-            Mesh mesh
-            File file
-            int pieceSize
-            if (downloader != null) {
-                mesh = meshManager.get(infoHash)
-                file = downloader.incompleteFile
-                pieceSize = downloader.pieceSizePow2
-            } else {
-                SharedFile sharedFile = sharedFiles.iterator().next();
-                mesh = meshManager.getOrCreate(request.infoHash, sharedFile.NPieces)
-                file = sharedFile.file
-                pieceSize = sharedFile.pieceSize
-            }
-
-            uploader = new ContentUploader(file, request, e, mesh, pieceSize)
             eventBus.publish(new UploadEvent(uploader : uploader))
             try {
                 uploader.respond()

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

@@ -23,17 +23,4 @@ abstract class Uploader {
             return -1
         mapped.position()
     }
-    
-    abstract String getName();
-    
-    /**
-     * @return an integer between 0 and 100
-     */
-    abstract int getProgress();
-    
-    abstract String getDownloader();
-    
-    abstract int getDonePieces();
-    
-    abstract int getTotalPieces()
 }

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

@@ -4,8 +4,6 @@ import java.nio.charset.StandardCharsets
 
 import com.muwire.core.Constants
 
-import net.i2p.data.Base64
-
 class DataUtil {
 	
 	private final static int MAX_SHORT = (0x1 << 16) - 1
@@ -81,38 +79,4 @@ class DataUtil {
         }
         new String(baos.toByteArray(), StandardCharsets.US_ASCII)
     }
-    
-    public static String encodeXHave(List<Integer> pieces, int totalPieces) {
-        int bytes = totalPieces / 8
-        if (totalPieces % 8 != 0)
-            bytes++
-        byte[] raw = new byte[bytes]
-        pieces.each {
-            int byteIdx = it / 8
-            int offset = it % 8
-            int mask = 0x80 >>> offset
-            raw[byteIdx] |= mask
-        }
-        Base64.encode(raw)
-    }
-    
-    public static List<Integer> decodeXHave(String xHave) {
-        byte [] availablePieces = Base64.decode(xHave)
-        List<Integer> available = new ArrayList<>()
-        availablePieces.eachWithIndex {b, i ->
-            for (int j = 0; j < 8 ; j++) {
-                byte mask = 0x80 >>> j
-                if ((b & mask) == mask) {
-                    available.add(i * 8 + j)
-                }
-            }
-        }
-        available
-    }
-    
-    public static Exception findRoot(Exception e) {
-        while(e.getCause() != null)
-            e = e.getCause()
-        e
-    }
 }

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

@@ -1,7 +1,6 @@
 package com.muwire.core;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.Set;
 
 import net.i2p.data.Destination;
@@ -10,8 +9,7 @@ public class DownloadedFile extends SharedFile {
 	
 	private final Set<Destination> sources;
 
-	public DownloadedFile(File file, InfoHash infoHash, int pieceSize, Set<Destination> sources) 
+	public DownloadedFile(File file, InfoHash infoHash, int pieceSize, Set<Destination> sources) {
-	throws IOException {
 		super(file, infoHash, pieceSize);
 		this.sources = sources;
 	}

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

@@ -1,7 +1,6 @@
 package com.muwire.core;
 
 import java.io.File;
-import java.io.IOException;
 
 public class SharedFile {
 
@@ -9,15 +8,10 @@ public class SharedFile {
 	private final InfoHash infoHash;
 	private final int pieceSize;
 	
-	private final String cachedPath;
+	public SharedFile(File file, InfoHash infoHash, int pieceSize) {
-	private final long cachedLength;
-	
-	public SharedFile(File file, InfoHash infoHash, int pieceSize) throws IOException {
 		this.file = file;
 		this.infoHash = infoHash;
 		this.pieceSize = pieceSize;
-		this.cachedPath = file.getAbsolutePath();
-		this.cachedLength = file.length();
 	}
 
 	public File getFile() {
@@ -31,34 +25,4 @@ public class SharedFile {
 	public int getPieceSize() {
 	    return pieceSize;
 	}
-	
-	public int getNPieces() {
-	    long length = file.length();
-	    int rawPieceSize = 0x1 << pieceSize;
-	    int rv = (int) (length / rawPieceSize);
-	    if (length % rawPieceSize != 0)
-	        rv++;
-	    return rv;
-	}
-	
-	public String getCachedPath() {
-	    return cachedPath;
-	}
-	
-	public long getCachedLength() {
-	    return cachedLength;
-	}
-	
-	@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/download/DownloadSessionTest.groovy

@@ -1,30 +1,21 @@
 package com.muwire.core.download
 
-import static org.junit.Assert.fail
-
 import org.junit.After
-import org.junit.Before
 import org.junit.Test
 
-import com.muwire.core.EventBus
 import com.muwire.core.InfoHash
-import com.muwire.core.Persona
-import com.muwire.core.Personas
 import com.muwire.core.connection.Endpoint
 import com.muwire.core.files.FileHasher
 import static com.muwire.core.util.DataUtil.readTillRN
-import static com.muwire.core.util.DataUtil.encodeXHave
 
 import net.i2p.data.Base64
-import net.i2p.util.ConcurrentHashSet
 
 class DownloadSessionTest {
     
-    private EventBus eventBus
     private File source, target
     private InfoHash infoHash
     private Endpoint endpoint
-    private Pieces pieces
+    private Pieces pieces, claimed
     private String rootBase64
     
     private DownloadSession session
@@ -33,16 +24,6 @@ class DownloadSessionTest {
     private InputStream fromDownloader, fromUploader
     private OutputStream toDownloader, toUploader
     
-    private volatile boolean performed
-    private Set<Integer> available = new ConcurrentHashSet<>()
-    private volatile IOException thrown
-    
-    
-    @Before
-    public void setUp() {
-        eventBus = new EventBus()
-    }
-    
     private void initSession(int size, def claimedPieces = []) {
         Random r = new Random()
         byte [] content = new byte[size]
@@ -67,7 +48,8 @@ class DownloadSessionTest {
         else
             nPieces = size / pieceSize + 1
         pieces = new Pieces(nPieces)
-        claimedPieces.each {pieces.claimed.set(it)}
+        claimed = new Pieces(nPieces)
+        claimedPieces.each {claimed.markDownloaded(it)}
         
         fromDownloader = new PipedInputStream()
         fromUploader = new PipedInputStream()
@@ -75,20 +57,12 @@ class DownloadSessionTest {
         toUploader = new PipedOutputStream(fromDownloader)
         endpoint = new Endpoint(null, fromUploader, toUploader, null)
         
-        session = new DownloadSession(eventBus, "",pieces, infoHash, endpoint, target, pieceSize, size, available)
+        session = new DownloadSession("",pieces, claimed, infoHash, endpoint, target, pieceSize, size)
-        downloadThread = new Thread( { perform() } as Runnable)
+        downloadThread = new Thread( { session.request() } as Runnable)
         downloadThread.setDaemon(true)
         downloadThread.start()
     }
     
-    private void perform() {
-        try { 
-            performed = session.request()
-        } catch (IOException e) {
-            thrown = e
-        }
-    }
-    
     @After
     public void teardown() {
         source?.delete()
@@ -103,7 +77,6 @@ class DownloadSessionTest {
         assert "GET $rootBase64" == readTillRN(fromDownloader)
         assert "Range: 0-19" == readTillRN(fromDownloader)
         readTillRN(fromDownloader)
-        readTillRN(fromDownloader)
         assert "" == readTillRN(fromDownloader)
         
         toDownloader.write("200 OK\r\n".bytes)
@@ -115,9 +88,6 @@ class DownloadSessionTest {
         
         assert pieces.isComplete()
         assert target.bytes == source.bytes
-        assert performed
-        assert available.isEmpty()
-        assert thrown == null
     }
     
     @Test
@@ -129,7 +99,6 @@ class DownloadSessionTest {
         assert "GET $rootBase64" == readTillRN(fromDownloader)
         readTillRN(fromDownloader)
         readTillRN(fromDownloader)
-        readTillRN(fromDownloader)
         assert "" == readTillRN(fromDownloader)
         
         toDownloader.write("200 OK\r\n".bytes)
@@ -140,9 +109,6 @@ class DownloadSessionTest {
         Thread.sleep(150)
         assert pieces.isComplete()
         assert target.bytes == source.bytes
-        assert performed
-        assert available.isEmpty()
-        assert thrown == null
     }
     
     @Test
@@ -160,7 +126,6 @@ class DownloadSessionTest {
         assert (start == 0 && end == ((1 << pieceSize) - 1)) || 
             (start == (1 << pieceSize) && end == (1 << pieceSize))
         
-        readTillRN(fromDownloader)
         readTillRN(fromDownloader)
         assert "" == readTillRN(fromDownloader)
         
@@ -174,9 +139,6 @@ class DownloadSessionTest {
         Thread.sleep(150)
         assert !pieces.isComplete()
         assert 1 == pieces.donePieces()
-        assert performed
-        assert available.isEmpty()
-        assert thrown == null
     }
     
     @Test
@@ -184,10 +146,7 @@ class DownloadSessionTest {
         initSession(20, [0])
         long now = System.currentTimeMillis()
         downloadThread.join(100)
-        assert 100 >= (System.currentTimeMillis() - now)
+        assert 100 > (System.currentTimeMillis() - now)
-        assert !performed
-        assert available.isEmpty()
-        assert thrown == null
     }
     
     @Test
@@ -195,7 +154,7 @@ class DownloadSessionTest {
         int pieceSize = FileHasher.getPieceSize(1)
         int size = (1 << pieceSize) * 10
         initSession(size, [1,2,3,4,5,6,7,8,9])
-        assert !pieces.claimed.get(0)
+        assert !claimed.isMarked(0)
         
         assert "GET $rootBase64" == readTillRN(fromDownloader)
         String range = readTillRN(fromDownloader)
@@ -203,131 +162,7 @@ class DownloadSessionTest {
         int start = Integer.parseInt(matcher[0][1])
         int end = Integer.parseInt(matcher[0][2])
         
-        assert pieces.claimed.get(0)
+        assert claimed.isMarked(0)
         assert start == 0 && end == (1 << pieceSize) - 1
     }
-    
-    @Test
-    public void test416NoHave() {
-        initSession(20)
-        readAllHeaders(fromDownloader)
-        
-        toDownloader.write("416 don't have it\r\n\r\n".bytes)
-        toDownloader.flush()
-        Thread.sleep(150)
-        assert !performed
-        assert available.isEmpty()
-        assert thrown != null
-    }
-    
-    @Test
-    public void test416Have() {
-        initSession(20)
-        readAllHeaders(fromDownloader)
-        
-        toDownloader.write("416 don't have it\r\n".bytes)
-        toDownloader.write("X-Have: ${encodeXHave([0], 1)}\r\n\r\n".bytes)
-        toDownloader.flush()
-        
-        Thread.sleep(150)
-        assert performed
-        assert available.contains(0)
-        assert thrown == null
-    }
-    
-    @Test
-    public void test416Have2Pieces() {
-        int pieceSize = FileHasher.getPieceSize(1)
-        int size = (1 << pieceSize) + 1
-        initSession(size)
-        readAllHeaders(fromDownloader)
-        
-        toDownloader.write("416 don't have it\r\n".bytes)
-        toDownloader.write("X-Have: ${encodeXHave([1], 2)}\r\n\r\n".bytes)
-        toDownloader.flush()
-        
-        Thread.sleep(150)
-        assert performed
-        assert available.contains(1)
-        assert thrown == null
-    }
-    
-    @Test
-    public void test200TwoPieces1Available() {
-        int pieceSize = FileHasher.getPieceSize(1)
-        int size = (1 << pieceSize) * 9 + 1
-        initSession(size)
-        
-        Set<String> headers = readAllHeaders(fromDownloader)
-        def matcher = null
-        headers.each {
-            if (it.startsWith("Range"))
-                matcher = (it =~ /^Range: (\d+)-(\d+)$/)
-        }
-        assert matcher.groupCount() > 0
-        int start = Integer.parseInt(matcher[0][1])
-        int end = Integer.parseInt(matcher[0][2])
-        
-        if (start == 0) 
-            fail("inconlcusive")
-        
-        toDownloader.write("416 don't have it \r\n".bytes)
-        toDownloader.write("X-Have: ${encodeXHave([0],2)}\r\n\r\n".bytes)
-        toDownloader.flush()
-        downloadThread.join()
-        
-        assert performed
-        performed = false
-        assert available.contains(0)
-        assert thrown == null
-        
-        // request same session
-        downloadThread = new Thread( { perform() } as Runnable)
-        downloadThread.setDaemon(true)
-        downloadThread.start()
-        
-        Thread.sleep(150)
-        
-        headers = readAllHeaders(fromDownloader)
-        matcher = null
-        headers.each {
-            if (it.startsWith("Range"))
-            matcher = (it =~ /^Range: (\d+)-(\d+)$/)
-        }
-        assert matcher.groupCount() > 0
-        start = Integer.parseInt(matcher[0][1])
-        end = Integer.parseInt(matcher[0][2])
-        assert start == 0
-    }
-    
-    @Test
-    public void testXAlt() throws Exception {
-        Personas personas = new Personas()
-        def sources = []
-        def listener = new Object() {
-            public void onSourceDiscoveredEvent(SourceDiscoveredEvent e) {
-                sources << e.source
-            }
-        }
-        eventBus.register(SourceDiscoveredEvent.class, listener)
-        
-        initSession(20)
-        readAllHeaders(fromDownloader)
-        toDownloader.write("416 don't have it\r\n".bytes)
-        toDownloader.write("X-Alt: ${personas.persona1.toBase64()},${personas.persona2.toBase64()}\r\n\r\n".bytes)
-        toDownloader.flush()
-        
-        Thread.sleep(150)
-        assert sources.contains(personas.persona1)
-        assert sources.contains(personas.persona2)
-        assert 2 == sources.size()
-    }
-    
-    private static Set<String> readAllHeaders(InputStream is) {
-        Set<String> rv = new HashSet<>()
-        String header
-        while((header = readTillRN(is)) != "")
-            rv.add(header)
-        rv
-    }
 }

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

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

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

@@ -26,7 +26,7 @@ class FileHasherTest extends GroovyTestCase {
 	void testPieceSize() {
 		assert 17 == FileHasher.getPieceSize(1000000)
 		assert 17 == FileHasher.getPieceSize(100000000)
-		assert 24 == FileHasher.getPieceSize(FileHasher.MAX_SIZE)
+		assert 27 == FileHasher.getPieceSize(FileHasher.MAX_SIZE)
 		shouldFail IllegalArgumentException, {
 			FileHasher.getPieceSize(Long.MAX_VALUE)
 		}

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

@@ -27,7 +27,6 @@ class HasherServiceTest {
 		hasher = new FileHasher()
 		service = new HasherService(hasher, eventBus, new FileManager(eventBus, new MuWireSettings()))
         eventBus.register(FileHashedEvent.class, listener)
-        eventBus.register(FileSharedEvent.class, service)
 		service.start()
 	}
 	

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

@@ -78,7 +78,7 @@ class PersisterServiceLoadingTest {
 		persisted.write json
 		
 		PersisterService ps = new PersisterService(persisted, eventBus, 100, null)
-		ps.onUILoadedEvent(null)
+		ps.start()
 		Thread.sleep(2000)
 		
 		assert listener.publishedFiles.size() == 1
@@ -121,7 +121,7 @@ class PersisterServiceLoadingTest {
 		persisted.write json
 		
 		PersisterService ps = new PersisterService(persisted, eventBus, 100, null)
-		ps.onUILoadedEvent(null)
+		ps.start()
 		Thread.sleep(2000)
 		
 		assert listener.publishedFiles.size() == 1
@@ -163,7 +163,7 @@ class PersisterServiceLoadingTest {
 		persisted.append "$json2\n"
 		
 		PersisterService ps = new PersisterService(persisted, eventBus, 100, null)
-		ps.onUILoadedEvent(null)
+		ps.start()
 		Thread.sleep(2000)
 		
 		assert listener.publishedFiles.size() == 2
@@ -195,7 +195,7 @@ class PersisterServiceLoadingTest {
 		persisted.write json1
 		
 		PersisterService ps = new PersisterService(persisted, eventBus, 100, null)
-		ps.onUILoadedEvent(null)
+		ps.start()
 		Thread.sleep(2000)
 		
 		assert listener.publishedFiles.size() == 1

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

@@ -58,7 +58,7 @@ class PersisterServiceSavingTest {
 		sf = new SharedFile(f, ih, 0)
 		
 		ps = new PersisterService(persisted, eventBus, 100, fileSource)
-		ps.onUILoadedEvent(null)
+		ps.start()
 		Thread.sleep(1500)
 	
 		JsonSlurper jsonSlurper = new JsonSlurper()	
@@ -77,7 +77,7 @@ class PersisterServiceSavingTest {
 		sf = new DownloadedFile(f, ih, 0, new HashSet([dests.dest1, dests.dest2]))
 		
 		ps = new PersisterService(persisted, eventBus, 100, fileSource)
-		ps.onUILoadedEvent(null)
+		ps.start()
 		Thread.sleep(1500)
 	
 		JsonSlurper jsonSlurper = new JsonSlurper()

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

@@ -83,11 +83,4 @@ class SearchIndexTest {
 		assert found.size() == 1
 		assert found.contains("b c.d")
 	}
-    
-    @Test
-    void testDuplicateTerm() {
-        initIndex(["MuWire-0.3.3.jar"])
-        def found = index.search(["muwire", "0", "3", "jar"])
-        assert found.size() == 1
-    }
 }

core/src/test/groovy/com/muwire/core/upload/RequestParsingTest.groovy

@@ -9,18 +9,18 @@ import com.muwire.core.InfoHash
 
 class RequestParsingTest {
     
-    ContentRequest request
+    Request request
     
     private void fromString(String requestString) {
         def is = new ByteArrayInputStream(requestString.getBytes(StandardCharsets.US_ASCII))
-        request = Request.parseContentRequest(new InfoHash(new byte[InfoHash.SIZE]), is)
+        request = Request.parse(new InfoHash(new byte[InfoHash.SIZE]), is)
     }
 
     
     private static void failed(String requestString) {
         try {
             def is = new ByteArrayInputStream(requestString.getBytes(StandardCharsets.US_ASCII))
-            Request.parseContentRequest(new InfoHash(new byte[InfoHash.SIZE]), is)
+            Request.parse(new InfoHash(new byte[InfoHash.SIZE]), is)
             assert false
         } catch (IOException expected) {}
     }

core/src/test/groovy/com/muwire/core/upload/UploaderTest.groovy

@@ -19,7 +19,7 @@ class UploaderTest {
     InputStream is
     OutputStream os
     
-    ContentRequest request
+    Request request
     Uploader uploader
     
     byte[] inFile
@@ -52,7 +52,7 @@ class UploaderTest {
     }
     
     private void startUpload() {
-        uploader = new ContentUploader(file, request, endpoint)
+        uploader = new Uploader(file, request, endpoint)
         uploadThread = new Thread(uploader.respond() as Runnable)
         uploadThread.setDaemon(true)
         uploadThread.start()
@@ -77,7 +77,7 @@ class UploaderTest {
     @Test
     public void testSmallFile() {
         fillFile(20)
-        request = new ContentRequest(range : new Range(0,19))
+        request = new Request(range : new Range(0,19))
         startUpload()
         assert "200 OK" == readUntilRN()
         assert "Content-Range: 0-19" == readUntilRN()
@@ -92,7 +92,7 @@ class UploaderTest {
     @Test
     public void testRequestMiddle() {
         fillFile(20)
-        request = new ContentRequest(range : new Range(5,15))
+        request = new Request(range : new Range(5,15))
         startUpload()
         assert "200 OK" == readUntilRN()
         assert "Content-Range: 5-15" == readUntilRN()
@@ -108,7 +108,7 @@ class UploaderTest {
     @Test
     public void testOutOfRange() {
         fillFile(20)
-        request = new ContentRequest(range : new Range(0,20))
+        request = new Request(range : new Range(0,20))
         startUpload()
         assert "416 Range Not Satisfiable" == readUntilRN()
         assert "" == readUntilRN()
@@ -118,7 +118,7 @@ class UploaderTest {
     public void testLargeFile() {
         final int length = 0x1 << 14
         fillFile(length)
-        request = new ContentRequest(range : new Range(0, length - 1))
+        request = new Request(range : new Range(0, length - 1))
         startUpload()
         readUntilRN()
         readUntilRN()

doc/design.md

@@ -49,7 +49,7 @@ Files are transferred over HTTP1.1 protocol with some custom headers added for d
 
 ### Mesh management
 
-Download mesh management is a simplified version of Gnutella's "Alternate Location" system.  For more information see the "download-mesh" document.
+Download mesh management is identical to Gnutella, except instead of ip addresses MuWire personas are used.  [More information](http://rfc-gnutella.sourceforge.net/developer/tmp/download-mesh.html) 
 
 ### In-Network updates
 

doc/download-mesh.md

@@ -1,15 +0,0 @@
-# Download Mesh / Partial Sharing
-
-MuWire uses a system similar to Gnutella's "Alternate Location" download mesh management system, however it is simplified to account for I2P's strengths and borrows a bit from BitTorrent's "Have" message.
-
-### "X-Have" header
-
-With every request a downloader makes it sends an "X-Have" header containing the Base64-encoded representation of a bitfield where bits set to 1 represent pieces of the file that the downloader already has.  To make partial file sharing possible, if the uploader does not have the complete file it also sends this header in every response.  If the header is missing it is assumed the uploader has the complete file.
-
-### "X-Alt" header
-
-The uploader can recommend other uploaders to the downloader via the "X-Alt" header.  The format of this header is a comma-separated list of Base64-encoded Personas that have previously reported having at least one piece of the file to the uploader via the "X-Have" header.
-
-### Differences from Gnutella
-
-Unlike Gnutella the uploader is the sole repository where possible sources of the file are tracked.  There is no negative "X-Nalt" header to prevent attacking the download mesh by mass downvoting of sources.

gradle.properties

@@ -1,8 +1,5 @@
 group         = com.muwire
-version       = 0.4.1
+version       = 0.2.1
 groovyVersion = 2.4.15
 slf4jVersion  = 1.7.25
 spockVersion  = 1.1-groovy-2.4
-
-sourceCompatibility=1.8
-targetCompatibility=1.8

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

@@ -17,9 +17,6 @@ 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.download.UIDownloadPausedEvent
-import com.muwire.core.download.UIDownloadResumedEvent
-import com.muwire.core.files.DirectoryUnsharedEvent
 import com.muwire.core.search.QueryEvent
 import com.muwire.core.search.SearchEvent
 import com.muwire.core.trust.TrustEvent
@@ -45,8 +42,6 @@ class MainFrameController {
         search = search.trim()
         if (search.length() == 0)
             return
-        if (search.length() > 128)
-            search = search.substring(0,128)
         def uuid = UUID.randomUUID()
         Map<String, Object> params = new HashMap<>()
         params["search-terms"] = search
@@ -67,14 +62,12 @@ class MainFrameController {
         
         def searchEvent
         if (hashSearch) {
-            searchEvent = new SearchEvent(searchHash : root, uuid : uuid, oobInfohash: true)
+            searchEvent = new SearchEvent(searchHash : root, uuid : uuid)
         } else {
             // this can be improved a lot
             def replaced = search.toLowerCase().trim().replaceAll(Constants.SPLIT_PATTERN, " ")
             def terms = replaced.split(" ")
-            def nonEmpty = []
+            searchEvent = new SearchEvent(searchTerms : terms, uuid : uuid, oobInfohash: true)
-            terms.each { if (it.length() > 0) nonEmpty << it }
-            searchEvent = new SearchEvent(searchTerms : nonEmpty, uuid : uuid, oobInfohash: true)
         }
         core.eventBus.publish(new QueryEvent(searchEvent : searchEvent, firstHop : true, 
             replyTo: core.me.destination, receivedOn: core.me.destination,
@@ -125,10 +118,7 @@ class MainFrameController {
     void download() {
         def result = selectedResult()
         if (result == null)
-            return
+            return // TODO disable button
-        
-        if (!model.canDownload(result.infohash))
-            return   
             
         def file = new File(application.context.get("muwire-settings").downloadLocation, result.name)
         
@@ -136,9 +126,8 @@ class MainFrameController {
         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, sources: sources, target : file))
+        core.eventBus.publish(new UIDownloadEvent(result : resultsBucket, target : file))
     }
     
     @ControllerAction
@@ -161,7 +150,6 @@ class MainFrameController {
     void cancel() {
         def downloader = model.downloads[selectedDownload()].downloader
         downloader.cancel()
-        model.downloadInfoHashes.remove(downloader.getInfoHash())
         core.eventBus.publish(new UIDownloadCancelledEvent(downloader : downloader))
     }
     
@@ -169,14 +157,6 @@ class MainFrameController {
     void resume() {
         def downloader = model.downloads[selectedDownload()].downloader
         downloader.resume()
-        core.eventBus.publish(new UIDownloadResumedEvent())
-    }
-    
-    @ControllerAction
-    void pause() {
-        def downloader = model.downloads[selectedDownload()].downloader
-        downloader.pause()
-        core.eventBus.publish(new UIDownloadPausedEvent())
     }
 
     private void markTrust(String tableName, TrustLevel level, def list) {
@@ -210,25 +190,6 @@ class MainFrameController {
         println "unsharing selected files"
     }
     
-    void stopWatchingDirectory() {
-        String directory = mvcGroup.view.getSelectedWatchedDirectory()
-        if (directory == null)
-            return
-        core.muOptions.watchedDirectories.remove(directory)
-        saveMuWireSettings()    
-        core.eventBus.publish(new DirectoryUnsharedEvent(directory : new File(directory)))
-                
-        model.watched.remove(directory)
-        builder.getVariable("watched-directories-table").model.fireTableDataChanged()
-    }
-    
-    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

@@ -4,15 +4,9 @@ import griffon.core.artifact.GriffonController
 import griffon.core.controller.ControllerAction
 import griffon.inject.MVCMember
 import griffon.metadata.ArtifactProviderFor
-import groovy.util.logging.Log
-
-import java.util.logging.Level
-
 import javax.annotation.Nonnull
-import javax.swing.JFileChooser
 
 import com.muwire.core.Core
-import com.muwire.core.MuWireSettings
 
 @ArtifactProviderFor(GriffonController)
 class OptionsController {
@@ -52,7 +46,7 @@ class OptionsController {
         text = view.retryField.text
         model.downloadRetryInterval = text
 
-        MuWireSettings settings = application.context.get("muwire-settings")
+        def settings = application.context.get("muwire-settings")
         settings.downloadRetryInterval = Integer.valueOf(text)
 
         text = view.updateField.text
@@ -67,18 +61,6 @@ class OptionsController {
         model.shareDownloadedFiles = shareDownloaded
         settings.shareDownloadedFiles = shareDownloaded
                         
-        String downloadLocation = model.downloadLocation
-        settings.downloadLocation = new File(downloadLocation)
-
-        if (settings.embeddedRouter) {
-            text = view.inBwField.text
-            model.inBw = text
-            settings.inBw = Integer.valueOf(text)
-            text = view.outBwField.text
-            model.outBw = text
-            settings.outBw = Integer.valueOf(text)
-        }
-                                
         File settingsFile = new File(core.home, "MuWire.properties")
         settingsFile.withOutputStream { 
             settings.write(it)
@@ -95,9 +77,9 @@ class OptionsController {
         model.font = text
         uiSettings.font = text
         
-//        boolean showMonitor = view.monitorCheckbox.model.isSelected()
+        boolean showMonitor = view.monitorCheckbox.model.isSelected()
-//        model.showMonitor = showMonitor
+        model.showMonitor = showMonitor
-//        uiSettings.showMonitor = showMonitor
+        uiSettings.showMonitor = showMonitor
         
         boolean clearCancelledDownloads = view.clearCancelledDownloadsCheckbox.model.isSelected()
         model.clearCancelledDownloads = clearCancelledDownloads
@@ -111,9 +93,9 @@ class OptionsController {
         model.excludeLocalResult = excludeLocalResult
         uiSettings.excludeLocalResult = excludeLocalResult
         
-//        boolean showSearchHashes = view.showSearchHashesCheckbox.model.isSelected()
+        boolean showSearchHashes = view.showSearchHashesCheckbox.model.isSelected()
-//        model.showSearchHashes = showSearchHashes
+        model.showSearchHashes = showSearchHashes
-//        uiSettings.showSearchHashes = showSearchHashes
+        uiSettings.showSearchHashes = showSearchHashes
         
         File uiSettingsFile = new File(core.home, "gui.properties")
         uiSettingsFile.withOutputStream { 
@@ -128,15 +110,4 @@ class OptionsController {
         view.d.setVisible(false)
         mvcGroup.destroy()
     }
-    
-    @ControllerAction
-    void downloadLocation() {
-        def chooser = new JFileChooser()
-        chooser.setFileHidingEnabled(false)
-        chooser.setDialogTitle("Select location for downloaded files")
-        chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY)
-        int rv = chooser.showOpenDialog(null)
-        if (rv == JFileChooser.APPROVE_OPTION)
-            model.downloadLocation = chooser.getSelectedFile().getAbsolutePath()
-    }
 }

gui/griffon-app/lifecycle/Initialize.groovy

@@ -43,8 +43,6 @@ class Initialize extends AbstractLifecycleHandler {
         
         application.context.put("muwire-home", home.getAbsolutePath())
         
-        System.getProperties().setProperty("awt.useSystemAAFontSettings", "true")
-        
         def guiPropsFile = new File(home, "gui.properties")
         UISettings uiSettings
         if (guiPropsFile.exists()) {

gui/griffon-app/lifecycle/Ready.groovy

@@ -1,4 +1,3 @@
-
 import griffon.core.GriffonApplication
 import griffon.core.env.Metadata
 import groovy.util.logging.Log
@@ -48,7 +47,6 @@ class Ready extends AbstractLifecycleHandler {
         } else {
             log.info("creating new properties")
             props = new MuWireSettings()
-            props.embeddedRouter = Boolean.parseBoolean(System.getProperties().getProperty("embeddedRouter"))
             def nickname
             while (true) {
                 nickname = JOptionPane.showInputDialog(null,
@@ -75,7 +73,6 @@ class Ready extends AbstractLifecycleHandler {
                 props.downloadLocation = new File(portableDownloads)
             } else {
                 def chooser = new JFileChooser()
-                chooser.setFileHidingEnabled(false)
                 chooser.setDialogTitle("Select a directory where downloads will be saved")
                 chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY)
                 int rv = chooser.showOpenDialog(null)
@@ -100,9 +97,6 @@ class Ready extends AbstractLifecycleHandler {
                 "Can't connect to I2P router", JOptionPane.WARNING_MESSAGE)
             System.exit(0)
         }
-        Runtime.getRuntime().addShutdownHook({
-            core.shutdown() 
-        })
         core.startServices()
         application.context.put("muwire-settings", props)
         application.context.put("core",core)
@@ -110,6 +104,12 @@ class Ready extends AbstractLifecycleHandler {
             it.propertyChange(new PropertyChangeEvent(this, "core", null, core)) 
         }
         
+        if (props.sharedFiles != null) {
+            props.sharedFiles.split(",").each {
+                core.eventBus.publish(new FileSharedEvent(file : new File(it)))
+            }
+        }
+        
         core.eventBus.publish(new UILoadedEvent())
     }
 }

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

@@ -9,22 +9,17 @@ 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.RouterDisconnectedEvent
 import com.muwire.core.connection.ConnectionAttemptStatus
 import com.muwire.core.connection.ConnectionEvent
 import com.muwire.core.connection.DisconnectionEvent
 import com.muwire.core.download.DownloadStartedEvent
 import com.muwire.core.download.Downloader
-import com.muwire.core.files.AllFilesLoadedEvent
 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
@@ -57,7 +52,6 @@ class MainFrameModel {
     def downloads = []
     def uploads = []
     def shared = []
-    def watched = []
     def connectionList = []
     def searches = new LinkedList()
     def trusted = []
@@ -65,17 +59,12 @@ class MainFrameModel {
     
     @Observable int connections
     @Observable String me
-    @Observable boolean downloadActionEnabled
+    @Observable boolean searchButtonsEnabled
-    @Observable boolean trustButtonsEnabled
     @Observable boolean cancelButtonEnabled
     @Observable boolean retryButtonEnabled
-    @Observable boolean pauseButtonEnabled
-    @Observable String resumeButtonText
     
     private final Set<InfoHash> infoHashes = new HashSet<>()
 
-    private final Set<InfoHash> downloadInfoHashes = new HashSet<>()
-
     volatile Core core    
 
     private long lastRetryTime = System.currentTimeMillis()
@@ -126,7 +115,6 @@ 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)
@@ -138,14 +126,9 @@ 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)
-            core.eventBus.register(RouterDisconnectedEvent.class, this)
-            core.eventBus.register(AllFilesLoadedEvent.class, this)
             
             timer.schedule({
-                if (core.shutdown.get())
+                int retryInterval = application.context.get("muwire-settings").downloadRetryInterval
-                    return
-                int retryInterval = core.muOptions.downloadRetryInterval
                 if (retryInterval > 0) {
                     retryInterval *= 60000
                     long now = System.currentTimeMillis()
@@ -168,35 +151,19 @@ class MainFrameModel {
             runInsideUIAsync {
                 trusted.addAll(core.trustService.good.values())
                 distrusted.addAll(core.trustService.bad.values())
-                
-                
-                resumeButtonText = "Retry"
             }
         })
         
     }
     
-    void onAllFilesLoadedEvent(AllFilesLoadedEvent e) {
-        runInsideUIAsync {
-            watched.addAll(core.muOptions.watchedDirectories)
-            builder.getVariable("watched-directories-table").model.fireTableDataChanged()
-            watched.each { core.eventBus.publish(new FileSharedEvent(file : new File(it))) }
-        }
-    }
     void onUIResultEvent(UIResultEvent e) {
         MVCGroup resultsGroup = results.get(e.uuid)
         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)
         }
     }
     
@@ -258,17 +225,6 @@ 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
@@ -296,10 +252,8 @@ class MainFrameModel {
             updateTablePreservingSelection("trusted-table")
             updateTablePreservingSelection("distrusted-table")
             
-            results.values().each { MVCGroup group -> 
+            results.values().each { 
-                if (group.alive) {
+                it.view.pane.getClientProperty("results-table")?.model.fireTableDataChanged()
-                    group.view.pane.getClientProperty("results-table")?.model.fireTableDataChanged()
-                }
             }
         }
     }
@@ -351,14 +305,6 @@ class MainFrameModel {
         }
     }
     
-    void onRouterDisconnectedEvent(RouterDisconnectedEvent e) {
-        runInsideUIAsync {
-            JOptionPane.showMessageDialog(null, "MuWire lost connection to the I2P router and will now exit.",
-                "Connection to I2P router lost", JOptionPane.WARNING_MESSAGE)
-            System.exit(0)
-        }
-    }
-    
     void onFileDownloadedEvent(FileDownloadedEvent e) {
         if (!core.muOptions.shareDownloadedFiles)
             return
@@ -387,8 +333,4 @@ class MainFrameModel {
             return destination == other.destination
         }
     }
-    
-    boolean canDownload(InfoHash hash) {
-        !downloadInfoHashes.contains(hash)
-    }
 }

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

@@ -13,7 +13,6 @@ class OptionsModel {
     @Observable String updateCheckInterval
     @Observable boolean onlyTrusted
     @Observable boolean shareDownloadedFiles
-    @Observable String downloadLocation
     
     // i2p options
     @Observable String inboundLength
@@ -30,17 +29,12 @@ class OptionsModel {
     @Observable boolean excludeLocalResult
     @Observable boolean showSearchHashes
     
-    // bw options
-    @Observable String inBw
-    @Observable String outBw
-    
     void mvcGroupInit(Map<String, String> args) {
         MuWireSettings settings = application.context.get("muwire-settings")
         downloadRetryInterval = settings.downloadRetryInterval
         updateCheckInterval = settings.updateCheckInterval
         onlyTrusted = !settings.allowUntrusted()
         shareDownloadedFiles = settings.shareDownloadedFiles
-        downloadLocation = settings.downloadLocation.getAbsolutePath()
         
         Core core = application.context.get("core")
         inboundLength = core.i2pOptions["inbound.length"]
@@ -56,10 +50,5 @@ class OptionsModel {
         clearFinishedDownloads = uiSettings.clearFinishedDownloads
         excludeLocalResult = uiSettings.excludeLocalResult
         showSearchHashes = uiSettings.showSearchHashes
-        
-        if (core.router != null) {
-            inBw = String.valueOf(settings.inBw)
-            outBw = String.valueOf(settings.outBw)
-        }
     }
 }

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

@@ -23,7 +23,6 @@ class SearchTabModel {
     String uuid
     def results = []
     def hashBucket = [:]
-    def sourcesBucket = [:]
     
     
     void mvcGroupInit(Map<String, String> args) {
@@ -38,7 +37,7 @@ class SearchTabModel {
     
     void handleResult(UIResultEvent e) {
         if (uiSettings.excludeLocalResult &&
-            core.fileManager.rootToFiles.containsKey(e.infohash))
+            e.sender == core.me)
             return
         runInsideUIAsync {
             def bucket = hashBucket.get(e.infohash)
@@ -48,43 +47,9 @@ class SearchTabModel {
             }
             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/EventListView.groovy

@@ -21,10 +21,10 @@ class EventListView {
             application(size: [320, 80], id: 'event-list',
                 locationRelativeTo : null,
                 title: application.configuration['application.title'],
-                iconImage:   imageIcon('/MuWire-48x48.png').image,
+                iconImage:   imageIcon('/griffon-icon-48x48.png').image,
-                iconImages: [imageIcon('/MuWire-48x48.png').image,
+                iconImages: [imageIcon('/griffon-icon-48x48.png').image,
-                             imageIcon('/MuWire-32x32.png').image,
+                             imageIcon('/griffon-icon-32x32.png').image,
-                             imageIcon('/MuWire-16x16.png').image],
+                             imageIcon('/griffon-icon-16x16.png').image],
                  visible: bind { !model.coreInitialized} ) {
                 panel {
                     vbox {

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

@@ -1,7 +1,6 @@
 package com.muwire.gui
 
 import griffon.core.artifact.GriffonView
-import griffon.core.env.Metadata
 import griffon.inject.MVCMember
 import griffon.metadata.ArtifactProviderFor
 import net.i2p.data.Base64
@@ -38,7 +37,6 @@ import java.awt.event.MouseEvent
 import java.nio.charset.StandardCharsets
 
 import javax.annotation.Nonnull
-import javax.inject.Inject
 
 @ArtifactProviderFor(GriffonView)
 class MainFrameView {
@@ -47,24 +45,20 @@ class MainFrameView {
     @MVCMember @Nonnull
     MainFrameModel model
     
-    @Inject Metadata metadata
-    
     def downloadsTable
     def lastDownloadSortEvent
     def lastSharedSortEvent
-    def lastWatchedSortEvent
     
     void initUI() {
         UISettings settings = application.context.get("ui-settings")
         builder.with {
             application(size : [1024,768], id: 'main-frame',
             locationRelativeTo : null,
-            title: application.configuration['application.title'] + " " + 
+            title: application.configuration['application.title'],
-                metadata["application.version"] + " revision " + metadata["build.revision"],
+            iconImage:   imageIcon('/griffon-icon-48x48.png').image,
-            iconImage:   imageIcon('/MuWire-48x48.png').image,
+            iconImages: [imageIcon('/griffon-icon-48x48.png').image,
-            iconImages: [imageIcon('/MuWire-48x48.png').image,
+                imageIcon('/griffon-icon-32x32.png').image,
-                imageIcon('/MuWire-32x32.png').image,
+                imageIcon('/griffon-icon-16x16.png').image],
-                imageIcon('/MuWire-16x16.png').image],
             pack : false,
             visible : bind { model.coreInitialized }) {
                 menuBar {
@@ -111,9 +105,9 @@ class MainFrameView {
                                 borderLayout()
                                 tabbedPane(id : "result-tabs", constraints: BorderLayout.CENTER)
                                 panel(constraints : BorderLayout.SOUTH) {
-                                    button(text : "Download", enabled : bind {model.downloadActionEnabled}, downloadAction)
+                                    button(text : "Download", enabled : bind {model.searchButtonsEnabled}, downloadAction)
-                                    button(text : "Trust", enabled: bind {model.trustButtonsEnabled }, trustAction)
+                                    button(text : "Trust", enabled: bind {model.searchButtonsEnabled }, trustAction)
-                                    button(text : "Distrust", enabled : bind {model.trustButtonsEnabled}, distrustAction)
+                                    button(text : "Distrust", enabled : bind {model.searchButtonsEnabled}, distrustAction)
                                 }
                             }
                             panel (constraints : JSplitPane.BOTTOM) {
@@ -126,7 +120,7 @@ class MainFrameView {
                                             closureColumn(header: "Progress", preferredWidth: 20, type: String, read: { row ->
                                                 int pieces = row.downloader.nPieces
                                                 int done = row.downloader.donePieces()
-                                                "$done/$pieces pieces".toString()
+                                                "$done/$pieces pieces"
                                             })
                                             closureColumn(header: "Sources", preferredWidth : 10, type: Integer, read : {row -> row.downloader.activeWorkers()})
                                             closureColumn(header: "Speed", preferredWidth: 50, type:String, read :{row -> 
@@ -136,41 +130,24 @@ class MainFrameView {
                                     }
                                 }
                                 panel (constraints : BorderLayout.SOUTH) {
-                                    button(text: "Pause", enabled : bind {model.pauseButtonEnabled}, pauseAction)
                                     button(text: "Cancel", enabled : bind {model.cancelButtonEnabled }, cancelAction )
-                                    button(text: bind { model.resumeButtonText }, enabled : bind {model.retryButtonEnabled}, resumeAction)
+                                    button(text: "Retry", enabled : bind {model.retryButtonEnabled}, resumeAction)
                                 }
                             }
                         }
                     }
                     panel (constraints: "uploads window"){
                         gridLayout(cols : 1, rows : 2)
-                        panel {
-                            gridLayout(cols : 2, rows : 1) 
                         panel {
                             borderLayout()
                             panel (constraints : BorderLayout.NORTH) {
-                                    button(text : "Add directories to watch", actionPerformed : watchDirectories)
+                                button(text : "Click here to share files", actionPerformed : shareFiles)
                             }
-                                scrollPane (constraints : BorderLayout.CENTER) {
+                            scrollPane ( constraints : BorderLayout.CENTER) {
-                                    table(id : "watched-directories-table", autoCreateRowSorter: true) {
-                                        tableModel(list : model.watched) {
-                                            closureColumn(header: "Watched Directories", type : String, read : { it })
-                                        }
-                                    }
-                                }
-                            }
-                            panel {
-                                borderLayout()
-                                panel (constraints : BorderLayout.NORTH) {
-                                    button(text : "Share files", actionPerformed : shareFiles)
-                                }
-                                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.getCachedPath()})
+                                         closureColumn(header : "Name", preferredWidth : 550, type : String, read : {row -> row.file.getAbsolutePath()})
-                                            closureColumn(header : "Size", preferredWidth : 100, type : Long, read : {row -> row.getCachedLength() })
+                                         closureColumn(header : "Size", preferredWidth : 50, type : Long, read : {row -> row.file.length() })
-                                        }
                                      }   
                                 }
                             }
@@ -183,16 +160,16 @@ class MainFrameView {
                             scrollPane (constraints : BorderLayout.CENTER) {
                                 table(id : "uploads-table") {
                                     tableModel(list : model.uploads) {
-                                        closureColumn(header : "Name", type : String, read : {row -> row.getName() })
+                                        closureColumn(header : "Name", type : String, read : {row -> row.file.getName() })
                                         closureColumn(header : "Progress", type : String, read : { row ->
-                                            int percent = row.getProgress()
+                                            int position = row.getPosition()
-                                            "$percent% of piece".toString()
+                                            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.getDownloader()
+                                            row.request.downloader?.getHumanReadableName()
-                                        })
-                                        closureColumn(header : "Remote Pieces", type : String, read : { row ->
-                                            "${row.getDonePieces()}/${row.getTotalPieces()}".toString()
                                         })
                                     }
                                 }
@@ -300,7 +277,6 @@ class MainFrameView {
             if (selectedRow < 0) {
                 model.cancelButtonEnabled = false
                 model.retryButtonEnabled = false
-                model.pauseButtonEnabled = false
                 return
             }
             def downloader = model.downloads[selectedRow]?.downloader
@@ -311,25 +287,15 @@ class MainFrameView {
                 case Downloader.DownloadState.DOWNLOADING :
                 case Downloader.DownloadState.HASHLIST:
                 model.cancelButtonEnabled = true
-                model.pauseButtonEnabled = true
                 model.retryButtonEnabled = false
                 break
                 case Downloader.DownloadState.FAILED:
                 model.cancelButtonEnabled = true
                 model.retryButtonEnabled = true
-                model.resumeButtonText = "Retry"
-                model.pauseButtonEnabled = false
-                break
-                case Downloader.DownloadState.PAUSED:
-                model.cancelButtonEnabled = true
-                model.retryButtonEnabled = true
-                model.resumeButtonText = "Resume"
-                model.pauseButtonEnabled = false
                 break
                 default:
                 model.cancelButtonEnabled = false
                 model.retryButtonEnabled = false
-                model.pauseButtonEnabled = false
             }
         })
         
@@ -398,27 +364,6 @@ class MainFrameView {
             }
         })
         
-        // watched directories table
-        def watchedTable = builder.getVariable("watched-directories-table")
-        watchedTable.rowSorter.addRowSorterListener({evt -> lastWatchedSortEvent = evt})
-        watchedTable.rowSorter.setSortsOnUpdates(true)
-        JPopupMenu watchedMenu = new JPopupMenu()
-        JMenuItem stopWatching = new JMenuItem("Stop sharing")
-        stopWatching.addActionListener({mvcGroup.controller.stopWatchingDirectory()})
-        watchedMenu.add(stopWatching)
-        watchedTable.addMouseListener(new MouseAdapter() {
-            @Override
-            public void mouseReleased(MouseEvent e) {
-                if (e.isPopupTrigger())
-                    showPopupMenu(watchedMenu, e)
-            }
-            @Override
-            public void mousePressed(MouseEvent e) {
-                if (e.isPopupTrigger())
-                    showPopupMenu(watchedMenu, e)
-            }
-        })
-        
     }
     
     private static void showPopupMenu(JPopupMenu menu, MouseEvent event) {
@@ -458,32 +403,21 @@ class MainFrameView {
         int selected = selectedDownloaderRow()
         if (selected < 0)
             return
-        boolean pauseEnabled = false
         boolean cancelEnabled = false
         boolean retryEnabled = false
-        String resumeText = "Retry"
         Downloader downloader = model.downloads[selected].downloader
         switch(downloader.currentState) {
             case Downloader.DownloadState.DOWNLOADING:
             case Downloader.DownloadState.HASHLIST:
             case Downloader.DownloadState.CONNECTING:
-                pauseEnabled = true
                 cancelEnabled = true
                 retryEnabled = false
                 break
             case Downloader.DownloadState.FAILED:
-                pauseEnabled = false
                 cancelEnabled = true
                 retryEnabled = true
                 break
-            case Downloader.DownloadState.PAUSED:
-                pauseEnabled = false
-                cancelEnabled = true
-                retryEnabled = true
-                resumeText = "Resume"
-                break
             default :
-                pauseEnabled = false
                 cancelEnabled = false
                 retryEnabled = false
         }
@@ -498,12 +432,6 @@ class MainFrameView {
         })
         menu.add(copyHashToClipboard)
         
-        if (pauseEnabled) {
-            JMenuItem pause = new JMenuItem("Pause")
-            pause.addActionListener({mvcGroup.controller.pause()})
-            menu.add(pause)
-        }
-        
         if (cancelEnabled) {
             JMenuItem cancel = new JMenuItem("Cancel")
             cancel.addActionListener({mvcGroup.controller.cancel()})
@@ -511,7 +439,7 @@ class MainFrameView {
         }
         
         if (retryEnabled) {
-            JMenuItem retry = new JMenuItem(resumeText)
+            JMenuItem retry = new JMenuItem("Retry")
             retry.addActionListener({mvcGroup.controller.resume()})
             menu.add(retry)
         }
@@ -541,38 +469,11 @@ class MainFrameView {
     
     def shareFiles = {
         def chooser = new JFileChooser()
-        chooser.setFileHidingEnabled(false)
+        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.setFileHidingEnabled(false)
-        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))
-        }
-    }
-    
-    String getSelectedWatchedDirectory() {
-        def watchedTable = builder.getVariable("watched-directories-table")
-        int selectedRow = watchedTable.getSelectedRow()
-        if (selectedRow < 0)
-            return null
-        if (lastWatchedSortEvent != null)
-            selectedRow = watchedTable.rowSorter.convertRowIndexToModel(selectedRow)
-        model.watched[selectedRow]
-    }
 }

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

@@ -9,8 +9,6 @@ import javax.swing.JPanel
 import javax.swing.JTabbedPane
 import javax.swing.SwingConstants
 
-import com.muwire.core.Core
-
 import java.awt.BorderLayout
 import java.awt.event.WindowAdapter
 import java.awt.event.WindowEvent
@@ -28,7 +26,6 @@ class OptionsView {
     def p
     def i
     def u
-    def bandwidth
     
     def retryField
     def updateField
@@ -48,10 +45,6 @@ class OptionsView {
     def excludeLocalResultCheckbox
     def showSearchHashesCheckbox
     
-    
-    def inBwField
-    def outBwField
-    
     def buttonsPanel    
     
     def mainFrame
@@ -76,10 +69,6 @@ class OptionsView {
             label(text : "Share downloaded files", constraints : gbc(gridx : 0, gridy:3))
             shareDownloadedCheckbox = checkBox(selected : bind {model.shareDownloadedFiles}, constraints : gbc(gridx :1, gridy:3))
                         
-            label(text : "Save downloaded files to:", constraints: gbc(gridx:0, gridy:4))
-            button(text : "Choose", constraints : gbc(gridx : 1, gridy:4), downloadLocationAction)
-            label(text : bind {model.downloadLocation}, constraints: gbc(gridx:0, gridy:5, gridwidth:2))
-                        
         }
         i = builder.panel {
             gridBagLayout()
@@ -100,27 +89,17 @@ class OptionsView {
             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))
+            label(text : "Show Monitor", constraints : gbc(gridx :0, gridy: 3))
-//            monitorCheckbox = checkBox(selected : bind {model.showMonitor}, constraints : gbc(gridx : 1, 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))
+            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))
+            showSearchHashesCheckbox = checkBox(selected : bind {model.showSearchHashes}, constraints : gbc(gridx: 1, gridy: 7))
         }
-        bandwidth = builder.panel {
-            gridBagLayout()
-            label(text : "Changing these settings requires a restart", constraints : gbc(gridx : 0, gridy : 0, gridwidth: 2))
-            label(text : "Inbound bandwidth (KB)", constraints : gbc(gridx: 0, gridy : 1))
-            inBwField = textField(text : bind {model.inBw}, columns : 3, constraints : gbc(gridx : 1, gridy : 1))
-            label(text : "Outbound bandwidth (KB)", constraints : gbc(gridx: 0, gridy : 2))
-            outBwField = textField(text : bind {model.outBw}, columns : 3, constraints : gbc(gridx : 1, gridy : 2))
-        }
-       
-        
         buttonsPanel = builder.panel {
             gridBagLayout()
             button(text : "Save", constraints : gbc(gridx : 1, gridy: 2), saveAction)
@@ -133,10 +112,6 @@ class OptionsView {
         tabbedPane.addTab("MuWire", p)
         tabbedPane.addTab("I2P", i)
         tabbedPane.addTab("GUI", u)
-        Core core = application.context.get("core")
-        if (core.router != null) {
-            tabbedPane.addTab("Bandwidth", bandwidth)
-        }
                 
         JPanel panel = new JPanel()
         panel.setLayout(new BorderLayout())

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

@@ -47,9 +47,8 @@ class SearchTabView {
                 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: 20, type: Long, read : {row -> row.size})
+                        closureColumn(header: "Size", preferredWidth: 50, type: Long, read : {row -> row.size})
-                        closureColumn(header: "Direct Sources", preferredWidth: 50, type : Integer, read : { row -> model.hashBucket[row.infohash].size()})
+                        closureColumn(header: "Sources", preferredWidth: 10, 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).toString()
@@ -67,13 +66,7 @@ class SearchTabView {
             def selectionModel = resultsTable.getSelectionModel()
             selectionModel.setSelectionMode(ListSelectionModel.SINGLE_SELECTION)
             selectionModel.addListSelectionListener( {
-                int row = resultsTable.getSelectedRow()
+                mvcGroup.parentGroup.model.searchButtonsEnabled = true
-                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)
             })
         }
     }
@@ -112,18 +105,25 @@ class SearchTabView {
         resultsTable.rowSorter.setSortsOnUpdates(true)
         
         
+        JPopupMenu menu = new JPopupMenu()
+        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)
         resultsTable.addMouseListener(new MouseAdapter() {
             @Override
             public void mouseClicked(MouseEvent e) {
                 if (e.button == MouseEvent.BUTTON3)
-                    showPopupMenu(e)
+                    showPopupMenu(menu, 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)
+                    showPopupMenu(menu, e)
             }
         })
     }
@@ -131,21 +131,12 @@ class SearchTabView {
     def closeTab = {
         int index = parent.indexOfTab(searchTerms)
         parent.removeTabAt(index)
-        mvcGroup.parentGroup.model.trustButtonsEnabled = false
+        mvcGroup.parentGroup.model.searchButtonsEnabled = false
-        mvcGroup.parentGroup.model.downloadActionEnabled = false
         mvcGroup.destroy()
     }
     
-    def showPopupMenu(MouseEvent e) {
+    def showPopupMenu(JPopupMenu menu, MouseEvent e) {
-        JPopupMenu menu = new JPopupMenu()
+        println "showing popup menu"
-        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())
     }
     

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

@@ -12,12 +12,12 @@ class UISettings {
     
     UISettings(Properties props) {
         lnf = props.getProperty("lnf", "system")
-        showMonitor = Boolean.parseBoolean(props.getProperty("showMonitor", "false"))
+        showMonitor = Boolean.parseBoolean(props.getProperty("showMonitor", "true"))
         font = props.getProperty("font",null)
-        clearCancelledDownloads = Boolean.parseBoolean(props.getProperty("clearCancelledDownloads","true"))
+        clearCancelledDownloads = Boolean.parseBoolean(props.getProperty("clearCancelledDownloads","false"))
         clearFinishedDownloads = Boolean.parseBoolean(props.getProperty("clearFinishedDownloads","false"))
-        excludeLocalResult = Boolean.parseBoolean(props.getProperty("excludeLocalResult","true"))
+        excludeLocalResult = Boolean.parseBoolean(props.getProperty("excludeLocalResult","false"))
-        showSearchHashes = Boolean.parseBoolean(props.getProperty("showSearchHashes","true"))
+        showSearchHashes = Boolean.parseBoolean(props.getProperty("showSearchHashes","false"))
     }
     
     void write(OutputStream out) throws IOException {

logging/1_logging.properties

@@ -1,61 +0,0 @@
-############################################################
-#  	Default Logging Configuration File
-#
-# You can use a different file by specifying a filename
-# with the java.util.logging.config.file system property.  
-# For example java -Djava.util.logging.config.file=myfile
-############################################################
-
-############################################################
-#  	Global properties
-############################################################
-
-# "handlers" specifies a comma separated list of log Handler 
-# classes.  These handlers will be installed during VM startup.
-# Note that these classes must be on the system classpath.
-# By default we only configure a ConsoleHandler, which will only
-# show messages at the INFO and above levels.
-handlers= java.util.logging.FileHandler
-
-# To also add the FileHandler, use the following line instead.
-#handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler
-
-# Default global logging level.
-# This specifies which kinds of events are logged across
-# all loggers.  For any given facility this global level
-# can be overriden by a facility specific level
-# Note that the ConsoleHandler also has a separate level
-# setting to limit messages printed to the console.
-.level= SEVERE
-
-############################################################
-# Handler specific properties.
-# Describes specific configuration info for Handlers.
-############################################################
-
-# default file output is in user's home directory.
-java.util.logging.FileHandler.pattern = MuWire.log
-java.util.logging.FileHandler.limit = 50000000
-java.util.logging.FileHandler.count = 1
-java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
-
-# Limit the message that are printed on the console to INFO and above.
-java.util.logging.ConsoleHandler.level = INFO
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-
-# Example to customize the SimpleFormatter output format 
-# to print one-line log message like this:
-#     <level>: <log message> [<date/time>]
-#
-#java.util.logging.SimpleFormatter.format=%4$s: %5$s [%1$tc]%n
-
-java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$s %2$s %5$s %6$s %n
-
-############################################################
-# Facility specific properties.
-# Provides extra control for each logger.
-############################################################
-
-# For example, set the com.xyz.foo logger to only log SEVERE
-# messages:
-com.xyz.foo.level = SEVERE

logging/2_logging.properties

@@ -1,61 +0,0 @@
-############################################################
-#  	Default Logging Configuration File
-#
-# You can use a different file by specifying a filename
-# with the java.util.logging.config.file system property.  
-# For example java -Djava.util.logging.config.file=myfile
-############################################################
-
-############################################################
-#  	Global properties
-############################################################
-
-# "handlers" specifies a comma separated list of log Handler 
-# classes.  These handlers will be installed during VM startup.
-# Note that these classes must be on the system classpath.
-# By default we only configure a ConsoleHandler, which will only
-# show messages at the INFO and above levels.
-handlers= java.util.logging.FileHandler
-
-# To also add the FileHandler, use the following line instead.
-#handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler
-
-# Default global logging level.
-# This specifies which kinds of events are logged across
-# all loggers.  For any given facility this global level
-# can be overriden by a facility specific level
-# Note that the ConsoleHandler also has a separate level
-# setting to limit messages printed to the console.
-.level= WARNING
-
-############################################################
-# Handler specific properties.
-# Describes specific configuration info for Handlers.
-############################################################
-
-# default file output is in user's home directory.
-java.util.logging.FileHandler.pattern = MuWire.log
-java.util.logging.FileHandler.limit = 50000000
-java.util.logging.FileHandler.count = 1
-java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
-
-# Limit the message that are printed on the console to INFO and above.
-java.util.logging.ConsoleHandler.level = INFO
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-
-# Example to customize the SimpleFormatter output format 
-# to print one-line log message like this:
-#     <level>: <log message> [<date/time>]
-#
-#java.util.logging.SimpleFormatter.format=%4$s: %5$s [%1$tc]%n
-
-java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$s %2$s %5$s %6$s %n
-
-############################################################
-# Facility specific properties.
-# Provides extra control for each logger.
-############################################################
-
-# For example, set the com.xyz.foo logger to only log SEVERE
-# messages:
-com.xyz.foo.level = SEVERE

logging/3_logging.properties

@@ -1,61 +0,0 @@
-############################################################
-#  	Default Logging Configuration File
-#
-# You can use a different file by specifying a filename
-# with the java.util.logging.config.file system property.  
-# For example java -Djava.util.logging.config.file=myfile
-############################################################
-
-############################################################
-#  	Global properties
-############################################################
-
-# "handlers" specifies a comma separated list of log Handler 
-# classes.  These handlers will be installed during VM startup.
-# Note that these classes must be on the system classpath.
-# By default we only configure a ConsoleHandler, which will only
-# show messages at the INFO and above levels.
-handlers= java.util.logging.FileHandler
-
-# To also add the FileHandler, use the following line instead.
-#handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler
-
-# Default global logging level.
-# This specifies which kinds of events are logged across
-# all loggers.  For any given facility this global level
-# can be overriden by a facility specific level
-# Note that the ConsoleHandler also has a separate level
-# setting to limit messages printed to the console.
-.level= INFO
-
-############################################################
-# Handler specific properties.
-# Describes specific configuration info for Handlers.
-############################################################
-
-# default file output is in user's home directory.
-java.util.logging.FileHandler.pattern = MuWire.log
-java.util.logging.FileHandler.limit = 50000000
-java.util.logging.FileHandler.count = 1
-java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
-
-# Limit the message that are printed on the console to INFO and above.
-java.util.logging.ConsoleHandler.level = INFO
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-
-# Example to customize the SimpleFormatter output format 
-# to print one-line log message like this:
-#     <level>: <log message> [<date/time>]
-#
-#java.util.logging.SimpleFormatter.format=%4$s: %5$s [%1$tc]%n
-
-java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$s %2$s %5$s %6$s %n
-
-############################################################
-# Facility specific properties.
-# Provides extra control for each logger.
-############################################################
-
-# For example, set the com.xyz.foo logger to only log SEVERE
-# messages:
-com.xyz.foo.level = SEVERE

logging/4_logging.properties

@@ -1,64 +0,0 @@
-############################################################
-#  	Default Logging Configuration File
-#
-# You can use a different file by specifying a filename
-# with the java.util.logging.config.file system property.  
-# For example java -Djava.util.logging.config.file=myfile
-############################################################
-
-############################################################
-#  	Global properties
-############################################################
-
-# "handlers" specifies a comma separated list of log Handler 
-# classes.  These handlers will be installed during VM startup.
-# Note that these classes must be on the system classpath.
-# By default we only configure a ConsoleHandler, which will only
-# show messages at the INFO and above levels.
-handlers= java.util.logging.FileHandler
-
-# To also add the FileHandler, use the following line instead.
-#handlers= java.util.logging.FileHandler, java.util.logging.ConsoleHandler
-
-# Default global logging level.
-# This specifies which kinds of events are logged across
-# all loggers.  For any given facility this global level
-# can be overriden by a facility specific level
-# Note that the ConsoleHandler also has a separate level
-# setting to limit messages printed to the console.
-.level= INFO 
-
-############################################################
-# Handler specific properties.
-# Describes specific configuration info for Handlers.
-############################################################
-
-# default file output is in user's home directory.
-java.util.logging.FileHandler.pattern = MuWire.log
-java.util.logging.FileHandler.limit = 150000000
-java.util.logging.FileHandler.count = 1
-java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
-
-# Limit the message that are printed on the console to INFO and above.
-java.util.logging.ConsoleHandler.level = INFO
-java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-
-# Example to customize the SimpleFormatter output format 
-# to print one-line log message like this:
-#     <level>: <log message> [<date/time>]
-#
-#java.util.logging.SimpleFormatter.format=%4$s: %5$s [%1$tc]%n
-
-java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$tL %4$s %2$s %5$s %6$s %n
-
-############################################################
-# Facility specific properties.
-# Provides extra control for each logger.
-############################################################
-
-# For example, set the com.xyz.foo logger to only log SEVERE
-# messages:
-com.xyz.foo.level = SEVERE
-com.muwire.core.level = FINE
-net.i2p.client.streaming.impl.level = FINE
-net.i2p.client.impl.level = FINE