Release 0.1.4

README.md

@@ -31,6 +31,4 @@ 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
-* On windows the preferences are stored in %HOME%\.MuWire instead of the user profile directory
-* Downloads in progress do not get remembered between restarts
 

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

@@ -34,7 +34,7 @@ class Cli {
         
         Core core 
         try {
-            core = new Core(props, home, "0.1.1")
+            core = new Core(props, home, "0.1.4")
         } 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.1.1")
+            core = new Core(props, home, "0.1.4")
         } catch (Exception bad) {
             bad.printStackTrace(System.out)
             println "Failed to initialize core, exiting"

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

@@ -191,8 +191,10 @@ public class Core {
 		eventBus.register(ResultsEvent.class, searchManager)
 		
         log.info("initializing download manager")
-        DownloadManager downloadManager = new DownloadManager(eventBus, i2pConnector, new File(home, "incompletes"), me)
+        DownloadManager downloadManager = new DownloadManager(eventBus, i2pConnector, home, me)
         eventBus.register(UIDownloadEvent.class, downloadManager)
+        eventBus.register(UILoadedEvent.class, downloadManager)
+        eventBus.register(FileDownloadedEvent.class, downloadManager)
         
         log.info("initializing upload manager")
         UploadManager uploadManager = new UploadManager(eventBus, fileManager)
@@ -253,7 +255,7 @@ public class Core {
             }
         }
         
-        Core core = new Core(props, home, "0.1.1")
+        Core core = new Core(props, home, "0.1.4")
         core.startServices()
         
         // ... at the end, sleep or execute script

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

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

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

@@ -1,12 +1,21 @@
 package com.muwire.core.download
 
 import com.muwire.core.connection.I2PConnector
+import com.muwire.core.files.FileDownloadedEvent
+import com.muwire.core.files.FileHasher
+import com.muwire.core.util.DataUtil
 
+import groovy.json.JsonBuilder
+import groovy.json.JsonOutput
+import groovy.json.JsonSlurper
 import net.i2p.data.Base64
 import net.i2p.data.Destination
+import net.i2p.util.ConcurrentHashSet
 
 import com.muwire.core.EventBus
+import com.muwire.core.InfoHash
 import com.muwire.core.Persona
+import com.muwire.core.UILoadedEvent
 
 import java.util.concurrent.Executor
 import java.util.concurrent.Executors
@@ -16,13 +25,16 @@ public class DownloadManager {
     private final EventBus eventBus
     private final I2PConnector connector
     private final Executor executor
-    private final File incompletes
+    private final File incompletes, home
     private final Persona me
     
-    public DownloadManager(EventBus eventBus, I2PConnector connector, File incompletes, Persona me) {
+    private final Set<Downloader> downloaders = new ConcurrentHashSet<>()
+    
+    public DownloadManager(EventBus eventBus, I2PConnector connector, File home, Persona me) {
         this.eventBus = eventBus
         this.connector = connector
-        this.incompletes = incompletes
+        this.incompletes = new File(home,"incompletes")
+        this.home = home
         this.me = me
         
         incompletes.mkdir()
@@ -50,6 +62,8 @@ public class DownloadManager {
         def downloader = new Downloader(eventBus, this, me, e.target, size,
             infohash, pieceSize, connector, destinations,
             incompletes)
+        downloaders.add(downloader)
+        persistDownloaders()
         executor.execute({downloader.download()} as Runnable)
         eventBus.publish(new DownloadStartedEvent(downloader : downloader))
     }
@@ -57,4 +71,53 @@ public class DownloadManager {
     void resume(Downloader downloader) {
         executor.execute({downloader.download() as Runnable})
     }
+    
+    void onUILoadedEvent(UILoadedEvent e) {
+        File downloadsFile = new File(home, "downloads.json")
+        if (!downloadsFile.exists())
+            return
+        def slurper = new JsonSlurper()
+        downloadsFile.eachLine {
+            def json = slurper.parseText(it)
+            File file = new File(DataUtil.readi18nString(Base64.decode(json.file)))
+            def destinations = new HashSet<>()
+            json.destinations.each { destination -> 
+                destinations.add new Destination(destination)
+            }
+            byte[] hashList = Base64.decode(json.hashList)
+            InfoHash infoHash = InfoHash.fromHashList(hashList)
+            def downloader = new Downloader(eventBus, this, me, file, (long)json.length,
+                infoHash, json.pieceSizePow2, connector, destinations, incompletes)
+            downloader.download()
+            eventBus.publish(new DownloadStartedEvent(downloader : downloader))
+        }
+    }
+    
+    void onFileDownloadedEvent(FileDownloadedEvent e) {
+        downloaders.remove(e.downloader)
+        persistDownloaders()
+    }
+    
+    private void persistDownloaders() {
+        File downloadsFile = new File(home,"downloads.json")
+        downloadsFile.withPrintWriter { writer -> 
+            downloaders.each { downloader ->
+                if (!downloader.cancelled) {
+                    def json = [:]
+                    json.file = Base64.encode(DataUtil.encodei18nString(downloader.file.getAbsolutePath()))
+                    json.length = downloader.length
+                    json.pieceSizePow2 = downloader.pieceSizePow2
+                    def destinations = []
+                    downloader.destinations.each {
+                        destinations << it.toBase64()
+                    }
+                    json.destinations = destinations
+                    
+                    json.hashList = Base64.encode(downloader.infoHash.hashList)
+                    
+                    writer.println(JsonOutput.toJson(json))
+                }
+            }
+        }
+    }
 }

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

@@ -42,6 +42,7 @@ public class Downloader {
     private final Set<Destination> destinations
     private final int nPieces
     private final File piecesFile
+    final int pieceSizePow2
     private final Map<Destination, DownloadWorker> activeWorkers = new ConcurrentHashMap<>()
     
     
@@ -61,6 +62,7 @@ public class Downloader {
         this.connector = connector
         this.destinations = destinations
         this.piecesFile = new File(incompletes, file.getName()+".pieces")
+        this.pieceSizePow2 = pieceSizePow2
         this.pieceSize = 1 << pieceSizePow2
         
         int nPieces
@@ -88,8 +90,8 @@ public class Downloader {
     void readPieces() {
         if (!piecesFile.exists())
             return
-        piecesFile.withReader { 
-            int piece = Integer.parseInt(it.readLine())
+        piecesFile.eachLine { 
+            int piece = Integer.parseInt(it)
             downloaded.markDownloaded(piece)
         }
     }
@@ -163,11 +165,18 @@ public class Downloader {
     }
     
     public void resume() {
-        activeWorkers.each { destination, worker ->
-            if (worker.currentState == WorkerState.FINISHED) {
-                def newWorker = new DownloadWorker(destination)
-                activeWorkers.put(destination, newWorker)
-                executorService.submit(newWorker)
+        destinations.each { destination ->
+            def worker = activeWorkers.get(destination)
+            if (worker != null) {
+                if (worker.currentState == WorkerState.FINISHED) {
+                    def newWorker = new DownloadWorker(destination)
+                    activeWorkers.put(destination, newWorker)
+                    executorService.submit(newWorker)
+                }
+            } else {
+                worker = new DownloadWorker(destination)
+                activeWorkers.put(destination, worker)
+                executorService.submit(worker)
             }
         }
     }
@@ -205,7 +214,8 @@ public class Downloader {
                 if (downloaded.isComplete() && !eventFired) {
                     piecesFile.delete()
                     eventFired = true
-                    eventBus.publish(new FileDownloadedEvent(downloadedFile : new DownloadedFile(file, infoHash, pieceSize, Collections.emptySet())))
+                    eventBus.publish(new FileDownloadedEvent(downloadedFile : new DownloadedFile(file, infoHash, pieceSize, Collections.emptySet())),
+                        downloader : Downloader.this)
                 }
                 endpoint?.close()
             }

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

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

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

@@ -1,6 +1,9 @@
 package com.muwire.core.files
 
 import com.muwire.core.InfoHash
+
+import net.i2p.data.Base64
+
 import java.nio.MappedByteBuffer
 import java.nio.channels.FileChannel
 import java.nio.channels.FileChannel.MapMode
@@ -79,6 +82,6 @@ class FileHasher {
         file = file.getAbsoluteFile()
         def hasher = new FileHasher()
         def infohash = hasher.hashFile(file)
-        println infohash
+        println Base64.encode(infohash.getRoot())
     }
 }

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

@@ -4,6 +4,7 @@ import com.muwire.core.EventBus
 import com.muwire.core.InfoHash
 import com.muwire.core.MuWireSettings
 import com.muwire.core.SharedFile
+import com.muwire.core.UILoadedEvent
 import com.muwire.core.search.ResultsEvent
 import com.muwire.core.search.SearchEvent
 import com.muwire.core.search.SearchIndex

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

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

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

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

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

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

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

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

doc/wire-protocol.md

@@ -131,12 +131,18 @@ Sent by a leaf or ultrapeer when performing a search.  Contains the reply-to per
     firstHop: false,
     keywords : ["keyword1","keyword2"...]
     infohash: "asdfasdf...",
-    replyTo : "asdfasf...b64"
+    replyTo : "asdfasf...b64",
+    originator : "asfasdf...",
+    "oobHashlist" : true
 }
 ```
 
 A search can contain either the query entered by the user in the UI or the infohash if the user is looking for a specific file.  If both are present, the infohash takes precedence and the keyword query is ignored.
 
+The "originator" field contains the Base64-encoded persona of the originator of the query.  It is used for display purposes only.  The I2P destination in that persona must match the one in the "replyTo" field.
+
+The oobHashlist flag indicates support for out-of-band hashlist delivery, which is not yet implemented.  Nevertheless, this flag gets propagated through the network for future-proofing.
+
 ### Ultrapeer to leaf
 
 The "Search" message is also sent from an ultrapeer to a leaf.

gradle.properties

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

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

@@ -82,12 +82,19 @@ class MainFrameController {
         int row = table.getSelectedRow()
         if (row == -1)
             return
+        def sortEvt = group.view.lastSortEvent
+        if (sortEvt != null) {
+            row = sortEvt.convertPreviousRowIndexToModel(row)
+        }
         group.model.results[row]        
     }
     
-    private def selectedDownload() {
+    private int selectedDownload() {
         def selected = builder.getVariable("downloads-table").getSelectedRow()
-        model.downloads[selected].downloader
+        def sortEvt = mvcGroup.view.lastDownloadSortEvent
+        if (sortEvt != null)
+            selected = sortEvt.convertPreviousRowIndexToModel(selected)
+        selected
     }
     
     @ControllerAction
@@ -124,13 +131,13 @@ class MainFrameController {
     
     @ControllerAction 
     void cancel() {
-        def downloader = selectedDownload()
+        def downloader = model.downloads[selectedDownload()].downloader
         downloader.cancel()
     }
     
     @ControllerAction
     void resume() {
-        def downloader = selectedDownload()
+        def downloader = model.downloads[selectedDownload()].downloader
         downloader.resume()
     }
 

gui/griffon-app/lifecycle/Ready.groovy

@@ -7,6 +7,7 @@ import org.codehaus.griffon.runtime.core.AbstractLifecycleHandler
 
 import com.muwire.core.Core
 import com.muwire.core.MuWireSettings
+import com.muwire.core.UILoadedEvent
 import com.muwire.core.files.FileSharedEvent
 
 import javax.annotation.Nonnull
@@ -117,6 +118,8 @@ class Ready extends AbstractLifecycleHandler {
                 core.eventBus.publish(new FileSharedEvent(file : new File(it)))
             }
         }
+        
+        core.eventBus.publish(new UILoadedEvent())
     }
     
     private static String selectHome() {

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

@@ -37,6 +37,9 @@ class MainFrameView {
     @MVCMember @Nonnull
     MainFrameModel model
     
+    def downloadsTable
+    def lastDownloadSortEvent
+    
     void initUI() {
         builder.with {
             application(size : [1024,768], id: 'main-frame',
@@ -105,10 +108,10 @@ class MainFrameView {
                             panel (constraints : JSplitPane.BOTTOM) {
                                 borderLayout()
                                 scrollPane (constraints : BorderLayout.CENTER) {
-                                    table(id : "downloads-table", autoCreateRowSorter : true) {
+                                    downloadsTable = table(id : "downloads-table", autoCreateRowSorter : true) {
                                         tableModel(list: model.downloads) {
                                             closureColumn(header: "Name", preferredWidth: 350, type: String, read : {row -> row.downloader.file.getName()})
-                                            closureColumn(header: "Status", preferredWidth: 50, type: String, read : {row -> row.downloader.getCurrentState()})
+                                            closureColumn(header: "Status", preferredWidth: 50, type: String, read : {row -> row.downloader.getCurrentState().toString()})
                                             closureColumn(header: "Progress", preferredWidth: 20, type: String, read: { row ->
                                                 int pieces = row.downloader.nPieces
                                                 int done = row.downloader.donePieces()
@@ -260,7 +263,7 @@ class MainFrameView {
         def selectionModel = downloadsTable.getSelectionModel()
         selectionModel.setSelectionMode(ListSelectionModel.SINGLE_SELECTION)
         selectionModel.addListSelectionListener({
-            int selectedRow = downloadsTable.getSelectedRow()
+            int selectedRow = selectedDownloaderRow()
             def downloader = model.downloads[selectedRow].downloader
             switch(downloader.getCurrentState()) {
                 case Downloader.DownloadState.CONNECTING :
@@ -280,9 +283,18 @@ class MainFrameView {
         
         def centerRenderer = new DefaultTableCellRenderer()
         centerRenderer.setHorizontalAlignment(JLabel.CENTER)
-        builder.getVariable("downloads-table").setDefaultRenderer(Integer.class, centerRenderer)
+        downloadsTable.setDefaultRenderer(Integer.class, centerRenderer)
+        
+        downloadsTable.rowSorter.addRowSorterListener({evt -> lastDownloadSortEvent = evt})
     }
 
+    int selectedDownloaderRow() {
+        int selected = builder.getVariable("downloads-table").getSelectedRow()
+        if (lastDownloadSortEvent != null)
+            selected = lastDownloadSortEvent.convertPreviousRowIndexToModel(selected)
+        selected
+    }
+    
     def showSearchWindow = {
         def cardsPanel = builder.getVariable("cards-panel")
         cardsPanel.getLayout().show(cardsPanel, "search window")

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

@@ -26,6 +26,7 @@ class SearchTabView {
     def parent
     def searchTerms
     def resultsTable
+    def lastSortEvent
     
     void initUI() {
         builder.with {
@@ -38,7 +39,7 @@ class SearchTabView {
                         closureColumn(header: "Sources", preferredWidth: 10, type : Integer, read : { row -> model.hashBucket[row.infohash].size()})
                         closureColumn(header: "Sender", preferredWidth: 170, type: String, read : {row -> row.sender.getHumanReadableName()})
                         closureColumn(header: "Trust", preferredWidth: 50, type: String, read : {row ->
-                          model.core.trustService.getLevel(row.sender.destination)
+                          model.core.trustService.getLevel(row.sender.destination).toString()
                         })
                     }
                 }
@@ -84,6 +85,8 @@ class SearchTabView {
         resultsTable.columnModel.getColumn(1).setCellRenderer(centerRenderer)
         resultsTable.setDefaultRenderer(Integer.class,centerRenderer)
         resultsTable.columnModel.getColumn(4).setCellRenderer(centerRenderer)
+        
+        resultsTable.rowSorter.addRowSorterListener({ evt -> lastSortEvent = evt})
     }
     
     def closeTab = {