From 1081f4bcd0d23bdb88cb7ed10581b3ff821296a8 Mon Sep 17 00:00:00 2001 From: Zlatin Balevsky Date: Fri, 31 May 2019 08:56:44 +0100 Subject: [PATCH] show piece progress --- .../groovy/com/muwire/core/download/DownloadSession.groovy | 2 ++ gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/core/src/main/groovy/com/muwire/core/download/DownloadSession.groovy b/core/src/main/groovy/com/muwire/core/download/DownloadSession.groovy index 0153b73a..d27799e9 100644 --- a/core/src/main/groovy/com/muwire/core/download/DownloadSession.groovy +++ b/core/src/main/groovy/com/muwire/core/download/DownloadSession.groovy @@ -140,6 +140,8 @@ class DownloadSession { } synchronized int positionInPiece() { + if (mapped == null) + return 0 mapped.position() } } diff --git a/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy b/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy index fef6ca04..df3557bf 100644 --- a/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy +++ b/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy @@ -90,6 +90,11 @@ class MainFrameView { int done = row.downloader.donePieces() "$done/$pieces pieces" }) + closureColumn(header: "Piece", type: String, read: { row -> + int position = row.downloader.positionInPiece() + int pieceSize = row.downloader.pieceSize // TODO: fix for last piece + "$position/$pieceSize bytes" + }) } } }