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

diff --git a/src/net/pterodactylus/fcp/highlevel/FcpClient.java b/src/net/pterodactylus/fcp/highlevel/FcpClient.java
index 027b415..a958f07 100644
--- a/src/net/pterodactylus/fcp/highlevel/FcpClient.java
+++ b/src/net/pterodactylus/fcp/highlevel/FcpClient.java
@@ -60,6 +60,8 @@ 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;
 
 /**
@@ -213,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() {
 
@@ -254,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
@@ -565,9 +639,30 @@ public class FcpClient {
 	 *             if an FCP error occurs
 	 */
 	public Collection<Request> getGetRequests(final boolean global) throws IOException, FcpException {
-		return getRequests(global);
+		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() {