Release 0.1.13

README.md

@@ -31,4 +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
-* Sorting the results table sometimes causes the wrong result to be downloaded

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.11")
+            core = new Core(props, home, "0.1.13")
         } 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.11")
+            core = new Core(props, home, "0.1.13")
         } catch (Exception bad) {
             bad.printStackTrace(System.out)
             println "Failed to initialize core, exiting"

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

@@ -234,14 +234,14 @@ public class Core {
     }
     
     public void shutdown() {
-        log.info("shutting down connection manager")
-        connectionManager.shutdown()
         log.info("shutting down download manageer")
         downloadManager.shutdown()
         log.info("shutting down connection acceeptor")
         connectionAcceptor.stop()
         log.info("shutting down connection establisher")
         connectionEstablisher.stop()
+        log.info("shutting down connection manager")
+        connectionManager.shutdown()
     }
 
     static main(args) {
@@ -268,7 +268,7 @@ public class Core {
             }
         }
         
-        Core core = new Core(props, home, "0.1.11")
+        Core core = new Core(props, home, "0.1.13")
         core.startServices()
         
         // ... at the end, sleep or execute script

gradle.properties

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

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

@@ -39,6 +39,9 @@ class MainFrameController {
         cardsPanel.getLayout().show(cardsPanel, "search window")
         
         def search = builder.getVariable("search-field").text
+        search = search.trim()
+        if (search.length() == 0)
+            return
         def uuid = UUID.randomUUID()
         Map<String, Object> params = new HashMap<>()
         params["search-terms"] = search
@@ -86,8 +89,8 @@ class MainFrameController {
             return
         def sortEvt = group.view.lastSortEvent
         if (sortEvt != null) {
-            row = sortEvt.convertPreviousRowIndexToModel(row)
-        }
+            row = group.view.resultsTable.rowSorter.convertRowIndexToModel(row)
+        } 
         group.model.results[row]        
     }
     

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

@@ -280,11 +280,12 @@ class MainFrameView {
             switch(downloader.getCurrentState()) {
                 case Downloader.DownloadState.CONNECTING :
                 case Downloader.DownloadState.DOWNLOADING :
+                case Downloader.DownloadState.HASHLIST:
                 model.cancelButtonEnabled = true
                 model.retryButtonEnabled = false
                 break
                 case Downloader.DownloadState.FAILED:
-                model.cancelButtonEnabled = false
+                model.cancelButtonEnabled = true
                 model.retryButtonEnabled = true
                 break
                 default:

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

@@ -97,6 +97,7 @@ class SearchTabView {
         
         
         resultsTable.rowSorter.addRowSorterListener({ evt -> lastSortEvent = evt})
+        resultsTable.rowSorter.setSortsOnUpdates(true)
         
         resultsTable.addMouseListener(new MouseAdapter() {
             @Override