X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fcore%2FRequestManager.java;h=3b98dc2c97f911ba3f6d8ef25aafcda4229a7e4f;hb=e99f6d1dafdf8733125537e8ab36d0fedc325630;hp=002cd17748ecbf4f5ac60d56054148786daf59d8;hpb=f58c676a286a7cd8d37c3f510e787144a9bff5ad;p=jSite2.git

diff --git a/src/net/pterodactylus/jsite/core/RequestManager.java b/src/net/pterodactylus/jsite/core/RequestManager.java
index 002cd17..3b98dc2 100644
--- a/src/net/pterodactylus/jsite/core/RequestManager.java
+++ b/src/net/pterodactylus/jsite/core/RequestManager.java
@@ -25,7 +25,6 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -60,7 +59,7 @@ public class RequestManager implements NodeListener, HighLevelProgressListener {
 
 	/** Request lists for all nodes. */
 	@SuppressWarnings("unused")
-	private Map<Node, Set<Request>> nodeRequests = Collections.synchronizedMap(new HashMap<Node, Set<Request>>());
+	private Map<Node, Map<String, Request>> nodeRequests = Collections.synchronizedMap(new HashMap<Node, Map<String, Request>>());
 
 	//
 	// EVENT MANAGEMENT
@@ -89,41 +88,36 @@ public class RequestManager implements NodeListener, HighLevelProgressListener {
 	/**
 	 * Notifies all listeners that a request was added.
 	 * 
-	 * @param node
-	 *            The node that added the request
 	 * @param request
 	 *            The request that was added
 	 */
-	private void fireRequestAdded(Node node, Request request) {
+	private void fireRequestAdded(Request request) {
 		for (RequestListener requestListener: requestListeners) {
-			requestListener.requestAdded(node, request);
+			requestListener.requestAdded(request);
 		}
 	}
 
 	/**
 	 * 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) {
+	private void fireRequestProgressed(Request request) {
 		for (RequestListener requestListener: requestListeners) {
-			requestListener.requestProgressed(node, request, totalBlocks, requiredBlocks, successfulBlocks, failedBlocks, fatallyFailedBlocks, finalizedTotal);
+			requestListener.requestProgressed(request);
+		}
+	}
+
+	/**
+	 * Notifies all listeners that a request was removed.
+	 * 
+	 * @param request
+	 *            The request that was removed
+	 */
+	private void fireRequestRemoved(Request request) {
+		for (RequestListener requestListener: requestListeners) {
+			requestListener.requestRemoved(request);
 		}
 	}
 
@@ -164,6 +158,8 @@ public class RequestManager implements NodeListener, HighLevelProgressListener {
 			logger.log(Level.WARNING, "no client for node: " + node);
 			return;
 		}
+		final Map<String, Request> identifierRequests = Collections.synchronizedMap(new HashMap<String, Request>());
+		nodeRequests.put(node, identifierRequests);
 		HighLevelCallback<RequestListResult> requestListCallback = highLevelClient.getRequests();
 		requestListCallback.addHighLevelCallbackListener(new HighLevelCallbackListener<RequestListResult>() {
 
@@ -177,9 +173,15 @@ public class RequestManager implements NodeListener, HighLevelProgressListener {
 					return;
 				}
 				for (RequestResult requestResult: requestListResult) {
-					Request request = new Request(requestResult.getIdentifier());
-					/* TODO - fill request */
-					fireRequestAdded(node, request);
+						String identifier = requestResult.getIdentifier();
+						logger.log(Level.FINER, "got identifier: " + identifier);
+						if (identifierRequests.containsKey(identifier)) {
+							continue;
+						}
+						Request request = new Request(node, identifier);
+						identifierRequests.put(requestResult.getIdentifier(), request);
+						/* TODO - fill request */
+						fireRequestAdded(request);
 				}
 			}
 		});
@@ -241,11 +243,15 @@ public class RequestManager implements NodeListener, HighLevelProgressListener {
 	 * {@inheritDoc}
 	 */
 	public void nodeDisconnected(Node node, Throwable throwable) {
-		HighLevelClient highLevelClient = nodeManager.getHighLevelClient(node);
-		if (highLevelClient == null) {
-			logger.warning("got nodeDisconnected from node without high-level client: " + node);
+		Map<String, Request> identifierRequests = nodeRequests.get(node);
+		if (identifierRequests == null) {
+			logger.warning("got node without request map: " + node);
 			return;
 		}
+		for (Request request: identifierRequests.values()) {
+			fireRequestRemoved(request);
+		}
+		identifierRequests.clear();
 	}
 
 	//
@@ -253,11 +259,35 @@ public class RequestManager implements NodeListener, HighLevelProgressListener {
 	//
 
 	/**
-	 * @see net.pterodactylus.fcp.highlevel.HighLevelProgressListener#progressReceived(java.lang.String,
-	 *      net.pterodactylus.fcp.highlevel.HighLevelProgress)
+	 * @see net.pterodactylus.fcp.highlevel.HighLevelProgressListener#progressReceived(HighLevelClient,
+	 *      String, 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());
+	public void progressReceived(HighLevelClient highLevelClient, String identifier, HighLevelProgress highLevelProgress) {
+		Node node = nodeManager.getNode(highLevelClient);
+		if (node == null) {
+			logger.warning("got high-level client without node: " + highLevelClient);
+			return;
+		}
+		Map<String, Request> identifierRequests = nodeRequests.get(node);
+		if (identifierRequests == null) {
+			logger.warning("got node without request map: " + node);
+			identifierRequests = Collections.synchronizedMap(new HashMap<String, Request>());
+			nodeRequests.put(node, identifierRequests);
+		}
+		Request request = identifierRequests.get(identifier);
+			if (request == null) {
+				logger.warning("got progress for unknown request: " + identifier);
+				request = new Request(node, identifier);
+				identifierRequests.put(identifier, request);
+				fireRequestAdded(request);
+			}
+		request.setTotalBlocks(highLevelProgress.getTotalBlocks());
+		request.setRequiredBlocks(highLevelProgress.getRequiredBlocks());
+		request.setSuccessfulBlocks(highLevelProgress.getSuccessfulBlocks());
+		request.setFailedBlocks(highLevelProgress.getFailedBlocks());
+		request.setFatallyFailedBlocks(highLevelProgress.getFatallyFailedBlocks());
+		request.setTotalFinalized(highLevelProgress.isTotalFinalized());
+		fireRequestProgressed(request);
 	}
 
 }