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

do not count finished workers in total count

pull/4/head
Zlatin Balevsky 2019-06-04 16:22:48 +01:00
parent 404d5b60bc
commit b129e79196
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/groovy/com/muwire/core/download/Downloader.groovy
View File

@ -145,6 +145,15 @@ public class Downloader {
} }
} }
public int activeWorkers() {
int active = 0
activeWorkers.values().each {
if (it.currentState != WorkerState.FINISHED)
active++
}
active
}
public void resume() { public void resume() {
downloadManager.resume(this) downloadManager.resume(this)
} }

2
gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
View File

@ -105,7 +105,7 @@ class MainFrameView {
int done = row.downloader.donePieces() int done = row.downloader.donePieces()
"$done/$pieces pieces" "$done/$pieces pieces"
}) })
closureColumn(header: "Sources", preferredWidth : 10, type: Integer, read : {row -> row.downloader.activeWorkers.size()}) closureColumn(header: "Sources", preferredWidth : 10, type: Integer, read : {row -> row.downloader.activeWorkers()})
closureColumn(header: "Speed", preferredWidth: 50, type:String, read :{row -> closureColumn(header: "Speed", preferredWidth: 50, type:String, read :{row ->
DataHelper.formatSize2Decimal(row.downloader.speed(), false) + "B/sec" DataHelper.formatSize2Decimal(row.downloader.speed(), false) + "B/sec"
}) })