goldcollection
/
muwire
mirror of https://github.com/zlatinb/muwire
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

add upload speed column to cli

pull/24/head
Zlatin Balevsky 2019-10-27 03:07:18 +00:00
parent 9bd3c4f141
commit f5284f9483
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cli-lanterna/src/main/groovy/com/muwire/clilanterna/UploadsModel.groovy
View File

@ -15,7 +15,7 @@ class UploadsModel {
private final Core core
private CliSettings props
private final List<UploaderWrapper> uploaders = new ArrayList<>()
private final TableModel model = new TableModel("Name","Progress","Downloader","Remote Pieces")
private final TableModel model = new TableModel("Name","Progress","Downloader","Remote Pieces", "Speed")
UploadsModel(TextGUIThread guiThread, Core core, CliSettings props) {
this.guiThread = guiThread
@ -86,7 +86,10 @@ class UploadsModel {
totalSize = " of " + DataHelper.formatSize2Decimal(size, false) + "B"
String remotePieces = String.format("%02d", percentTotal) + "% ${totalSize} ($done/$pieces) pcs".toString()
model.addRow([name, percentString, downloader, remotePieces])
String speed = DataHelper.formatSize2Decimal(it.uploader.speed(), false) + "B/sec"
model.addRow([name, percentString, downloader, remotePieces, speed])
}
}

2
cli-lanterna/src/main/groovy/com/muwire/clilanterna/UploadsView.groovy
View File

@ -24,7 +24,7 @@ class UploadsView extends BasicWindow {
contentPanel.setLayoutManager(new GridLayout(1))
LayoutData layoutData = GridLayout.createLayoutData(Alignment.CENTER, Alignment.CENTER, true, false)
table = new Table("Name","Progress","Downloader","Remote Pieces")
table = new Table("Name","Progress","Downloader","Remote Pieces","Speed")
table.setCellSelection(false)
table.setTableModel(model.model)
table.setVisibleRows(terminalSize.getRows())