Release 0.4.10

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

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

@@ -361,7 +361,7 @@ public class Core {
             }
         }
 
-        Core core = new Core(props, home, "0.4.9")
+        Core core = new Core(props, home, "0.4.10")
         core.startServices()
 
         // ... at the end, sleep or execute script

gradle.properties

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

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

@@ -94,6 +94,8 @@ class MainFrameModel {
     @Observable boolean uploadsPaneButtonEnabled
     @Observable boolean monitorPaneButtonEnabled
     @Observable boolean trustPaneButtonEnabled
+    
+    @Observable Downloader downloader
 
     private final Set<InfoHash> infoHashes = new HashSet<>()
 

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

@@ -121,35 +121,57 @@ class MainFrameView {
                         tabbedPane(id : "result-tabs", constraints: BorderLayout.CENTER)
                     }
                     panel (constraints: "downloads window") {
-                        gridLayout(rows : 2, cols: 1)
-                        panel {
-                            borderLayout()
-                            scrollPane (constraints : BorderLayout.CENTER) {
-                                downloadsTable = table(id : "downloads-table", autoCreateRowSorter : true) {
-                                    tableModel(list: model.downloads) {
-                                        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: 70, type: Downloader, read: { row -> row.downloader })
-                                        closureColumn(header: "Sources", preferredWidth : 10, type: Integer, read : {row -> row.downloader.activeWorkers()})
-                                        closureColumn(header: "Speed", preferredWidth: 50, type:String, read :{row ->
-                                        DataHelper.formatSize2Decimal(row.downloader.speed(), false) + "B/sec"
-                                        })
+                        gridLayout(rows : 1, cols : 1)
+                        splitPane(orientation: JSplitPane.VERTICAL_SPLIT, continuousLayout : true, dividerLocation: 500 ) {
+                            panel {
+                                borderLayout()
+                                scrollPane (constraints : BorderLayout.CENTER) {
+                                    downloadsTable = table(id : "downloads-table", autoCreateRowSorter : true) {
+                                        tableModel(list: model.downloads) {
+                                            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: 70, type: Downloader, read: { row -> row.downloader })
+                                            closureColumn(header: "Speed", preferredWidth: 50, type:String, read :{row ->
+                                                DataHelper.formatSize2Decimal(row.downloader.speed(), false) + "B/sec"
+                                            })
+                                        }
                                     }
                                 }
+                                panel (constraints : BorderLayout.SOUTH) {
+                                    button(text: "Pause", enabled : bind {model.pauseButtonEnabled}, pauseAction)
+                                    button(text: "Cancel", enabled : bind {model.cancelButtonEnabled }, cancelAction )
+                                    button(text: bind { model.resumeButtonText }, enabled : bind {model.retryButtonEnabled}, resumeAction)
+                                }
                             }
-                            panel (constraints : BorderLayout.SOUTH) {
-                                button(text: "Pause", enabled : bind {model.pauseButtonEnabled}, pauseAction)
-                                button(text: "Cancel", enabled : bind {model.cancelButtonEnabled }, cancelAction )
-                                button(text: bind { model.resumeButtonText }, enabled : bind {model.retryButtonEnabled}, resumeAction)
-                            }
-                        }
-                        panel {
-                            borderLayout()
-                            panel(constraints : BorderLayout.NORTH) {
-                                label(text : "Download Details")
-                            }
-                            panel(constraints : BorderLayout.CENTER) {
-                                label(text : "Details go here...")
+                            panel {
+                                borderLayout()
+                                panel(constraints : BorderLayout.NORTH) {
+                                    label(text : "Download Details")
+                                }
+                                scrollPane(constraints : BorderLayout.CENTER) {
+                                    panel (id : "download-details-panel") {
+                                        cardLayout()
+                                        panel (constraints : "select-download") {
+                                            label(text : "Select a download to view details")
+                                        }
+                                        panel(constraints : "download-selected") {
+                                            gridBagLayout()
+                                            label(text : "Download Location:", constraints : gbc(gridx:0, gridy:0))
+                                            label(text : bind {model.downloader?.file?.getAbsolutePath()}, 
+                                                constraints: gbc(gridx:1, gridy:0, gridwidth: 2, insets : [0,0,0,20]))
+                                            label(text : "Piece Size", constraints : gbc(gridx: 0, gridy:1))
+                                            label(text : bind {model.downloader?.pieceSize}, constraints : gbc(gridx:1, gridy:1))
+                                            label(text : "Known Sources:", constraints : gbc(gridx:3, gridy: 0))
+                                            label(text : bind {model.downloader?.activeWorkers?.size()}, constraints : gbc(gridx:4, gridy:0, insets : [0,0,0,20]))
+                                            label(text : "Active Sources:", constraints : gbc(gridx:3, gridy:1))
+                                            label(text : bind {model.downloader?.activeWorkers()}, constraints : gbc(gridx:4, gridy:1, insets : [0,0,0,20]))
+                                            label(text : "Total Pieces:", constraints : gbc(gridx:5, gridy: 0))
+                                            label(text : bind {model.downloader?.nPieces}, constraints : gbc(gridx:6, gridy:0, insets : [0,0,0,20]))
+                                            label(text : "Done Pieces:", constraints: gbc(gridx:5, gridy: 1))
+                                            label(text : bind {model.downloader?.donePieces()}, constraints : gbc(gridx:6, gridy:1, insets : [0,0,0,20]))
+                                        }
+                                    }
+                                }
                             }
                         }
                     }
@@ -373,16 +395,21 @@ class MainFrameView {
         def selectionModel = downloadsTable.getSelectionModel()
         selectionModel.setSelectionMode(ListSelectionModel.SINGLE_SELECTION)
         selectionModel.addListSelectionListener({
+            def downloadDetailsPanel = builder.getVariable("download-details-panel")
             int selectedRow = selectedDownloaderRow()
             if (selectedRow < 0) {
                 model.cancelButtonEnabled = false
                 model.retryButtonEnabled = false
                 model.pauseButtonEnabled = false
+                model.downloader = null
+                downloadDetailsPanel.getLayout().show(downloadDetailsPanel,"select-download")
                 return
             }
             def downloader = model.downloads[selectedRow]?.downloader
-            if (downloader == null)
+            if (downloader == null) 
                 return
+            model.downloader = downloader
+            downloadDetailsPanel.getLayout().show(downloadDetailsPanel,"download-selected")
             switch(downloader.getCurrentState()) {
                 case Downloader.DownloadState.CONNECTING :
                 case Downloader.DownloadState.DOWNLOADING :

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

@@ -11,6 +11,7 @@ import javax.swing.JComponent
 import javax.swing.JLabel
 import javax.swing.JMenuItem
 import javax.swing.JPopupMenu
+import javax.swing.JSplitPane
 import javax.swing.JTable
 import javax.swing.ListSelectionModel
 import javax.swing.SwingConstants
@@ -48,39 +49,41 @@ class SearchTabView {
             def resultsTable
             def sendersTable
             def pane = panel {
-                gridLayout(rows : 2, cols: 1)
-                panel {
-                    borderLayout()
-                    scrollPane (constraints : BorderLayout.CENTER) {
-                        sendersTable = table(id : "senders-table", autoCreateRowSorter : true) {
-                            tableModel(list : model.senders) {
-                                closureColumn(header : "Sender", preferredWidth : 500, type: String, read : {row -> row.getHumanReadableName()})
-                                closureColumn(header : "Results", preferredWidth : 20, type: Integer, read : {row -> model.sendersBucket[row].size()})
-                                closureColumn(header : "Trust", preferredWidth : 50, type: String, read : { row ->
-                                    model.core.trustService.getLevel(row.destination).toString()
-                                })
+                gridLayout(rows :1, cols : 1)
+                splitPane(orientation: JSplitPane.VERTICAL_SPLIT, continuousLayout : true, dividerLocation: 300 ) {
+                    panel {
+                        borderLayout()
+                        scrollPane (constraints : BorderLayout.CENTER) {
+                            sendersTable = table(id : "senders-table", autoCreateRowSorter : true) {
+                                tableModel(list : model.senders) {
+                                    closureColumn(header : "Sender", preferredWidth : 500, type: String, read : {row -> row.getHumanReadableName()})
+                                    closureColumn(header : "Results", preferredWidth : 20, type: Integer, read : {row -> model.sendersBucket[row].size()})
+                                    closureColumn(header : "Trust", preferredWidth : 50, type: String, read : { row ->
+                                        model.core.trustService.getLevel(row.destination).toString()
+                                    })
+                                }
                             }
                         }
-                    }
-                    panel(constraints : BorderLayout.SOUTH) {
-                        button(text : "Trust", enabled: bind {model.trustButtonsEnabled }, trustAction)
-                        button(text : "Distrust", enabled : bind {model.trustButtonsEnabled}, distrustAction)
-                    }
-                }
-                panel {
-                    borderLayout()
-                    scrollPane (constraints : BorderLayout.CENTER) {
-                        resultsTable = table(id : "results-table", autoCreateRowSorter : true) {
-                            tableModel(list: model.results) {
-                                closureColumn(header: "Name", preferredWidth: 350, type: String, read : {row -> row.name.replace('<','_')})
-                                closureColumn(header: "Size", preferredWidth: 20, type: Long, read : {row -> row.size})
-                                closureColumn(header: "Direct Sources", preferredWidth: 50, type : Integer, read : { row -> model.hashBucket[row.infohash].size()})
-                                closureColumn(header: "Possible Sources", preferredWidth : 50, type : Integer, read : {row -> model.sourcesBucket[row.infohash].size()})
-                            }
+                        panel(constraints : BorderLayout.SOUTH) {
+                            button(text : "Trust", enabled: bind {model.trustButtonsEnabled }, trustAction)
+                            button(text : "Distrust", enabled : bind {model.trustButtonsEnabled}, distrustAction)
                         }
                     }
-                    panel(constraints : BorderLayout.SOUTH) {
-                        button(text : "Download", enabled : bind {model.downloadActionEnabled}, downloadAction)
+                    panel {
+                        borderLayout()
+                        scrollPane (constraints : BorderLayout.CENTER) {
+                            resultsTable = table(id : "results-table", autoCreateRowSorter : true) {
+                                tableModel(list: model.results) {
+                                    closureColumn(header: "Name", preferredWidth: 350, type: String, read : {row -> row.name.replace('<','_')})
+                                    closureColumn(header: "Size", preferredWidth: 20, type: Long, read : {row -> row.size})
+                                    closureColumn(header: "Direct Sources", preferredWidth: 50, type : Integer, read : { row -> model.hashBucket[row.infohash].size()})
+                                    closureColumn(header: "Possible Sources", preferredWidth : 50, type : Integer, read : {row -> model.sourcesBucket[row.infohash].size()})
+                                }
+                            }
+                        }
+                        panel(constraints : BorderLayout.SOUTH) {
+                            button(text : "Download", enabled : bind {model.downloadActionEnabled}, downloadAction)
+                        }
                     }
                 }
             }

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

@@ -24,7 +24,7 @@ class DownloadProgressRenderer extends DefaultTableCellRenderer {
         if (pieces != 0)
             percent = (done * 100 / pieces)
         String totalSize = DataHelper.formatSize2Decimal(d.length, false) + "B"
-        setText(String.format("%2d", percent) + "% of ${totalSize} ($done/$pieces pcs)".toString())
+        setText(String.format("%2d", percent) + "% of ${totalSize}".toString())
         
         if (isSelected) {
             setForeground(table.getSelectionForeground())