bandwidth settings

README.md

@@ -4,7 +4,7 @@ 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.2.5 is avaiable for download at http://muwire.com.  You can find technical documentation in the "doc" folder.
+The current stable release - 0.4.0 is avaiable for download at https://muwire.com.  You can find technical documentation in the "doc" folder.
 
 ### Building
 

TODO.md

@@ -38,4 +38,3 @@ To enable parsing of metadata from known file types and the user editing it or a
 * Download file sequentially
 * Unsharing of files
 * Multiple-selection download, Ctrl-A
-* Pause/Resume downloads

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

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

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

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

core/build.gradle

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

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

@@ -27,6 +27,7 @@ import com.muwire.core.files.FileSharedEvent
 import com.muwire.core.files.FileUnsharedEvent
 import com.muwire.core.files.HasherService
 import com.muwire.core.files.PersisterService
+import com.muwire.core.files.AllFilesLoadedEvent
 import com.muwire.core.files.DirectoryWatcher
 import com.muwire.core.hostcache.CacheClient
 import com.muwire.core.hostcache.HostCache
@@ -58,6 +59,9 @@ 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 {
     
@@ -80,14 +84,31 @@ public class Core {
     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
-        log.info "Initializing I2P context"
+        
-        I2PAppContext.getGlobalContext().logManager()
+        if (!props.embeddedRouter) {
-        I2PAppContext.getGlobalContext()._logManager = new MuWireLogManager()
+            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))
+            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()
@@ -173,7 +194,7 @@ public class Core {
 		eventBus.register(SearchEvent.class, fileManager)
         
         log.info("initializing mesh manager")
-        MeshManager meshManager = new MeshManager(fileManager)
+        MeshManager meshManager = new MeshManager(fileManager, home, props)
         eventBus.register(SourceDiscoveredEvent.class, meshManager)
 		
 		log.info "initializing persistence service"
@@ -236,6 +257,7 @@ public class Core {
         log.info("initializing directory watcher")
         directoryWatcher = new DirectoryWatcher(eventBus, fileManager)
         eventBus.register(FileSharedEvent.class, directoryWatcher)
+        eventBus.register(AllFilesLoadedEvent.class, directoryWatcher)
         
         log.info("initializing hasher service")
         hasherService = new HasherService(new FileHasher(), eventBus, fileManager)
@@ -244,7 +266,6 @@ public class Core {
     
     public void startServices() {
         hasherService.start()
-        directoryWatcher.start()
         trustService.start()
         trustService.waitForLoad()
         hostCache.start()
@@ -271,8 +292,25 @@ public class Core {
         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) {
         def home = System.getProperty("user.home") + File.separator + ".MuWire"
         home = new File(home)
@@ -297,7 +335,7 @@ public class Core {
             }
         }
         
-        Core core = new Core(props, home, "0.3.6")
+        Core core = new Core(props, home, "0.4.0")
         core.startServices()
         
         // ... at the end, sleep or execute script

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

@@ -18,6 +18,11 @@ class MuWireSettings {
     CrawlerResponse crawlerResponse
     boolean shareDownloadedFiles
     Set<String> watchedDirectories
+    float downloadSequentialRatio
+    int hostClearInterval
+    int meshExpiration
+    boolean embeddedRouter
+    int inBw, outBw
     
 	MuWireSettings() {
         this(new Properties())
@@ -33,6 +38,12 @@ class MuWireSettings {
         downloadRetryInterval = Integer.parseInt(props.getProperty("downloadRetryInterval","1"))
         updateCheckInterval = Integer.parseInt(props.getProperty("updateCheckInterval","24"))
         shareDownloadedFiles = Boolean.parseBoolean(props.getProperty("shareDownloadedFiles","true"))
+        downloadSequentialRatio = Float.valueOf(props.getProperty("downloadSequentialRatio","0.8"))
+        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")) {
@@ -52,6 +63,12 @@ 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("hostClearInterval", String.valueOf(hostClearInterval))
+        props.setProperty("meshExpiration", String.valueOf(meshExpiration))
+        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().

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

@@ -75,7 +75,7 @@ class DownloadSession {
         if (available.isEmpty())
             piece = pieces.claim()
         else
-            piece = pieces.claim(available)
+            piece = pieces.claim(new HashSet<>(available))
         if (piece == -1)
             return false
         boolean unclaim = true

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

@@ -18,6 +18,7 @@ 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
@@ -269,7 +270,7 @@ public class Downloader {
                     writePieces()
                 }
             } catch (Exception bad) {
-                log.log(Level.WARNING,"Exception while downloading",bad)
+                log.log(Level.WARNING,"Exception while downloading",DataUtil.findRoot(bad))
             } finally {
                 currentState = WorkerState.FINISHED
                 if (pieces.isComplete() && eventFired.compareAndSet(false, true)) {

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

@@ -47,7 +47,7 @@ class DirectoryWatcher {
         publisherThread.setDaemon(true)
     }
     
-    void start() {
+    void onAllFilesLoadedEvent(AllFilesLoadedEvent e) {
         watchService = FileSystems.getDefault().newWatchService()
         watcherThread.start()
         publisherThread.start()
@@ -55,9 +55,9 @@ class DirectoryWatcher {
     
     void stop() {
         shutdown = true
-        watcherThread.interrupt()
+        watcherThread?.interrupt()
-        publisherThread.interrupt()
+        publisherThread?.interrupt()
-        watchService.close()
+        watchService?.close()
     }
     
     void onFileSharedEvent(FileSharedEvent e) {

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

@@ -7,4 +7,10 @@ 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/FileSharedEvent.groovy

@@ -5,4 +5,9 @@ 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/hostcache/Host.groovy

@@ -5,14 +5,15 @@ import net.i2p.data.Destination
 class Host {
 
 	private static final int MAX_FAILURES = 3
-    private static final int CLEAR_INTERVAL = 60 * 60 * 1000
 	
 	final Destination destination
+    private final int clearInterval
 	int failures,successes
     long lastAttempt
 	
-	public Host(Destination destination) {
+	public Host(Destination destination, int clearInterval) {
 		this.destination = destination
+        this.clearInterval = clearInterval
 	}
 
 	synchronized void onConnect() {
@@ -40,6 +41,6 @@ class Host {
     }
     
     synchronized void canTryAgain() {
-        System.currentTimeMillis() - lastAttempt > CLEAR_INTERVAL
+        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)
+		Host host = new Host(e.destination, settings.hostClearInterval)
 		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)
+			host = new Host(dest, settings.hostClearInterval)
 			hosts.put(dest, host)
 		}
 
@@ -106,7 +106,7 @@ class HostCache extends Service {
 			storage.eachLine {
 				def entry = slurper.parseText(it)
 				Destination dest = new Destination(entry.destination)
-				Host host = new Host(dest)
+				Host host = new Host(dest, settings.hostClearInterval)
 				host.failures = Integer.valueOf(String.valueOf(entry.failures))
 				host.successes = Integer.valueOf(String.valueOf(entry.successes))
                 if (entry.lastAttempt != null)

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

@@ -1,18 +1,32 @@
 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) {
+    MeshManager(FileManager fileManager, File home, MuWireSettings settings) {
         this.fileManager = fileManager
+        this.home = home
+        this.settings = settings
+        load()
     }
     
     Mesh get(InfoHash infoHash) {
@@ -23,7 +37,7 @@ class MeshManager {
         synchronized(meshes) {
             if (meshes.containsKey(infoHash))
                 return meshes.get(infoHash)
-            Pieces pieces = new Pieces(nPieces, Constants.DOWNLOAD_SEQUENTIAL_RATIO)
+            Pieces pieces = new Pieces(nPieces, settings.downloadSequentialRatio)
             if (fileManager.rootToFiles.containsKey(infoHash)) {
                 for (int i = 0; i < nPieces; i++)
                     pieces.markDownloaded(i)
@@ -38,6 +52,51 @@ class MeshManager {
         Mesh mesh = meshes.get(e.infoHash)
         if (mesh == null)
             return
-        mesh.sources.add(e.source)
+       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/upload/ContentRequest.groovy

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

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

@@ -105,4 +105,14 @@ class ContentUploader extends Uploader {
         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

@@ -50,6 +50,16 @@ class HashListUploader extends Uploader {
     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

@@ -50,10 +50,10 @@ class Request {
             downloader = new Persona(new ByteArrayInputStream(decoded))
         }
         
-        boolean have = false
+        int have = 0
         if (headers.containsKey("X-Have")) {
             def encoded = headers["X-Have"].trim()
-            have = DataUtil.decodeXHave(encoded).size() > 0
+            have = DataUtil.decodeXHave(encoded).size()
         }
         new ContentRequest( infoHash : infoHash, range : new Range(start, end), 
             headers : headers, downloader : downloader, have : have)

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

@@ -80,7 +80,7 @@ public class UploadManager {
                 return
             }
             
-            if (request.have) 
+            if (request.have > 0) 
                 eventBus.publish(new SourceDiscoveredEvent(infoHash : request.infoHash, source : request.downloader))
             
             Mesh mesh
@@ -205,7 +205,7 @@ public class UploadManager {
                 return
             }
             
-            if (request.have)
+            if (request.have > 0)
                 eventBus.publish(new SourceDiscoveredEvent(infoHash : request.infoHash, source : request.downloader))
             
             Mesh mesh

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

@@ -32,4 +32,8 @@ abstract class Uploader {
     abstract int getProgress();
     
     abstract String getDownloader();
+    
+    abstract int getDonePieces();
+    
+    abstract int getTotalPieces()
 }

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

@@ -109,4 +109,10 @@ class DataUtil {
         }
         available
     }
+    
+    public static Exception findRoot(Exception e) {
+        while(e.getCause() != null)
+            e = e.getCause()
+        e
+    }
 }

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

@@ -30,7 +30,7 @@ public class SharedFile {
 	    long length = file.length();
 	    int rawPieceSize = 0x1 << pieceSize;
 	    int rv = (int) (length / rawPieceSize);
-	    if (length % pieceSize != 0)
+	    if (length % rawPieceSize != 0)
 	        rv++;
 	    return rv;
 	}

gradle.properties

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

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

@@ -44,6 +44,8 @@ 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

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

@@ -4,9 +4,15 @@ 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 {
@@ -46,7 +52,7 @@ class OptionsController {
         text = view.retryField.text
         model.downloadRetryInterval = text
 
-        def settings = application.context.get("muwire-settings")
+        MuWireSettings settings = application.context.get("muwire-settings")
         settings.downloadRetryInterval = Integer.valueOf(text)
 
         text = view.updateField.text
@@ -60,7 +66,19 @@ class OptionsController {
         boolean shareDownloaded = view.shareDownloadedCheckbox.model.isSelected()
         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)
@@ -110,4 +128,15 @@ 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,6 +43,8 @@ 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

@@ -74,6 +74,7 @@ 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)

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

@@ -17,6 +17,7 @@ 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
@@ -139,6 +140,7 @@ class MainFrameModel {
             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())
@@ -167,9 +169,6 @@ class MainFrameModel {
                 trusted.addAll(core.trustService.good.values())
                 distrusted.addAll(core.trustService.bad.values())
                 
-                watched.addAll(core.muOptions.watchedDirectories)
-                builder.getVariable("watched-directories-table").model.fireTableDataChanged()
-                watched.each { core.eventBus.publish(new FileSharedEvent(file : new File(it))) }
                 
                 resumeButtonText = "Retry"
             }
@@ -177,6 +176,13 @@ class MainFrameModel {
         
     }
     
+    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)

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

@@ -13,6 +13,7 @@ class OptionsModel {
     @Observable String updateCheckInterval
     @Observable boolean onlyTrusted
     @Observable boolean shareDownloadedFiles
+    @Observable String downloadLocation
     
     // i2p options
     @Observable String inboundLength
@@ -29,12 +30,17 @@ 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"]
@@ -50,5 +56,10 @@ 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/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('/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],
                  visible: bind { !model.coreInitialized} ) {
                 panel {
                     vbox {

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

@@ -60,10 +60,10 @@ class MainFrameView {
             locationRelativeTo : null,
             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 {
@@ -185,11 +185,14 @@ class MainFrameView {
                                         closureColumn(header : "Name", type : String, read : {row -> row.getName() })
                                         closureColumn(header : "Progress", type : String, read : { row ->
                                             int percent = row.getProgress()
-                                            "$percent%"
+                                            "$percent% of piece".toString()
                                         })
                                         closureColumn(header : "Downloader", type : String, read : { row -> 
                                             row.getDownloader()
                                         })
+                                        closureColumn(header : "Remote Pieces", type : String, read : { row ->
+                                            "${row.getDonePieces()}/${row.getTotalPieces()}".toString()
+                                        })
                                     }
                                 }
                             }
@@ -516,6 +519,7 @@ class MainFrameView {
     
     def shareFiles = {
         def chooser = new JFileChooser()
+        chooser.setFileHidingEnabled(false)
         chooser.setDialogTitle("Select file to share")
         chooser.setFileSelectionMode(JFileChooser.FILES_ONLY)
         int rv = chooser.showOpenDialog(null)
@@ -526,6 +530,7 @@ class MainFrameView {
     
     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)

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

@@ -9,6 +9,8 @@ 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
@@ -26,6 +28,7 @@ class OptionsView {
     def p
     def i
     def u
+    def bandwidth
     
     def retryField
     def updateField
@@ -45,6 +48,10 @@ class OptionsView {
     def excludeLocalResultCheckbox
     def showSearchHashesCheckbox
     
+    
+    def inBwField
+    def outBwField
+    
     def buttonsPanel    
     
     def mainFrame
@@ -68,6 +75,10 @@ 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 {
@@ -100,6 +111,16 @@ class OptionsView {
 //            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))
         }
+        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)
@@ -112,6 +133,10 @@ 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())

logging/4_logging.properties

@@ -26,7 +26,7 @@ handlers= java.util.logging.FileHandler
 # 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
+.level= INFO 
 
 ############################################################
 # Handler specific properties.
@@ -35,7 +35,7 @@ handlers= java.util.logging.FileHandler
 
 # 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.limit = 150000000
 java.util.logging.FileHandler.count = 1
 java.util.logging.FileHandler.formatter = java.util.logging.SimpleFormatter
 
@@ -60,3 +60,5 @@ java.util.logging.SimpleFormatter.format=%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%1$
 # messages:
 com.xyz.foo.level = SEVERE
 com.muwire.core.level = FINE
+net.i2p.client.streaming.impl.level = FINE
+net.i2p.client.impl.level = FINE