package net.pterodactylus.fcp.highlevel;
+import java.io.Closeable;
import java.io.IOException;
import java.io.InputStream;
import java.net.InetAddress;
*
* @author David ‘Bombe’ Roden <bombe@freenetproject.org>
*/
-public class FcpClient {
+public class FcpClient implements Closeable {
/** Object used for synchronization. */
private final Object syncObject = new Object();
}
/**
- * Returns the file with the given URI.
+ * Returns the file with the given URI. The retrieved data will be run
+ * through Freenet’s content filter.
*
* @param uri
* The URI to get
* if an FCP error occurs
*/
public GetResult getURI(final String uri) throws IOException, FcpException {
+ return getURI(uri, true);
+ }
+
+ /**
+ * Returns the file with the given URI.
+ *
+ * @param uri
+ * The URI to get
+ * @param filterData
+ * {@code true} to filter the retrieved data, {@code false}
+ * otherwise
+ * @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, final boolean filterData) throws IOException, FcpException {
checkConnected(true);
final GetResult getResult = new GetResult();
new ExtendedFcpAdapter() {
@SuppressWarnings("synthetic-access")
public void run() throws IOException {
ClientGet clientGet = new ClientGet(uri, identifier);
+ clientGet.setFilterData(filterData);
fcpConnection.sendMessage(clientGet);
}
if (!getFailed.getIdentifier().equals(identifier)) {
return;
}
- if (getFailed.getCode() == 27) {
+ if ((getFailed.getCode() == 27) || (getFailed.getCode() == 24)) {
/* redirect! */
String newUri = getFailed.getRedirectURI();
getResult.realUri(newUri);
try {
- fcpConnection.sendMessage(new ClientGet(newUri, identifier));
+ ClientGet clientGet = new ClientGet(newUri, identifier);
+ clientGet.setFilterData(filterData);
+ fcpConnection.sendMessage(clientGet);
} catch (IOException ioe1) {
getResult.success(false).exception(ioe1);
completionLatch.countDown();
}
/**
+ * {@inheritDoc}
+ */
+ @Override
+ public void close() {
+ disconnect();
+ }
+
+ /**
* Returns whether this client is currently connected.
*
* @return {@code true} if the client is currently connected, {@code false}
/**
* {@inheritDoc}
*/
+ @Override
public boolean filterObject(Request request) {
return request instanceof GetRequest;
}
/**
* {@inheritDoc}
*/
+ @Override
public boolean filterObject(Request request) {
return request instanceof PutRequest;
}