X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fcore%2FRequestManager.java;h=b312d43f2e1406b0057887c672ffbc336ce0fdb7;hb=fa2475af2c06ae03a4338a3fc1e327dc1970faf4;hp=925573d9328c1c3927eb0b61ed3f205d38b51526;hpb=03c0530e4536d194afa0556c45e07f4d4df35439;p=jSite2.git

diff --git a/src/net/pterodactylus/jsite/core/RequestManager.java b/src/net/pterodactylus/jsite/core/RequestManager.java
index 925573d..b312d43 100644
--- a/src/net/pterodactylus/jsite/core/RequestManager.java
+++ b/src/net/pterodactylus/jsite/core/RequestManager.java
@@ -32,6 +32,8 @@ import java.util.logging.Logger;
 import net.pterodactylus.fcp.highlevel.HighLevelCallback;
 import net.pterodactylus.fcp.highlevel.HighLevelCallbackListener;
 import net.pterodactylus.fcp.highlevel.HighLevelClient;
+import net.pterodactylus.fcp.highlevel.HighLevelProgress;
+import net.pterodactylus.fcp.highlevel.HighLevelProgressListener;
 import net.pterodactylus.fcp.highlevel.RequestListResult;
 import net.pterodactylus.fcp.highlevel.RequestResult;
 import net.pterodactylus.util.logging.Logging;
@@ -45,7 +47,7 @@ import net.pterodactylus.util.logging.Logging;
  * @author David ‘Bombe’ Roden <bombe@freenetproject.org>
  * @version $Id$
  */
-public class RequestManager implements NodeListener {
+public class RequestManager implements NodeListener, HighLevelProgressListener {
 
 	/** Logger. */
 	private static final Logger logger = Logging.getLogger(RequestManager.class.getName());
@@ -98,6 +100,33 @@ public class RequestManager implements NodeListener {
 		}
 	}
 
+	/**
+	 * Notifies all listeners that a request progressed.
+	 * 
+	 * @param node
+	 *            The node that runs the request
+	 * @param request
+	 *            The request
+	 * @param totalBlocks
+	 *            The total number of blocks
+	 * @param requiredBlocks
+	 *            The number of required blocks
+	 * @param successfulBlocks
+	 *            The number of successful blocks
+	 * @param failedBlocks
+	 *            The number of failed blocks
+	 * @param fatallyFailedBlocks
+	 *            The number of fatally failed blocks
+	 * @param finalizedTotal
+	 *            <code>true</code> if the total number of blocks in final,
+	 *            <code>false</code> otherwise
+	 */
+	private void fireRequestProgressed(Node node, Request request, int totalBlocks, int requiredBlocks, int successfulBlocks, int failedBlocks, int fatallyFailedBlocks, boolean finalizedTotal) {
+		for (RequestListener requestListener: requestListeners) {
+			requestListener.requestProgressed(node, request, totalBlocks, requiredBlocks, successfulBlocks, failedBlocks, fatallyFailedBlocks, finalizedTotal);
+		}
+	}
+
 	//
 	// ACCESSORS
 	//
@@ -168,7 +197,15 @@ public class RequestManager implements NodeListener {
 	 * {@inheritDoc}
 	 */
 	public void nodeAdded(Node node) {
-		/* ignore. */
+		HighLevelClient highLevelClient = nodeManager.borrowHighLevelClient(node);
+		if (highLevelClient == null) {
+			return;
+		}
+		try {
+			highLevelClient.addHighLevelProgressListener(this);
+		} finally {
+			nodeManager.returnHighLevelClient(highLevelClient);
+		}
 	}
 
 	/**
@@ -208,4 +245,16 @@ public class RequestManager implements NodeListener {
 		/* TODO - remove all requests. */
 	}
 
+	//
+	// INTERFACE HighLevelProgressListener
+	//
+
+	/**
+	 * @see net.pterodactylus.fcp.highlevel.HighLevelProgressListener#progressReceived(java.lang.String,
+	 *      net.pterodactylus.fcp.highlevel.HighLevelProgress)
+	 */
+	public void progressReceived(String identifier, HighLevelProgress highLevelProgress) {
+		fireRequestProgressed(null, new Request(identifier), highLevelProgress.getTotalBlocks(), highLevelProgress.getRequiredBlocks(), highLevelProgress.getSuccessfulBlocks(), highLevelProgress.getFailedBlocks(), highLevelProgress.getFatallyFailedBlocks(), highLevelProgress.isTotalFinalized());
+	}
+
 }