X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Ffcp%2Fhighlevel%2FFcpClient.java;h=a958f07af9853d8dbe79fbbe2bd04c5351691562;hb=5e6ccd8ae5879a82c3e4086baa8847d2ba48dfa6;hp=aa2c8f15dcb6f2ffa3d3e0f125c7381dbc931e44;hpb=fa22404c6b514de83828117b9885a1da1a851481;p=jFCPlib.git

diff --git a/src/net/pterodactylus/fcp/highlevel/FcpClient.java b/src/net/pterodactylus/fcp/highlevel/FcpClient.java
index aa2c8f1..a958f07 100644
--- a/src/net/pterodactylus/fcp/highlevel/FcpClient.java
+++ b/src/net/pterodactylus/fcp/highlevel/FcpClient.java
@@ -23,14 +23,18 @@ import java.io.IOException;
 import java.net.InetAddress;
 import java.net.URL;
 import java.net.UnknownHostException;
+import java.util.Collection;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 
 import net.pterodactylus.fcp.AddPeer;
 import net.pterodactylus.fcp.ClientHello;
 import net.pterodactylus.fcp.CloseConnectionDuplicateClientName;
+import net.pterodactylus.fcp.DataFound;
 import net.pterodactylus.fcp.EndListPeerNotes;
 import net.pterodactylus.fcp.EndListPeers;
 import net.pterodactylus.fcp.EndListPersistentRequests;
@@ -38,6 +42,7 @@ import net.pterodactylus.fcp.FcpAdapter;
 import net.pterodactylus.fcp.FcpConnection;
 import net.pterodactylus.fcp.FcpListener;
 import net.pterodactylus.fcp.GenerateSSK;
+import net.pterodactylus.fcp.GetFailed;
 import net.pterodactylus.fcp.ListPeerNotes;
 import net.pterodactylus.fcp.ListPeers;
 import net.pterodactylus.fcp.ListPersistentRequests;
@@ -49,10 +54,14 @@ import net.pterodactylus.fcp.Peer;
 import net.pterodactylus.fcp.PeerNote;
 import net.pterodactylus.fcp.PeerRemoved;
 import net.pterodactylus.fcp.PersistentGet;
+import net.pterodactylus.fcp.PersistentPut;
 import net.pterodactylus.fcp.ProtocolError;
 import net.pterodactylus.fcp.RemovePeer;
 import net.pterodactylus.fcp.SSKKeypair;
+import net.pterodactylus.fcp.SimpleProgress;
 import net.pterodactylus.fcp.WatchGlobal;
+import net.pterodactylus.util.filter.Filter;
+import net.pterodactylus.util.filter.Filters;
 import net.pterodactylus.util.thread.ObjectWrapper;
 
 /**
@@ -206,7 +215,7 @@ public class FcpClient {
 	 * @throws FcpException
 	 *             if an FCP error occurs
 	 */
-	public Set<Peer> getPeers(final boolean withMetadata, final boolean withVolatile) throws IOException, FcpException {
+	public Collection<Peer> getPeers(final boolean withMetadata, final boolean withVolatile) throws IOException, FcpException {
 		final Set<Peer> peers = Collections.synchronizedSet(new HashSet<Peer>());
 		new ExtendedFcpAdapter() {
 
@@ -247,6 +256,78 @@ public class FcpClient {
 	}
 
 	/**
+	 * Returns all darknet peers.
+	 *
+	 * @param withMetadata
+	 *            <code>true</code> to include peer metadata
+	 * @param withVolatile
+	 *            <code>true</code> to include volatile peer data
+	 * @return A set containing the node’s darknet peers
+	 * @throws IOException
+	 *             if an I/O error occurs
+	 * @throws FcpException
+	 *             if an FCP error occurs
+	 */
+	public Collection<Peer> getDarknetPeers(boolean withMetadata, boolean withVolatile) throws IOException, FcpException {
+		Collection<Peer> allPeers = getPeers(withMetadata, withVolatile);
+		Collection<Peer> darknetPeers = new HashSet<Peer>();
+		for (Peer peer : allPeers) {
+			if (!peer.isOpennet() && !peer.isSeed()) {
+				darknetPeers.add(peer);
+			}
+		}
+		return darknetPeers;
+	}
+
+	/**
+	 * Returns all opennet peers.
+	 *
+	 * @param withMetadata
+	 *            <code>true</code> to include peer metadata
+	 * @param withVolatile
+	 *            <code>true</code> to include volatile peer data
+	 * @return A set containing the node’s opennet peers
+	 * @throws IOException
+	 *             if an I/O error occurs
+	 * @throws FcpException
+	 *             if an FCP error occurs
+	 */
+	public Collection<Peer> getOpennetPeers(boolean withMetadata, boolean withVolatile) throws IOException, FcpException {
+		Collection<Peer> allPeers = getPeers(withMetadata, withVolatile);
+		Collection<Peer> opennetPeers = new HashSet<Peer>();
+		for (Peer peer : allPeers) {
+			if (peer.isOpennet() && !peer.isSeed()) {
+				opennetPeers.add(peer);
+			}
+		}
+		return opennetPeers;
+	}
+
+	/**
+	 * Returns all seed peers.
+	 *
+	 * @param withMetadata
+	 *            <code>true</code> to include peer metadata
+	 * @param withVolatile
+	 *            <code>true</code> to include volatile peer data
+	 * @return A set containing the node’s seed peers
+	 * @throws IOException
+	 *             if an I/O error occurs
+	 * @throws FcpException
+	 *             if an FCP error occurs
+	 */
+	public Collection<Peer> getSeedPeers(boolean withMetadata, boolean withVolatile) throws IOException, FcpException {
+		Collection<Peer> allPeers = getPeers(withMetadata, withVolatile);
+		Collection<Peer> seedPeers = new HashSet<Peer>();
+		for (Peer peer : allPeers) {
+			if (peer.isSeed()) {
+				seedPeers.add(peer);
+			}
+		}
+		return seedPeers;
+	}
+
+	/**
 	 * Adds the given peer to the node.
 	 *
 	 * @param peer
@@ -557,8 +638,33 @@ public class FcpClient {
 	 * @throws FcpException
 	 *             if an FCP error occurs
 	 */
-	public Set<PersistentGet> getGetRequests(final boolean global) throws IOException, FcpException {
-		final Set<PersistentGet> getRequests = Collections.synchronizedSet(new HashSet<PersistentGet>());
+	public Collection<Request> getGetRequests(final boolean global) throws IOException, FcpException {
+		return Filters.filteredCollection(getRequests(global), new Filter<Request>() {
+
+			/**
+			 * {@inheritDoc}
+			 */
+			public boolean filterObject(Request request) {
+				return request instanceof GetRequest;
+			}
+		});
+	}
+
+	/**
+	 * Returns all currently visible persistent requests.
+	 *
+	 * @param global
+	 *            <code>true</code> to return requests from the global queue,
+	 *            <code>false</code> to only show requests from the client-local
+	 *            queue
+	 * @return All requests
+	 * @throws IOException
+	 *             if an I/O error occurs
+	 * @throws FcpException
+	 *             if an FCP error occurs
+	 */
+	public Collection<Request> getRequests(final boolean global) throws IOException, FcpException {
+		final Map<String, Request> requests = Collections.synchronizedMap(new HashMap<String, Request>());
 		new ExtendedFcpAdapter() {
 
 			/**
@@ -576,8 +682,78 @@ public class FcpClient {
 			@Override
 			public void receivedPersistentGet(FcpConnection fcpConnection, PersistentGet persistentGet) {
 				if (!persistentGet.isGlobal() || global) {
-					getRequests.add(persistentGet);
+					GetRequest getRequest = new GetRequest(persistentGet);
+					requests.put(persistentGet.getIdentifier(), getRequest);
+				}
+			}
+
+			/**
+			 * {@inheritDoc}
+			 *
+			 * @see net.pterodactylus.fcp.FcpAdapter#receivedDataFound(net.pterodactylus.fcp.FcpConnection,
+			 *      net.pterodactylus.fcp.DataFound)
+			 */
+			@Override
+			public void receivedDataFound(FcpConnection fcpConnection, DataFound dataFound) {
+				Request getRequest = requests.get(dataFound.getIdentifier());
+				if (getRequest == null) {
+					return;
+				}
+				getRequest.setComplete(true);
+				getRequest.setLength(dataFound.getDataLength());
+				getRequest.setContentType(dataFound.getMetadataContentType());
+			}
+
+			/**
+			 * {@inheritDoc}
+			 *
+			 * @see net.pterodactylus.fcp.FcpAdapter#receivedGetFailed(net.pterodactylus.fcp.FcpConnection,
+			 *      net.pterodactylus.fcp.GetFailed)
+			 */
+			@Override
+			public void receivedGetFailed(FcpConnection fcpConnection, GetFailed getFailed) {
+				Request getRequest = requests.get(getFailed.getIdentifier());
+				if (getRequest == null) {
+					return;
+				}
+				getRequest.setComplete(true);
+				getRequest.setFailed(true);
+				getRequest.setFatal(getFailed.isFatal());
+				getRequest.setErrorCode(getFailed.getCode());
+			}
+
+			/**
+			 * {@inheritDoc}
+			 *
+			 * @see net.pterodactylus.fcp.FcpAdapter#receivedPersistentPut(net.pterodactylus.fcp.FcpConnection,
+			 *      net.pterodactylus.fcp.PersistentPut)
+			 */
+			@Override
+			public void receivedPersistentPut(FcpConnection fcpConnection, PersistentPut persistentPut) {
+				if (!persistentPut.isGlobal() || global) {
+					PutRequest putRequest = new PutRequest(persistentPut);
+					requests.put(persistentPut.getIdentifier(), putRequest);
+				}
+			}
+
+			/**
+			 * {@inheritDoc}
+			 *
+			 * @see net.pterodactylus.fcp.FcpAdapter#receivedSimpleProgress(net.pterodactylus.fcp.FcpConnection,
+			 *      net.pterodactylus.fcp.SimpleProgress)
+			 */
+			@Override
+			public void receivedSimpleProgress(FcpConnection fcpConnection, SimpleProgress simpleProgress) {
+				Request request = requests.get(simpleProgress.getIdentifier());
+				if (request == null) {
+					return;
 				}
+				request.setTotalBlocks(simpleProgress.getTotal());
+				request.setRequiredBlocks(simpleProgress.getRequired());
+				request.setFailedBlocks(simpleProgress.getFailed());
+				request.setFatallyFailedBlocks(simpleProgress.getFatallyFailed());
+				request.setSucceededBlocks(simpleProgress.getSucceeded());
+				request.setFinalizedTotal(simpleProgress.isFinalizedTotal());
 			}
 
 			/**
@@ -588,7 +764,7 @@ public class FcpClient {
 				completionLatch.countDown();
 			}
 		}.execute();
-		return getRequests;
+		return requests.values();
 	}
 
 	//