fix incorrect calculating left bytes

mpetazzoni · Oct 12, 2018 · 350c88f · 350c88f
1 parent 029334d
commit 350c88f
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/ttorrent-client/src/main/java/com/turn/ttorrent/client/CommunicationManager.java b/ttorrent-client/src/main/java/com/turn/ttorrent/client/CommunicationManager.java
@@ -202,20 +202,19 @@ public TorrentManager addTorrent(TorrentMetadataProvider metadataProvider,
                                    PieceStorage pieceStorage,
                                    List<TorrentListener> listeners) throws IOException {
     CopyOnWriteArrayList<TorrentListener> cowListeners = new CopyOnWriteArrayList<TorrentListener>(listeners);
+    TorrentMetadata torrentMetadata = metadataProvider.getTorrentMetadata();
     final LoadedTorrentImpl loadedTorrent = new LoadedTorrentImpl(
             new TorrentStatistic(),
             metadataProvider,
+            torrentMetadata,
             pieceStorage,
             new EventDispatcher(cowListeners));
 
     if (pieceStorage.isFinished()) {
       loadedTorrent.getTorrentStatistic().setLeft(0);
     } else {
-      long size = 0;
-      for (TorrentFile torrentFile : loadedTorrent.getMetadata().getFiles()) {
-        size += torrentFile.size;
-      }
-      loadedTorrent.getTorrentStatistic().setLeft(size);
+      long left = calculateLeft(pieceStorage, torrentMetadata);
+      loadedTorrent.getTorrentStatistic().setLeft(left);
     }
 
     this.torrentsStorage.addTorrent(loadedTorrent.getTorrentHash().getHexInfoHash(), loadedTorrent);
@@ -224,6 +223,25 @@ public TorrentManager addTorrent(TorrentMetadataProvider metadataProvider,
     return new TorrentManagerImpl(cowListeners, loadedTorrent.getTorrentHash());
   }
 
+  private long calculateLeft(PieceStorage pieceStorage, TorrentMetadata torrentMetadata) {
+
+    long size = 0;
+    for (TorrentFile torrentFile : torrentMetadata.getFiles()) {
+      size += torrentFile.size;
+    }
+
+    int pieceLength = torrentMetadata.getPieceLength();
+    long result = 0;
+    BitSet availablePieces = pieceStorage.getAvailablePieces();
+    for (int i = 0; i < torrentMetadata.getPiecesCount(); i++) {
+      if (availablePieces.get(i)) {
+        continue;
+      }
+      result += Math.min(pieceLength, size - i * pieceLength);
+    }
+    return result;
+  }
+
   private void forceAnnounceAndLogError(LoadedTorrent torrent, AnnounceRequestMessage.RequestEvent event) {
     try {
       this.announce.forceAnnounce(torrent.createAnnounceableInformation(), this, event);
@@ -609,7 +627,7 @@ public void handleDiscoveredPeers(List<Peer> peers, String hexInfoHash) {
 
     if (announceableTorrent.getPieceStorage().isFinished()) return;
 
-    logger.info("Got {} peer(s) ({}) for {} in tracker response", new Object[]{peers.size(),
+    logger.debug("Got {} peer(s) ({}) for {} in tracker response", new Object[]{peers.size(),
             Arrays.toString(peers.toArray()), hexInfoHash});
 
     Map<PeerUID, Peer> uniquePeers = new HashMap<PeerUID, Peer>();
@@ -742,7 +760,7 @@ private void validatePieceAsync(final SharedTorrent torrent, final Piece piece,
             isTorrentComplete = torrent.isComplete();
 
             if (isTorrentComplete) {
-              logger.debug("Download of {} complete.", torrent.getDirectoryName());
+              logger.info("Download of {} complete.", torrent.getDirectoryName());
 
               torrent.finish();
             }

diff --git a/ttorrent-client/src/main/java/com/turn/ttorrent/client/LoadedTorrentImpl.java b/ttorrent-client/src/main/java/com/turn/ttorrent/client/LoadedTorrentImpl.java
@@ -20,11 +20,11 @@ public class LoadedTorrentImpl implements LoadedTorrent {
 
   LoadedTorrentImpl(TorrentStatistic torrentStatistic,
                     TorrentMetadataProvider metadataProvider,
+                    TorrentMetadata torrentMetadata,
                     PieceStorage pieceStorage,
-                    EventDispatcher eventDispatcher) throws IOException {
+                    EventDispatcher eventDispatcher) {
     this.torrentStatistic = torrentStatistic;
     this.metadataProvider = metadataProvider;
-    final TorrentMetadata torrentMetadata = metadataProvider.getTorrentMetadata();
     this.eventDispatcher = eventDispatcher;
     torrentHash = new ImmutableTorrentHash(torrentMetadata.getInfoHash());
     if (torrentMetadata.getAnnounceList() != null) {

diff --git a/ttorrent-client/src/main/java/com/turn/ttorrent/client/SharedTorrent.java b/ttorrent-client/src/main/java/com/turn/ttorrent/client/SharedTorrent.java
@@ -260,12 +260,9 @@ private void hashSingleThread() {
       );
       this.pieces[idx] = piece;
       piece.setValid(pieceStorage.getAvailablePieces().get(idx));
-    }
 
-    for (Piece piece : pieces) {
       if (piece.isValid()) {
         this.completedPieces.set(piece.getIndex());
-        myTorrentStatistic.addLeft(-piece.size());
       }
     }
   }