From ddc69c1807d3f19682cc39c560cc2f0708a4e6a5 Mon Sep 17 00:00:00 2001 From: Kurt Kartaltepe Date: Mon, 19 Sep 2016 23:34:20 -0500 Subject: [PATCH 1/2] Report hash verification progress --- js/ctrls/main.js | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/js/ctrls/main.js b/js/ctrls/main.js index d088c8d..467dfce 100755 --- a/js/ctrls/main.js +++ b/js/ctrls/main.js @@ -318,7 +318,7 @@ function( } else if (scope.filterSpeed) { downloads = _.filter(scope.active, function (e) { - return +e.uploadSpeed || +e.downloadSpeed; + return +e.uploadSpeed || +e.downloadSpeed; }); } if (scope.filterWaiting) { @@ -398,6 +398,10 @@ function( animCollapsed: true, files: [], }; + if (d.verifiedLength) + ctx.verifiedLength = d.verifiedLength; + if (d.verifyIntegrityPending) + ctx.verifyIntegrityPending = d.verifyIntegrityPending; } else { if (ctx.gid !== d.gid) @@ -427,6 +431,16 @@ function( ctx.completedLength = d.completedLength; ctx.fmtCompletedLength = utils.fmtsize(d.completedLength); } + if (!d.verifiedLength) { + delete ctx.verifiedLength + } else if (ctx.verifiedLength !== d.verifiedLength) { + ctx.verifiedLength = d.verifiedLength; + } + if (!d.verifyIntegrityPending) { + delete ctx.verifyIntegrityPending + } else if (ctx.verifyIntegrityPending !== d.verifyIntegrityPending) { + ctx.verifyIntegrityPending = d.verifyIntegrityPending; + } if (ctx.uploadLength !== d.uploadength) { ctx.uploadLength = d.uploadlength; ctx.fmtUploadLength = utils.fmtsize(d.uploadLength); @@ -520,7 +534,10 @@ function( case "removed": return "progress-bar-warning"; case "active": - return "active"; + if (d.verifyIntegrityPending || d.verifiedLength) + return "progress-bar-warning" + else + return "active"; case "complete": return "progress-bar-success"; default: @@ -530,7 +547,11 @@ function( // gets the progress in percentages scope.getProgress = function(d) { - var percentage = (d.completedLength / d.totalLength)*100 || 0; + var percentage = 0 + if (d.verifiedLength) + percentage = (d.verifiedLength / d.totalLength) * 100 || 0; + else + percentage = (d.completedLength / d.totalLength) * 100 || 0; percentage = percentage.toFixed(2); if(!percentage) percentage = 0; @@ -597,4 +618,4 @@ function( rpc.once('changePosition', [d.gid, -1, 'POS_CUR']); }; -}]); +}]); \ No newline at end of file From ad5727021807ca0ff7720a74dce551a53310eeca Mon Sep 17 00:00:00 2001 From: Kurt Kartaltepe Date: Tue, 20 Sep 2016 17:58:00 -0500 Subject: [PATCH 2/2] Add status for 'verifing' and 'verifyPending' --- index.html | 66 ++++++++++++++++++++++++++++++++++++++++++++++++ js/ctrls/main.js | 19 +++++++++----- 2 files changed, 79 insertions(+), 6 deletions(-) diff --git a/index.html b/index.html index d4d0a31..8eb8eee 100755 --- a/index.html +++ b/index.html @@ -555,6 +555,72 @@ + + + +