Release 0.4.7

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.4.0 is avaiable for download at https://muwire.com.  You can find technical documentation in the "doc" folder.
+The current stable release - 0.4.6 is avaiable for download at https://muwire.com.  You can find technical documentation in the "doc" folder.
 
 ### Building
 
@@ -23,34 +23,9 @@ 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.
+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.  
 
-The first time you run MuWire it will ask you to select a nickname.  This nickname will be displayed with search results, so that others can verify the file was shared by you.  It is best to leave MuWire running all the time, just like I2P.
+If you have an I2P router running on the same machine that is all you need to do.  If you use a custom I2CP host and port, create a file `$HOME/.MuWire/i2p.properties` and put `i2cp.tcp.host=<host>` and `i2cp.tcp.port=<port>` in there.
 
+If you do not have an I2P router, pass the following switch to the Java process: `-DembeddedRouter=true`.  This will launch MuWire's embedded router.  Be aware that this causes startup to take a lot longer.
 
-### 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

@@ -12,10 +12,6 @@ This reduces query traffic by not sending last hop queries to peers that definit
 
 This helps with scalability
 
-##### Trust List Sharing
-
-For helping users make better decisions whom to trust
-
 ##### Content Control Panel
 
 To allow every user to not route queries for content they do not like.  This is mostly GUI work, the backend part is simple

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

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

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

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

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

@@ -318,6 +318,8 @@ public class Core {
         connectionEstablisher.stop()
         log.info("shutting down directory watcher")
         directoryWatcher.stop()
+        log.info("shutting down cache client")
+        cacheClient.stop()
         log.info("shutting down connection manager")
         connectionManager.shutdown()
         if (router != null) {
@@ -363,7 +365,7 @@ public class Core {
             }
         }
         
-        Core core = new Core(props, home, "0.4.4")
+        Core core = new Core(props, home, "0.4.7")
         core.startServices()
         
         // ... at the end, sleep or execute script

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

@@ -80,7 +80,7 @@ class MuWireSettings {
         props.setProperty("downloadRetryInterval", String.valueOf(downloadRetryInterval))
         props.setProperty("updateCheckInterval", String.valueOf(updateCheckInterval))
         props.setProperty("autoDownloadUpdate", String.valueOf(autoDownloadUpdate))
-        props.setProperty("updateType",updateType)
+        props.setProperty("updateType",String.valueOf(updateType))
         props.setProperty("shareDownloadedFiles", String.valueOf(shareDownloadedFiles))
         props.setProperty("downloadSequentialRatio", String.valueOf(downloadSequentialRatio))
         props.setProperty("hostClearInterval", String.valueOf(hostClearInterval))

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

@@ -25,8 +25,6 @@ import java.util.logging.Level
 @Log
 class DownloadSession {
     
-    private static int SAMPLES = 10
-    
     private final EventBus eventBus
     private final String meB64
     private final Pieces pieces
@@ -37,9 +35,9 @@ class DownloadSession {
     private final long fileLength
     private final Set<Integer> available
     private final MessageDigest digest
-    
-    private final LinkedList<Long> timestamps = new LinkedList<>()
-    private final LinkedList<Integer> reads = new LinkedList<>()
+
+    private long lastSpeedRead = System.currentTimeMillis()
+    private long dataSinceLastRead    
     
     private ByteBuffer mapped
     
@@ -186,13 +184,7 @@ class DownloadSession {
                         throw new IOException()
                     synchronized(this) {
                         mapped.put(tmp, 0, read)
-
-                        if (timestamps.size() == SAMPLES) {
-                            timestamps.removeFirst()
-                            reads.removeFirst()
-                        }
-                        timestamps.addLast(System.currentTimeMillis())
-                        reads.addLast(read)
+                        dataSinceLastRead += read
                     }
                 }
 
@@ -223,24 +215,11 @@ class DownloadSession {
     }
     
     synchronized int speed() {
-        if (timestamps.size() < SAMPLES)
-            return 0
-        int totalRead = 0
-        int idx = 0
         final long now = System.currentTimeMillis()
-        
-        while(idx < SAMPLES && timestamps.get(idx) < now - 1000)
-            idx++
-        if (idx == SAMPLES)
-            return 0
-        if (idx == SAMPLES - 1)
-            return reads[idx]
-            
-        long interval = timestamps.last - timestamps[idx]
-        if (interval == 0) 
-            interval = 1
-        for (int i = idx; i < SAMPLES; i++)
-            totalRead += reads[idx]
-        (int)(totalRead * 1000.0 / interval)
+        long interval = Math.max(1000, now - lastSpeedRead)
+        lastSpeedRead = now;
+        int rv = (int) (dataSinceLastRead * 1000.0 / interval)
+        dataSinceLastRead = 0
+        rv
     }
 }

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

@@ -7,6 +7,7 @@ import com.muwire.core.connection.Endpoint
 import java.nio.file.AtomicMoveNotSupportedException
 import java.nio.file.Files
 import java.nio.file.StandardCopyOption
+import java.time.Instant
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
@@ -58,6 +59,11 @@ public class Downloader {
     private final AtomicBoolean eventFired = new AtomicBoolean()
     private boolean piecesFileClosed
 
+    private ArrayList speedArr = new ArrayList<Integer>()
+    private int speedPos = 0
+    private int speedAvg = 0
+    private long timestamp = Instant.now().toEpochMilli()
+
     public Downloader(EventBus eventBus, DownloadManager downloadManager, 
         Persona me, File file, long length, InfoHash infoHash, 
         int pieceSizePow2, I2PConnector connector, Set<Destination> destinations,
@@ -76,6 +82,10 @@ public class Downloader {
         this.pieceSize = 1 << pieceSizePow2
         this.pieces = pieces
         this.nPieces = pieces.nPieces
+
+        // default size suitable for an average of 5 seconds / 5 elements / 5 interval units
+        // it's easily adjustable by resizing the size of speedArr
+        this.speedArr = [ 0, 0, 0, 0, 0 ]
     }
     
     public synchronized InfoHash getInfoHash() {
@@ -124,14 +134,35 @@ public class Downloader {
     
     
     public int speed() {
-        int total = 0
+        int currSpeed = 0
         if (getCurrentState() == DownloadState.DOWNLOADING) {
             activeWorkers.values().each {
                 if (it.currentState == WorkerState.DOWNLOADING)
-                    total += it.speed()
+                    currSpeed += it.speed()
             }
         }
-        total
+
+        // normalize to speedArr.size
+        currSpeed /= speedArr.size()
+
+        // compute new speedAvg and update speedArr
+        if ( speedArr[speedPos] > speedAvg ) {
+            speedAvg = 0
+        } else {
+            speedAvg -= speedArr[speedPos]
+        }
+        speedAvg += currSpeed
+        speedArr[speedPos] = currSpeed
+        // this might be necessary due to rounding errors
+        if (speedAvg < 0)
+            speedAvg = 0
+
+        // rolling index over the speedArr
+        speedPos++
+        if (speedPos >= speedArr.size())
+            speedPos=0
+
+        speedAvg
     }
     
     public DownloadState getCurrentState() {

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

@@ -6,7 +6,8 @@ class CacheServers {
 
 	private static final int TO_GIVE = 3
 	private static Set<Destination> CACHES = [
-			new Destination("Wddh2E6FyyXBF7SvUYHKdN-vjf3~N6uqQWNeBDTM0P33YjiQCOsyedrjmDZmWFrXUJfJLWnCb5bnKezfk4uDaMyj~uvDG~yvLVcFgcPWSUd7BfGgym-zqcG1q1DcM8vfun-US7YamBlmtC6MZ2j-~Igqzmgshita8aLPCfNAA6S6e2UMjjtG7QIXlxpMec75dkHdJlVWbzrk9z8Qgru3YIk0UztYgEwDNBbm9wInsbHhr3HtAfa02QcgRVqRN2PnQXuqUJs7R7~09FZPEviiIcUpkY3FeyLlX1sgQFBeGeA96blaPvZNGd6KnNdgfLgMebx5SSxC-N4KZMSMBz5cgonQF3~m2HHFRSI85zqZNG5X9bJN85t80ltiv1W1es8ZnQW4es11r7MrvJNXz5bmSH641yJIvS6qI8OJJNpFVBIQSXLD-96TayrLQPaYw~uNZ-eXaE6G5dYhiuN8xHsFI1QkdaUaVZnvDGfsRbpS5GtpUbBDbyLkdPurG0i7dN1wAAAA")
+			new Destination("Wddh2E6FyyXBF7SvUYHKdN-vjf3~N6uqQWNeBDTM0P33YjiQCOsyedrjmDZmWFrXUJfJLWnCb5bnKezfk4uDaMyj~uvDG~yvLVcFgcPWSUd7BfGgym-zqcG1q1DcM8vfun-US7YamBlmtC6MZ2j-~Igqzmgshita8aLPCfNAA6S6e2UMjjtG7QIXlxpMec75dkHdJlVWbzrk9z8Qgru3YIk0UztYgEwDNBbm9wInsbHhr3HtAfa02QcgRVqRN2PnQXuqUJs7R7~09FZPEviiIcUpkY3FeyLlX1sgQFBeGeA96blaPvZNGd6KnNdgfLgMebx5SSxC-N4KZMSMBz5cgonQF3~m2HHFRSI85zqZNG5X9bJN85t80ltiv1W1es8ZnQW4es11r7MrvJNXz5bmSH641yJIvS6qI8OJJNpFVBIQSXLD-96TayrLQPaYw~uNZ-eXaE6G5dYhiuN8xHsFI1QkdaUaVZnvDGfsRbpS5GtpUbBDbyLkdPurG0i7dN1wAAAA"),
+            new Destination("JC63wJNOqSJmymkj4~UJWywBTvDGikKMoYP0HX2Wz9c5l3otXSkwnxWAFL4cKr~Ygh3BNNi2t93vuLIiI1W8AsE42kR~PwRx~Y-WvIHXR6KUejRmOp-n8WidtjKg9k4aDy428uSOedqXDxys5mpoeQXwDsv1CoPTTwnmb1GWFy~oTGIsCguCl~aJWGnqiKarPO3GJQ~ev-NbvAQzUfC3HeP1e6pdI5CGGjExahTCID5UjpJw8GaDXWlGmYWWH303Xu4x-vAHQy1dJLsOBCn8dZravsn5BKJk~j0POUon45CCx-~NYtaPe0Itt9cMdD2ciC76Rep1D0X0sm1SjlSs8sZ52KmF3oaLZ6OzgI9QLMIyBUrfi41sK5I0qTuUVBAkvW1xr~L-20dYJ9TrbOaOb2-vDIfKaxVi6xQOuhgQDiSBhd3qv2m0xGu-BM9DQYfNA0FdMjnZmqjmji9RMavzQSsVFIbQGLbrLepiEFlb7TseCK5UtRp8TxnG7L4gbYevBQAEAAcAAA==")
 		]
 
 	static List<Destination> getCacheServers() {

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

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

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

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

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

@@ -119,4 +119,8 @@ class ContentUploader extends Uploader {
         return mesh.pieces.nPieces;
     }
 
+    @Override
+    public long getTotalSize() {
+        return file.length();
+    }
 }

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

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

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

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

gradle.properties

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

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

@@ -191,27 +191,38 @@ class MainFrameController {
         int row = view.getSelectedTrustTablesRow(tableName)
         if (row < 0)
             return
+        builder.getVariable(tableName).model.fireTableDataChanged()
         core.eventBus.publish(new TrustEvent(persona : list[row], level : level))
     }
     
     @ControllerAction
     void markTrusted() {
         markTrust("distrusted-table", TrustLevel.TRUSTED, model.distrusted)
+        model.markTrustedButtonEnabled = false
+        model.markNeutralFromDistrustedButtonEnabled = false
     }
     
     @ControllerAction
     void markNeutralFromDistrusted() {
         markTrust("distrusted-table", TrustLevel.NEUTRAL, model.distrusted)
+        model.markTrustedButtonEnabled = false
+        model.markNeutralFromDistrustedButtonEnabled = false
     }
     
     @ControllerAction
     void markDistrusted() {
         markTrust("trusted-table", TrustLevel.DISTRUSTED, model.trusted)
+        model.subscribeButtonEnabled = false
+        model.markDistrustedButtonEnabled = false
+        model.markNeutralFromTrustedButtonEnabled = false
     }
     
     @ControllerAction
     void markNeutralFromTrusted() {
         markTrust("trusted-table", TrustLevel.NEUTRAL, model.trusted)
+        model.subscribeButtonEnabled = false
+        model.markDistrustedButtonEnabled = false
+        model.markNeutralFromTrustedButtonEnabled = false
     }
     
     @ControllerAction
@@ -223,6 +234,9 @@ class MainFrameController {
         core.muOptions.trustSubscriptions.add(p)
         saveMuWireSettings()
         core.eventBus.publish(new TrustSubscriptionEvent(persona : p, subscribe : true))
+        model.subscribeButtonEnabled = false
+        model.markDistrustedButtonEnabled = false
+        model.markNeutralFromTrustedButtonEnabled = false
     }
     
     @ControllerAction

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

@@ -27,6 +27,7 @@ class TrustListController {
             return
         Persona p = model.trusted[selectedRow]
         eventBus.publish(new TrustEvent(persona : p, level : TrustLevel.TRUSTED))
+        view.fireUpdate("trusted-table")
     }
     
     @ControllerAction
@@ -36,6 +37,7 @@ class TrustListController {
             return
         Persona p = model.distrusted[selectedRow]
         eventBus.publish(new TrustEvent(persona : p, level : TrustLevel.TRUSTED))
+        view.fireUpdate("distrusted-table")
     }
     
     @ControllerAction
@@ -45,6 +47,7 @@ class TrustListController {
             return
         Persona p = model.trusted[selectedRow]
         eventBus.publish(new TrustEvent(persona : p, level : TrustLevel.DISTRUSTED))
+        view.fireUpdate("trusted-table")
     }
     
     @ControllerAction
@@ -54,5 +57,6 @@ class TrustListController {
             return
         Persona p = model.distrusted[selectedRow]
         eventBus.publish(new TrustEvent(persona : p, level : TrustLevel.DISTRUSTED))
+        view.fireUpdate("distrusted-table")
     }
 }

gui/griffon-app/lifecycle/Ready.groovy

@@ -49,7 +49,7 @@ class Ready extends AbstractLifecycleHandler {
             log.info("creating new properties")
             props = new MuWireSettings()
             props.embeddedRouter = Boolean.parseBoolean(System.getProperties().getProperty("embeddedRouter"))
-            props.updateType = System.getProperty("updateType")
+            props.updateType = System.getProperty("updateType","jar")
             def nickname
             while (true) {
                 nickname = JOptionPane.showInputDialog(null,

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

@@ -76,6 +76,11 @@ class MainFrameModel {
     @Observable boolean retryButtonEnabled
     @Observable boolean pauseButtonEnabled
     @Observable String resumeButtonText
+    @Observable boolean subscribeButtonEnabled
+    @Observable boolean markNeutralFromTrustedButtonEnabled
+    @Observable boolean markDistrustedButtonEnabled
+    @Observable boolean markNeutralFromDistrustedButtonEnabled
+    @Observable boolean markTrustedButtonEnabled
     @Observable boolean reviewButtonEnabled
     @Observable boolean updateButtonEnabled
     @Observable boolean unsubscribeButtonEnabled

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

@@ -44,7 +44,7 @@ class I2PStatusView {
             label(text : "Participating Tunnels", constraints : gbc(gridx:0, gridy:4))
             label(text : bind {model.participatingTunnels}, constraints : gbc(gridx: 1, gridy:4))
             label(text : "Participating Bandwidth", constraints : gbc(gridx:0, gridy:5))
-            label(text : bind {model.participatingBW}, constraints : gbc(gridx: 1, gridy:6))
+            label(text : bind {model.participatingBW}, constraints : gbc(gridx: 1, gridy:5))
             label(text : "Active Peers", constraints : gbc(gridx:0, gridy:6))
             label(text : bind {model.activePeers}, constraints : gbc(gridx: 1, gridy:6))
             label(text : "Receive Bps (15 seconds)", constraints : gbc(gridx:0, gridy:7))
@@ -77,4 +77,4 @@ class I2PStatusView {
         })
         dialog.show()
     }
-}
+}

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

@@ -129,12 +129,19 @@ class MainFrameView {
                                 scrollPane (constraints : BorderLayout.CENTER) {
                                     downloadsTable = table(id : "downloads-table", autoCreateRowSorter : true) {
                                         tableModel(list: model.downloads) {
-                                            closureColumn(header: "Name", preferredWidth: 350, type: String, read : {row -> row.downloader.file.getName()})
+                                            closureColumn(header: "Name", preferredWidth: 300, type: String, read : {row -> row.downloader.file.getName()})
                                             closureColumn(header: "Status", preferredWidth: 50, type: String, read : {row -> row.downloader.getCurrentState().toString()})
-                                            closureColumn(header: "Progress", preferredWidth: 20, type: String, read: { row ->
+                                            closureColumn(header: "Progress", preferredWidth: 70, type: String, read: { row ->
                                                 int pieces = row.downloader.nPieces
                                                 int done = row.downloader.donePieces()
-                                                "$done/$pieces pieces".toString()
+                                                int percent = -1
+                                                if ( row.downloader.nPieces != 0 ) {
+                                                    percent = (done * 100) / pieces
+                                                }
+                                                long size = row.downloader.pieceSize
+                                                size *= pieces
+                                                String totalSize = DataHelper.formatSize2Decimal(size, false) + "B"
+                                                "${percent}% of " + totalSize + " ($done/$pieces pcs)"
                                             })
                                             closureColumn(header: "Sources", preferredWidth : 10, type: Integer, read : {row -> row.downloader.activeWorkers()})
                                             closureColumn(header: "Speed", preferredWidth: 50, type:String, read :{row -> 
@@ -200,7 +207,18 @@ class MainFrameView {
                                             row.getDownloader()
                                         })
                                         closureColumn(header : "Remote Pieces", type : String, read : { row ->
-                                            "${row.getDonePieces()}/${row.getTotalPieces()}".toString()
+                                            int pieces = row.getTotalPieces()
+                                            int done = row.getDonePieces()
+                                            int percent = -1
+                                            if ( pieces != 0 ) {
+                                                percent = (done * 100) / pieces
+                                            }
+                                            long size = row.getTotalSize()
+                                            String totalSize = ""
+                                            if (size >= 0 ) {
+                                                totalSize = " of " + DataHelper.formatSize2Decimal(size, false) + "B"
+                                            }
+                                            "${percent}%" + totalSize + " ($done/$pieces pcs)"
                                         })
                                     }
                                 }
@@ -265,11 +283,11 @@ class MainFrameView {
                                         }
                                     }
                                 }
-                                panel (constraints : BorderLayout.EAST) {
+                                panel (constraints : BorderLayout.SOUTH) {
                                     gridBagLayout()
-                                    button(text : "Mark Neutral", constraints : gbc(gridx: 0, gridy: 0), markNeutralFromTrustedAction)
-                                    button(text : "Mark Distrusted", constraints : gbc(gridx: 0, gridy:1), markDistrustedAction)
-                                    button(text : "Subscribe", constraints : gbc(gridx: 0, gridy : 2), subscribeAction)
+                                    button(text : "Subscribe", enabled : bind {model.subscribeButtonEnabled}, constraints : gbc(gridx: 0, gridy : 0), subscribeAction)
+                                    button(text : "Mark Neutral", enabled : bind {model.markNeutralFromTrustedButtonEnabled}, constraints : gbc(gridx: 1, gridy: 0), markNeutralFromTrustedAction)
+                                    button(text : "Mark Distrusted", enabled : bind {model.markDistrustedButtonEnabled}, constraints : gbc(gridx: 2, gridy:0), markDistrustedAction)
                                 }
                             }
                             panel (border : etchedBorder()){
@@ -281,10 +299,10 @@ class MainFrameView {
                                         }
                                     }
                                 }
-                                panel(constraints : BorderLayout.WEST) {
+                                panel(constraints : BorderLayout.SOUTH) {
                                     gridBagLayout()
-                                    button(text: "Mark Neutral", constraints: gbc(gridx: 0, gridy: 0), markNeutralFromDistrustedAction)
-                                    button(text: "Mark Trusted", constraints : gbc(gridx: 0, gridy : 1), markTrustedAction)
+                                    button(text: "Mark Neutral", enabled : bind {model.markNeutralFromDistrustedButtonEnabled}, constraints: gbc(gridx: 0, gridy: 0), markNeutralFromDistrustedAction)
+                                    button(text: "Mark Trusted", enabled : bind {model.markTrustedButtonEnabled}, constraints : gbc(gridx: 1, gridy : 0), markTrustedAction)
                                 }
                             }
                         }
@@ -296,11 +314,11 @@ class MainFrameView {
                             scrollPane(constraints : BorderLayout.CENTER) {
                                 table(id : "subscription-table", autoCreateRowSorter : true) {
                                     tableModel(list : model.subscriptions) {
-                                        closureColumn(header : "Name", type: String, read : {it.persona.getHumanReadableName()})
-                                        closureColumn(header : "Trusted", type: Integer, read : {it.good.size()})
-                                        closureColumn(header : "Distrusted", type: Integer, read : {it.bad.size()})
-                                        closureColumn(header : "Status", type: String, read : {it.status.toString()})
-                                        closureColumn(header : "Last Updated", type : String, read : {
+                                        closureColumn(header : "Name", preferredWidth: 200, type: String, read : {it.persona.getHumanReadableName()})
+                                        closureColumn(header : "Trusted", preferredWidth : 20, type: Integer, read : {it.good.size()})
+                                        closureColumn(header : "Distrusted", preferredWidth: 20, type: Integer, read : {it.bad.size()})
+                                        closureColumn(header : "Status", preferredWidth: 30, type: String, read : {it.status.toString()})
+                                        closureColumn(header : "Last Updated", preferredWidth: 200, type : String, read : {
                                             if (it.timestamp == 0)
                                                 return "Never"
                                             else
@@ -461,6 +479,7 @@ class MainFrameView {
         
         // subscription table
         def subscriptionTable = builder.getVariable("subscription-table")
+        subscriptionTable.setDefaultRenderer(Integer.class, centerRenderer)
         subscriptionTable.rowSorter.addRowSorterListener({evt -> trustTablesSortEvents["subscription-table"] = evt})
         subscriptionTable.rowSorter.setSortsOnUpdates(true)
         selectionModel = subscriptionTable.getSelectionModel()
@@ -488,6 +507,11 @@ class MainFrameView {
                 model.updateButtonEnabled = true
                 model.unsubscribeButtonEnabled = true
                 break
+                case RemoteTrustList.Status.UPDATE_FAILED:
+                model.reviewButtonEnabled = false
+                model.updateButtonEnabled = true
+                model.unsubscribeButtonEnabled = true
+                break
             }
         })
                 
@@ -495,11 +519,37 @@ class MainFrameView {
         def trustedTable = builder.getVariable("trusted-table")
         trustedTable.rowSorter.addRowSorterListener({evt -> trustTablesSortEvents["trusted-table"] = evt})
         trustedTable.rowSorter.setSortsOnUpdates(true)
+        selectionModel = trustedTable.getSelectionModel()
+        selectionModel.setSelectionMode(ListSelectionModel.SINGLE_SELECTION)
+        selectionModel.addListSelectionListener({
+            int selectedRow = getSelectedTrustTablesRow("trusted-table")
+            if (selectedRow < 0) {
+                model.subscribeButtonEnabled = false
+                model.markDistrustedButtonEnabled = false
+                model.markNeutralFromTrustedButtonEnabled = false
+            } else {
+                model.subscribeButtonEnabled = true
+                model.markDistrustedButtonEnabled = true
+                model.markNeutralFromTrustedButtonEnabled = true
+            }
+        })
         
         // distrusted table
         def distrustedTable = builder.getVariable("distrusted-table")
         distrustedTable.rowSorter.addRowSorterListener({evt -> trustTablesSortEvents["distrusted-table"] = evt})
         distrustedTable.rowSorter.setSortsOnUpdates(true)
+        selectionModel = distrustedTable.getSelectionModel()
+        selectionModel.setSelectionMode(ListSelectionModel.SINGLE_SELECTION)
+        selectionModel.addListSelectionListener({
+            int selectedRow = getSelectedTrustTablesRow("distrusted-table")
+            if (selectedRow < 0) {
+                model.markTrustedButtonEnabled = false
+                model.markNeutralFromDistrustedButtonEnabled = false
+            } else {
+                model.markTrustedButtonEnabled = true
+                model.markNeutralFromDistrustedButtonEnabled = true
+            }
+        })
     }
     
     private static void showPopupMenu(JPopupMenu menu, MouseEvent event) {

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

@@ -83,10 +83,12 @@ class TrustListView {
         
         def trustedTable = builder.getVariable("trusted-table")
         trustedTable.rowSorter.addRowSorterListener({evt -> sortEvents["trusted-table"] = evt})
+        trustedTable.rowSorter.setSortsOnUpdates(true)
         trustedTable.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION)
         
         def distrustedTable = builder.getVariable("distrusted-table")
         distrustedTable.rowSorter.addRowSorterListener({evt -> sortEvents["distrusted-table"] = evt})
+        distrustedTable.rowSorter.setSortsOnUpdates(true)
         distrustedTable.getSelectionModel().setSelectionMode(ListSelectionModel.SINGLE_SELECTION)
         
         dialog.getContentPane().add(mainPanel)
@@ -110,4 +112,9 @@ class TrustListView {
             selectedRow = table.rowSorter.convertRowIndexToModel(selectedRow)
         selectedRow
     }
+    
+    void fireUpdate(String tableName) {
+        def table = builder.getVariable(tableName)
+        table.model.fireTableDataChanged()
+    }
 }

host-cache/src/main/groovy/com/muwire/hostcache/HostCache.groovy

@@ -11,6 +11,7 @@ import net.i2p.client.I2PSession
 import net.i2p.client.I2PSessionMuxedListener
 import net.i2p.client.datagram.I2PDatagramDissector
 import net.i2p.client.datagram.I2PDatagramMaker
+import net.i2p.crypto.SigType
 import net.i2p.util.SystemVersion
 import net.i2p.data.*
 
@@ -43,7 +44,7 @@ public class HostCache {
         def session
         if (!keyfile.exists()) {
             def os = new FileOutputStream(keyfile);
-            myDest = i2pClient.createDestination(os)
+            myDest = i2pClient.createDestination(os, SigType.EdDSA_SHA512_Ed25519)
             os.close()
             println "No key.dat file was found, so creating a new destination."
             println "This is the destination you want to give out for your new HostCache"
@@ -63,6 +64,9 @@ public class HostCache {
 		Timer timer = new Timer("timer", true)
 		timer.schedule({hostPool.age()} as TimerTask, 1000,1000)
 		timer.schedule({crawler.startCrawl()} as TimerTask, 10000, 10000)
+        File verified = new File("verified.json")
+        File unverified = new File("unverified.json")
+        timer.schedule({hostPool.serialize(verified, unverified)} as TimerTask, 10000, 60 * 60 * 1000)
 		
         session.addMuxedSessionListener(new Listener(hostPool: hostPool, toReturn: 2, crawler: crawler), 
             I2PSession.PROTO_DATAGRAM, I2PSession.PORT_ANY)

host-cache/src/main/groovy/com/muwire/hostcache/HostPool.groovy

@@ -2,6 +2,8 @@ package com.muwire.hostcache
 
 import java.util.stream.Collectors
 
+import groovy.json.JsonOutput
+
 class HostPool {
     
     final def maxFailures
@@ -74,4 +76,25 @@ class HostPool {
             }
         }
     }
+    
+    synchronized void serialize(File verifiedFile, File unverifiedFile) {
+        write(verifiedFile, verified.values())
+        write(unverifiedFile, unverified.values())
+    }
+    
+    private void write(File target, Collection hosts) {
+        JsonOutput jsonOutput = new JsonOutput()
+        target.withPrintWriter { writer ->
+            hosts.each { 
+                def json = [:]
+                json.destination = it.destination.toBase64()
+                json.verifyTime = it.verifyTime
+                json.leafSlots = it.leafSlots
+                json.peerSlots = it.peerSlots
+                json.verificationFailures = it.verificationFailures
+                def str = jsonOutput.toJson(json)
+                writer.println(str)
+            } 
+        }
+    }
 }