simon/AriaNg
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

fix incorrect health percent in some cases

Browse source
This commit is contained in:
MaysWind 2016-06-12 22:20:38 +08:00
parent 2e29969ec1
commit 224367d1ba
1 changed files with 35 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
app/scripts/services/aria2TaskService.js
View file

@ -299,7 +299,7 @@
var bit = (1 << (4 - j)); var bit = (1 << (4 - j));
var isCompleted = (bitSet & bit) == bit; var isCompleted = (bitSet & bit) == bit;
pieces.push(isCompleted ? 1 : 0); pieces.push(isCompleted);
pieceIndex++; pieceIndex++;
if (pieceIndex >= pieceCount) { if (pieceIndex >= pieceCount) {
@ -315,7 +315,7 @@
var combinedPieces = []; var combinedPieces = [];
for (var i = 0; i < pieces.length; i++) { for (var i = 0; i < pieces.length; i++) {
var isCompleted = (pieces[i] == 1); var isCompleted = pieces[i];
if (combinedPieces.length > 0 && combinedPieces[combinedPieces.length - 1].isCompleted == isCompleted) { if (combinedPieces.length > 0 && combinedPieces[combinedPieces.length - 1].isCompleted == isCompleted) {
combinedPieces[combinedPieces.length - 1].count++; combinedPieces[combinedPieces.length - 1].count++;
@ -334,26 +334,45 @@
return task.completePercent; return task.completePercent;
} }
var pieces = this.getPieceStatus(task.bitfield, task.numPieces); var totalPieces = [];
var currentPieces = this.getPieceStatus(task.bitfield, task.numPieces);
var maxCompletedPieceCount = 0;
var maxCompletedPercent = task.completePercent;
for (var i = 0; i < currentPieces.length; i++) {
var count = currentPieces[i] ? 1 : 0;
totalPieces.push(count);
maxCompletedPieceCount += count;
}
for (var i = 0; i < peers.length; i++) { for (var i = 0; i < peers.length; i++) {
var peer = peers[i]; var peer = peers[i];
var peerPieces = this.getPieceStatus(peer.bitfield, task.numPieces); var peerPieces = this.getPieceStatus(peer.bitfield, task.numPieces);
var completedPieceCount = 0;
for (var j = 0; j < peerPieces.length; j++) { for (var j = 0; j < peerPieces.length; j++) {
pieces[j] += peerPieces[j]; var count = (peerPieces[j] ? 1 : 0);
totalPieces[j] += count;
completedPieceCount += count;
}
if (completedPieceCount > maxCompletedPieceCount) {
maxCompletedPieceCount = completedPieceCount;
maxCompletedPercent = peer.completePercent;
} else if (completedPieceCount == maxCompletedPieceCount && peer.completePercent > maxCompletedPercent) {
maxCompletedPercent = peer.completePercent;
} }
} }
var competedPieceCount = 0; var totalCompletedPieceCount = 0;
while (true) { while (true) {
var completed = true; var completed = true;
for (var i = 0; i < pieces.length; i++) { for (var i = 0; i < totalPieces.length; i++) {
if (pieces[i] > 0) { if (totalPieces[i] > 0) {
competedPieceCount++; totalCompletedPieceCount++;
pieces[i]--; totalPieces[i]--;
} else { } else {
completed = false; completed = false;
} }
@ -364,10 +383,14 @@
} }
} }
var healthPercent = competedPieceCount / task.numPieces * 100; if (totalCompletedPieceCount <= maxCompletedPieceCount) {
return maxCompletedPercent;
}
if (healthPercent < task.completePercent) { var healthPercent = totalCompletedPieceCount / task.numPieces * 100;
healthPercent = task.completePercent;
if (healthPercent <= maxCompletedPercent) {
return maxCompletedPercent;
} }
return healthPercent; return healthPercent;