X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Fjsite%2Fcore%2FRequestManager.java;h=b4df6f2fafa8792be481bb79e2d5618df2f766f8;hb=5c4c95f6e37d87251f64b5b6f6d661123dfc6469;hp=4e23d7986f86064aebc0c18ef6777d8cdbc46a88;hpb=9030b0e6266f4962aee282fa3ec689547775b925;p=jSite2.git

diff --git a/src/net/pterodactylus/jsite/core/RequestManager.java b/src/net/pterodactylus/jsite/core/RequestManager.java
index 4e23d79..b4df6f2 100644
--- a/src/net/pterodactylus/jsite/core/RequestManager.java
+++ b/src/net/pterodactylus/jsite/core/RequestManager.java
@@ -47,9 +47,8 @@ import net.pterodactylus.util.logging.Logging;
  * The request manager is added to the {@link NodeManager} as a
  * {@link NodeListener} so that it can fire request-removed events in case a
  * node is disconnected.
- * 
+ *
  * @author David ‘Bombe’ Roden <bombe@freenetproject.org>
- * @version $Id$
  */
 public class RequestManager implements NodeListener, HighLevelProgressListener {
 
@@ -63,7 +62,6 @@ public class RequestManager implements NodeListener, HighLevelProgressListener {
 	private NodeManager nodeManager;
 
 	/** Request lists for all nodes. */
-	@SuppressWarnings("unused")
 	private Map<Node, Map<String, Request>> nodeRequests = Collections.synchronizedMap(new HashMap<Node, Map<String, Request>>());
 
 	//
@@ -72,7 +70,7 @@ public class RequestManager implements NodeListener, HighLevelProgressListener {
 
 	/**
 	 * Adds a request listener.
-	 * 
+	 *
 	 * @param requestListener
 	 *            The request listener to add
 	 */
@@ -82,7 +80,7 @@ public class RequestManager implements NodeListener, HighLevelProgressListener {
 
 	/**
 	 * Removes a request listener.
-	 * 
+	 *
 	 * @param requestListener
 	 *            The request listener to remove
 	 */
@@ -92,47 +90,75 @@ public class RequestManager implements NodeListener, HighLevelProgressListener {
 
 	/**
 	 * Notifies all listeners that a request was added.
-	 * 
+	 *
 	 * @param request
 	 *            The request that was added
 	 */
 	private void fireRequestAdded(Request request) {
-		for (RequestListener requestListener: requestListeners) {
+		for (RequestListener requestListener : requestListeners) {
 			requestListener.requestAdded(request);
 		}
 	}
 
 	/**
 	 * Notifies all listeners that a request progressed.
-	 * 
+	 *
 	 * @param request
 	 *            The request
 	 */
 	private void fireRequestProgressed(Request request) {
-		for (RequestListener requestListener: requestListeners) {
+		for (RequestListener requestListener : requestListeners) {
 			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) {
+		for (RequestListener requestListener : requestListeners) {
 			requestListener.requestRemoved(request);
 		}
 	}
 
+	/**
+	 * Notifies all listeners that a request has finished.
+	 *
+	 * @see RequestListener#requestFinished(Request)
+	 * @param request
+	 *            The request that has finished
+	 */
+	private void fireRequestFinished(Request request) {
+		for (RequestListener requestListener : requestListeners) {
+			requestListener.requestFinished(request);
+		}
+	}
+
+	/**
+	 * Notifies all listeners that a request has generated a URI.
+	 *
+	 * @see RequestListener#requestGeneratedURI(Request, String)
+	 * @param request
+	 *            The request that has generated a URI
+	 * @param uri
+	 *            The generated URI
+	 */
+	private void fireRequestGeneratedURI(Request request, String uri) {
+		for (RequestListener requestListener : requestListeners) {
+			requestListener.requestGeneratedURI(request, uri);
+		}
+	}
+
 	//
 	// ACCESSORS
 	//
 
 	/**
 	 * Sets the node manager to use.
-	 * 
+	 *
 	 * @param nodeManager
 	 *            The node manager
 	 */
@@ -151,7 +177,7 @@ public class RequestManager implements NodeListener, HighLevelProgressListener {
 	/**
 	 * Requests a list of all running requests from a node. This method will
 	 * block until the request has been sent!
-	 * 
+	 *
 	 * @param node
 	 *            The node to get all requests for
 	 * @throws IOException
@@ -181,7 +207,7 @@ public class RequestManager implements NodeListener, HighLevelProgressListener {
 						logger.log(Level.SEVERE, "getResult() blocked and was interrupted");
 						return;
 					}
-					for (RequestResult requestResult: requestListResult) {
+					for (RequestResult requestResult : requestListResult) {
 						String identifier = requestResult.getIdentifier();
 						logger.log(Level.FINER, "got identifier: " + identifier);
 						Request request = identifierRequests.get(identifier);
@@ -275,7 +301,7 @@ public class RequestManager implements NodeListener, HighLevelProgressListener {
 			logger.warning("got node without request map: " + node);
 			return;
 		}
-		for (Request request: identifierRequests.values()) {
+		for (Request request : identifierRequests.values()) {
 			fireRequestRemoved(request);
 		}
 		identifierRequests.clear();
@@ -308,13 +334,24 @@ public class RequestManager implements NodeListener, HighLevelProgressListener {
 			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);
+		if (highLevelProgress.isFinished()) {
+			request.setFinished(true);
+			request.setSuccessful(!highLevelProgress.isFailed());
+			fireRequestFinished(request);
+		} else if (highLevelProgress.isFetchable()) {
+			/* TODO - ignore? */
+		} else if (highLevelProgress.getURI() != null) {
+			request.setURI(highLevelProgress.getURI());
+			fireRequestGeneratedURI(request, highLevelProgress.getURI());
+		} else {
+			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);
+		}
 	}
 
 }