X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Ffcp%2Fhighlevel%2FFcpClient.java;h=dee33c3e2708e38e82cdc63c0f234a8fa627a716;hb=3d9879f268ac491cfc7ce8d6e3030f75ff2cdd44;hp=b738e262ca8431c69246d4188e4a38d2ca4b9096;hpb=ccd328332da86e58a98e991c3d4e31e56e906547;p=jFCPlib.git

diff --git a/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java b/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java
index b738e26..dee33c3 100644
--- a/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java
+++ b/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java
@@ -28,11 +28,13 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.concurrent.CountDownLatch;
 
 import net.pterodactylus.fcp.AddPeer;
+import net.pterodactylus.fcp.AllData;
+import net.pterodactylus.fcp.ClientGet;
 import net.pterodactylus.fcp.ClientHello;
 import net.pterodactylus.fcp.CloseConnectionDuplicateClientName;
 import net.pterodactylus.fcp.DataFound;
@@ -67,6 +69,7 @@ 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.io.TemporaryInputStream;
 import net.pterodactylus.util.thread.ObjectWrapper;
 
 /**
@@ -92,6 +95,9 @@ public class FcpClient {
 	/** Whether the client is currently connected. */
 	private volatile boolean connected;
 
+	/** The listener for “connection closed” events. */
+	private FcpListener connectionClosedListener;
+
 	/**
 	 * Creates an FCP client with the given name.
 	 *
@@ -147,7 +153,7 @@ public class FcpClient {
 	 *            The Freenet node’s FCP port
 	 */
 	public FcpClient(InetAddress host, int port) {
-		this(new FcpConnection(host, port));
+		this(new FcpConnection(host, port), false);
 	}
 
 	/**
@@ -173,7 +179,7 @@ public class FcpClient {
 	public FcpClient(FcpConnection fcpConnection, boolean connected) {
 		this.fcpConnection = fcpConnection;
 		this.connected = connected;
-		fcpConnection.addFcpListener(new FcpAdapter() {
+		connectionClosedListener = new FcpAdapter() {
 
 			/**
 			 * {@inheritDoc}
@@ -184,7 +190,8 @@ public class FcpClient {
 				FcpClient.this.connected = false;
 				fcpClientListenerManager.fireFcpClientDisconnected();
 			}
-		});
+		};
+		fcpConnection.addFcpListener(connectionClosedListener);
 	}
 
 	//
@@ -299,6 +306,72 @@ public class FcpClient {
 	}
 
 	/**
+	 * Returns the file with the given URI.
+	 *
+	 * @param uri
+	 *            The URI to get
+	 * @return The result of the get request
+	 * @throws IOException
+	 *             if an I/O error occurs
+	 * @throws FcpException
+	 *             if an FCP error occurs
+	 */
+	public GetResult getURI(final String uri) throws IOException, FcpException {
+		checkConnected(true);
+		final GetResult getResult = new GetResult();
+		new ExtendedFcpAdapter() {
+
+			@SuppressWarnings("synthetic-access")
+			private final String identifier = createIdentifier("client-get");
+
+			@Override
+			@SuppressWarnings("synthetic-access")
+			public void run() throws IOException {
+				ClientGet clientGet = new ClientGet(uri, identifier);
+				fcpConnection.sendMessage(clientGet);
+			}
+
+			@Override
+			public void receivedGetFailed(FcpConnection fcpConnection, GetFailed getFailed) {
+				if (!getFailed.getIdentifier().equals(identifier)) {
+					return;
+				}
+				if (getFailed.getCode() == 27) {
+					/* redirect! */
+					String newUri = getFailed.getRedirectURI();
+					getResult.realUri(newUri);
+					try {
+						fcpConnection.sendMessage(new ClientGet(newUri, identifier));
+					} catch (IOException ioe1) {
+						getResult.success(false).exception(ioe1);
+						completionLatch.countDown();
+					}
+				} else {
+					getResult.success(false).errorCode(getFailed.getCode());
+					completionLatch.countDown();
+				}
+			}
+
+			@Override
+			public void receivedAllData(FcpConnection fcpConnection, AllData allData) {
+				if (!allData.getIdentifier().equals(identifier)) {
+					return;
+				}
+				InputStream temporaryInputStream;
+				try {
+					temporaryInputStream = new TemporaryInputStream(allData.getPayloadInputStream());
+					getResult.success(true).contentType(allData.getContentType()).contentLength(allData.getDataLength()).inputStream(temporaryInputStream);
+				} catch (IOException ioe1) {
+					getResult.success(false).exception(ioe1);
+				}
+				completionLatch.countDown();
+			}
+
+		}.execute();
+		return getResult;
+	}
+
+	/**
 	 * Disconnects the FCP client.
 	 */
 	public void disconnect() {
@@ -318,6 +391,13 @@ public class FcpClient {
 		return connected;
 	}
 
+	/**
+	 * Detaches this client from its underlying FCP connection.
+	 */
+	public void detach() {
+		fcpConnection.removeFcpListener(connectionClosedListener);
+	}
+
 	//
 	// PEER MANAGEMENT
 	//