X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fnet%2Fpterodactylus%2Ffcp%2Fhighlevel%2FHighLevelClient.java;h=231d383339fb939ebe8224f7c94ad25aed4568f3;hb=33eef3fb07a6d4b97ba0ff77216ae56606a491bb;hp=a347e68e53f6fb2253cb785470b7eef85766a8d5;hpb=5f2cf2dc2269c59ad3fbcc0e8bdf822bbb6aed23;p=jFCPlib.git
diff --git a/src/net/pterodactylus/fcp/highlevel/HighLevelClient.java b/src/net/pterodactylus/fcp/highlevel/HighLevelClient.java
index a347e68..231d383 100644
--- a/src/net/pterodactylus/fcp/highlevel/HighLevelClient.java
+++ b/src/net/pterodactylus/fcp/highlevel/HighLevelClient.java
@@ -90,9 +90,8 @@ import net.pterodactylus.fcp.WatchGlobal;
/**
* A high-level client that allows simple yet full-featured access to a Freenet
* node.
- *
+ *
* @author David âBombeâ Roden <bombe@freenetproject.org>
- * @version $Id$
*/
public class HighLevelClient {
@@ -141,7 +140,7 @@ public class HighLevelClient {
/**
* Creates a new high-level client that connects to a node on
* localhost
.
- *
+ *
* @param clientName
* The name of the client
*/
@@ -155,7 +154,7 @@ public class HighLevelClient {
/**
* Adds the given high-level client listener to list of listeners.
- *
+ *
* @param highLevelClientListener
* The listener to add
*/
@@ -165,7 +164,7 @@ public class HighLevelClient {
/**
* Removes the given high-level client listener from the list of listeners.
- *
+ *
* @param highLevelClientListener
* The listener to remove
*/
@@ -177,27 +176,27 @@ public class HighLevelClient {
* Notifies all listeners that a client has connected.
*/
private void fireClientConnected() {
- for (HighLevelClientListener highLevelClientListener: highLevelClientListeners) {
+ for (HighLevelClientListener highLevelClientListener : highLevelClientListeners) {
highLevelClientListener.clientConnected(this);
}
}
/**
* Notifies all listeners that a client has disconnected.
- *
+ *
* @param throwable
* The exception that caused the disconnect, or null
* if there was no exception
*/
private void fireClientDisconnected(Throwable throwable) {
- for (HighLevelClientListener highLevelClientListener: highLevelClientListeners) {
+ for (HighLevelClientListener highLevelClientListener : highLevelClientListeners) {
highLevelClientListener.clientDisconnected(this, throwable);
}
}
/**
* Adds a high-level progress listener.
- *
+ *
* @param highLevelProgressListener
* The high-level progress listener to add
*/
@@ -207,7 +206,7 @@ public class HighLevelClient {
/**
* Removes a high-level progress listener.
- *
+ *
* @param highLevelProgressListener
* The high-level progress listener to remove
*/
@@ -218,14 +217,14 @@ public class HighLevelClient {
/**
* Notifies all listeners that the request with the given identifier made
* some progress.
- *
+ *
* @param identifier
* The identifier of the request
* @param highLevelProgress
* The progress of the request
*/
private void fireProgressReceived(String identifier, HighLevelProgress highLevelProgress) {
- for (HighLevelProgressListener highLevelProgressListener: highLevelProgressListeners) {
+ for (HighLevelProgressListener highLevelProgressListener : highLevelProgressListeners) {
highLevelProgressListener.progressReceived(this, identifier, highLevelProgress);
}
}
@@ -238,7 +237,7 @@ public class HighLevelClient {
* Returns the FCP connection that backs this high-level client. This method
* should be used with care as fiddling around with the FCP connection can
* easily break the high-level client if you donât know what youâre doing!
- *
+ *
* @return The FCP connection of this client
*/
public FcpConnection getFcpConnection() {
@@ -247,7 +246,7 @@ public class HighLevelClient {
/**
* Returns whether the node is connected.
- *
+ *
* @return true
if the node is currently connected,
* false
otherwise
*/
@@ -261,7 +260,7 @@ public class HighLevelClient {
/**
* Connects the client.
- *
+ *
* @param hostname
* The hostname of the node
* @return A callback with a connection result
@@ -276,7 +275,7 @@ public class HighLevelClient {
/**
* Connects the client.
- *
+ *
* @param hostname
* The hostname of the node
* @param port
@@ -293,7 +292,7 @@ public class HighLevelClient {
/**
* Connects the client.
- *
+ *
* @param address
* The address of the node
* @param port
@@ -303,13 +302,20 @@ public class HighLevelClient {
* if an I/O error occurs communicating with the node
*/
public HighLevelCallback connect(InetAddress address, int port) throws IOException {
- fcpConnection = new FcpConnection(address, port);
- fcpConnection.addFcpListener(highLevelClientFcpListener);
- fcpConnection.connect();
- ClientHello clientHello = new ClientHello(clientName);
- connectCallback = new HighLevelCallback(new ConnectResult());
- fcpConnection.sendMessage(clientHello);
- return connectCallback;
+ try {
+ synchronized (this) {
+ fcpConnection = new FcpConnection(address, port);
+ }
+ fcpConnection.addFcpListener(highLevelClientFcpListener);
+ fcpConnection.connect();
+ ClientHello clientHello = new ClientHello(clientName);
+ connectCallback = new HighLevelCallback(new ConnectResult());
+ fcpConnection.sendMessage(clientHello);
+ return connectCallback;
+ } catch (IOException ioe1) {
+ fcpConnection = null;
+ throw ioe1;
+ }
}
/**
@@ -321,12 +327,15 @@ public class HighLevelClient {
/**
* Generates a new SSK keypair.
- *
+ *
* @return A callback with the keypair
* @throws IOException
* if an I/O error occurs communicating with the node
+ * @throws HighLevelException
+ * if the client is not connected
*/
- public HighLevelCallback generateKey() throws IOException {
+ public HighLevelCallback generateKey() throws IOException, HighLevelException {
+ checkConnection();
String identifier = generateIdentifier("generateSSK");
GenerateSSK generateSSK = new GenerateSSK(identifier);
HighLevelCallback keyGenerationCallback = new HighLevelCallback(new KeyGenerationResult(identifier));
@@ -337,27 +346,33 @@ public class HighLevelClient {
/**
* Sets whether to watch the global queue.
- *
+ *
* @param enabled
- * true
to watch the global queue in addition to
- * the client-local queue, false
to only watch the
+ * true
to watch the global queue in addition to the
+ * client-local queue, false
to only watch the
* client-local queue
* @throws IOException
* if an I/O error occurs communicating with the node
+ * @throws HighLevelException
+ * if the client is not connected
*/
- public void setWatchGlobal(boolean enabled) throws IOException {
+ public void setWatchGlobal(boolean enabled) throws IOException, HighLevelException {
+ checkConnection();
WatchGlobal watchGlobal = new WatchGlobal(enabled);
fcpConnection.sendMessage(watchGlobal);
}
/**
* Gets a list of all peers from the node.
- *
+ *
* @return A callback with the peer list
* @throws IOException
* if an I/O error occurs with the node
+ * @throws HighLevelException
+ * if the client is not connected
*/
- public HighLevelCallback getPeers() throws IOException {
+ public HighLevelCallback getPeers() throws IOException, HighLevelException {
+ checkConnection();
String identifier = generateIdentifier("listPeers");
ListPeers listPeers = new ListPeers(identifier, true, true);
HighLevelCallback peerListCallback = new HighLevelCallback(new PeerListResult(identifier));
@@ -368,14 +383,17 @@ public class HighLevelClient {
/**
* Adds the peer whose noderef is stored in the given file.
- *
+ *
* @param nodeRefFile
* The name of the file the peerâs noderef is stored in
* @return A peer callback
* @throws IOException
* if an I/O error occurs communicating with the node
+ * @throws HighLevelException
+ * if the client is not connected
*/
- public HighLevelCallback addPeer(String nodeRefFile) throws IOException {
+ public HighLevelCallback addPeer(String nodeRefFile) throws IOException, HighLevelException {
+ checkConnection();
String identifier = generateIdentifier("addPeer");
AddPeer addPeer = new AddPeer(nodeRefFile);
HighLevelCallback peerCallback = new HighLevelCallback(new PeerResult(identifier));
@@ -386,14 +404,17 @@ public class HighLevelClient {
/**
* Adds the peer whose noderef is stored in the given file.
- *
+ *
* @param nodeRefURL
* The URL where the peerâs noderef is stored
* @return A peer callback
* @throws IOException
* if an I/O error occurs communicating with the node
+ * @throws HighLevelException
+ * if the client is not connected
*/
- public HighLevelCallback addPeer(URL nodeRefURL) throws IOException {
+ public HighLevelCallback addPeer(URL nodeRefURL) throws IOException, HighLevelException {
+ checkConnection();
String identifier = generateIdentifier("addPeer");
AddPeer addPeer = new AddPeer(nodeRefURL);
HighLevelCallback peerCallback = new HighLevelCallback(new PeerResult(identifier));
@@ -404,14 +425,17 @@ public class HighLevelClient {
/**
* Adds the peer whose noderef is stored in the given file.
- *
+ *
* @param nodeRef
* The peerâs noderef
* @return A peer callback
* @throws IOException
* if an I/O error occurs communicating with the node
+ * @throws HighLevelException
+ * if the client is not connected
*/
- public HighLevelCallback addPeer(NodeRef nodeRef) throws IOException {
+ public HighLevelCallback addPeer(NodeRef nodeRef) throws IOException, HighLevelException {
+ checkConnection();
String identifier = generateIdentifier("addPeer");
AddPeer addPeer = new AddPeer(nodeRef);
HighLevelCallback peerCallback = new HighLevelCallback(new PeerResult(identifier));
@@ -424,7 +448,7 @@ public class HighLevelClient {
* Checks whether direct disk access for the given directory is possible.
* You have to perform this check before you can upload or download anything
* from or the disk directly!
- *
+ *
* @param directory
* The directory to check
* @param wantRead
@@ -433,8 +457,12 @@ public class HighLevelClient {
* Whether you want to write to the given directory
* @return A direct disk access callback
* @throws IOException
+ * if an I/O error occurs communicating with the node
+ * @throws HighLevelException
+ * if the client is not connected
*/
- public HighLevelCallback checkDirectDiskAccess(String directory, boolean wantRead, boolean wantWrite) throws IOException {
+ public HighLevelCallback checkDirectDiskAccess(String directory, boolean wantRead, boolean wantWrite) throws IOException, HighLevelException {
+ checkConnection();
TestDDARequest testDDARequest = new TestDDARequest(directory, wantRead, wantWrite);
HighLevelCallback directDiskAccessCallback = new HighLevelCallback(new DirectDiskAccessResult(directory));
directDiskAccessCallbacks.put(directory, directDiskAccessCallback);
@@ -446,7 +474,7 @@ public class HighLevelClient {
* Starts a download. Files can either be download to disk or streamed from
* the node. When downloading to disk you have to perform a direct disk
* access check for the directory you want to put the downloaded file in!
- *
+ *
* @see #checkDirectDiskAccess(String, boolean, boolean)
* @param uri
* The URI to get
@@ -459,8 +487,11 @@ public class HighLevelClient {
* @return A download result
* @throws IOException
* if an I/O error occurs communicating with the node
+ * @throws HighLevelException
+ * if the client is not connected
*/
- public HighLevelProgressCallback download(String uri, String filename, boolean global) throws IOException {
+ public HighLevelProgressCallback download(String uri, String filename, boolean global) throws IOException, HighLevelException {
+ checkConnection();
String identifier = generateIdentifier("download");
ClientGet clientGet = new ClientGet(uri, identifier, (filename == null) ? ReturnType.direct : ReturnType.disk);
clientGet.setGlobal(global);
@@ -472,12 +503,15 @@ public class HighLevelClient {
/**
* Requests a list of all running requests from the node.
- *
+ *
* @return The request list result
* @throws IOException
* if an I/O errors communicating with the node
+ * @throws HighLevelException
+ * if the client is not connected
*/
- public HighLevelCallback getRequests() throws IOException {
+ public HighLevelCallback getRequests() throws IOException, HighLevelException {
+ checkConnection();
String identifier = generateIdentifier("list-persistent-requests");
ListPersistentRequests listPersistentRequests = new ListPersistentRequests();
synchronized (syncObject) {
@@ -495,8 +529,23 @@ public class HighLevelClient {
//
/**
+ * Checks whether the client is already connected and throws an exception if
+ * it is not.
+ *
+ * @throws NotConnectedException
+ * if the client is not connected
+ */
+ private void checkConnection() throws NotConnectedException {
+ synchronized (this) {
+ if (fcpConnection == null) {
+ throw new NotConnectedException("client is not connected");
+ }
+ }
+ }
+
+ /**
* Generates an identifier for the given function.
- *
+ *
* @param function
* The name of the function
* @return An identifier
@@ -508,7 +557,7 @@ public class HighLevelClient {
/**
* Disconnects the client from the node, handing the given Throwable to
* {@link #fireClientDisconnected(Throwable)}.
- *
+ *
* @param throwable
* The exception that caused the disconnect, or null
* if there was no exception
@@ -522,9 +571,8 @@ public class HighLevelClient {
/**
* FCP listener for {@link HighLevelClient}.
- *
+ *
* @author David âBombeâ Roden <bombe@freenetproject.org>
- * @version $Id$
*/
private class HighLevelClientFcpListener implements FcpListener {
@@ -545,7 +593,7 @@ public class HighLevelClient {
/**
* Searches all callback collections for a callback with the given
* identifier and cancels it.
- *
+ *
* @param identifier
* The identifier to search for, or null
to
* cancel all pending requests
@@ -566,31 +614,31 @@ public class HighLevelClient {
}
if (identifier == null) {
/* key generation callbacks */
- for (Entry> keyGenerationEntry: keyGenerationCallbacks.entrySet()) {
+ for (Entry> keyGenerationEntry : keyGenerationCallbacks.entrySet()) {
keyGenerationEntry.getValue().getIntermediaryResult().setFailed(true);
keyGenerationEntry.getValue().setDone();
}
keyGenerationCallbacks.clear();
/* peer list callbacks. */
- for (Entry> peerListEntry: peerListCallbacks.entrySet()) {
+ for (Entry> peerListEntry : peerListCallbacks.entrySet()) {
peerListEntry.getValue().getIntermediaryResult().setFailed(true);
peerListEntry.getValue().setDone();
}
peerListCallbacks.clear();
/* peer callbacks. */
- for (Entry> peerEntry: peerCallbacks.entrySet()) {
+ for (Entry> peerEntry : peerCallbacks.entrySet()) {
peerEntry.getValue().getIntermediaryResult().setFailed(true);
peerEntry.getValue().setDone();
}
peerCallbacks.clear();
/* direct disk access callbacks. */
- for (Entry> directDiskAccessEntry: directDiskAccessCallbacks.entrySet()) {
+ for (Entry> directDiskAccessEntry : directDiskAccessCallbacks.entrySet()) {
directDiskAccessEntry.getValue().getIntermediaryResult().setFailed(true);
directDiskAccessEntry.getValue().setDone();
}
directDiskAccessCallbacks.clear();
/* download callbacks. */
- for (Entry> downloadEntry: downloadCallbacks.entrySet()) {
+ for (Entry> downloadEntry : downloadCallbacks.entrySet()) {
downloadEntry.getValue().getIntermediaryResult().setFailed(true);
downloadEntry.getValue().setDone();
}
@@ -631,7 +679,7 @@ public class HighLevelClient {
/**
* Reads the given file and returns the first line of the file.
- *
+ *
* @param readFilename
* The name of the file to read
* @return The content of the file
@@ -655,7 +703,7 @@ public class HighLevelClient {
/**
* Writes the given content to the given file.
- *
+ *
* @param directDiskAccessResult
* The DDA result
* @param writeFilename
@@ -681,7 +729,7 @@ public class HighLevelClient {
/**
* Cleans up any files that written for the given result.
- *
+ *
* @param directDiskAccessResult
* The direct disk access result
*/
@@ -741,8 +789,22 @@ public class HighLevelClient {
* @see net.pterodactylus.fcp.FcpListener#receivedDataFound(net.pterodactylus.fcp.FcpConnection,
* net.pterodactylus.fcp.DataFound)
*/
+ @SuppressWarnings("synthetic-access")
public void receivedDataFound(FcpConnection fcpConnection, DataFound dataFound) {
- /* TODO */
+ if (fcpConnection != HighLevelClient.this.fcpConnection) {
+ return;
+ }
+ String identifier = dataFound.getIdentifier();
+ HighLevelProgressCallback downloadCallback = downloadCallbacks.get(identifier);
+ if (downloadCallback != null) {
+ DownloadResult downloadResult = downloadCallback.getIntermediaryResult();
+ downloadResult.setFinished(true);
+ downloadResult.setFailed(false);
+ downloadCallback.progressUpdated();
+ downloadCallback.setDone();
+ }
+ HighLevelProgress highLevelProgress = new HighLevelProgress(identifier, true);
+ fireProgressReceived(identifier, highLevelProgress);
}
/**
@@ -809,7 +871,9 @@ public class HighLevelClient {
String identifier = getFailed.getIdentifier();
HighLevelProgressCallback downloadCallback = downloadCallbacks.remove(identifier);
if (downloadCallback != null) {
- downloadCallback.getIntermediaryResult().setFailed(true);
+ DownloadResult downloadResult = downloadCallback.getIntermediaryResult();
+ downloadResult.setFailed(true);
+ downloadResult.setFinished(true);
downloadCallback.setDone();
return;
}
@@ -1004,24 +1068,61 @@ public class HighLevelClient {
* @see net.pterodactylus.fcp.FcpListener#receivedPutFailed(net.pterodactylus.fcp.FcpConnection,
* net.pterodactylus.fcp.PutFailed)
*/
+ @SuppressWarnings("synthetic-access")
public void receivedPutFailed(FcpConnection fcpConnection, PutFailed putFailed) {
- /* TODO */
+ if (fcpConnection != HighLevelClient.this.fcpConnection) {
+ return;
+ }
+ String identifier = putFailed.getIdentifier();
+ HighLevelProgressCallback downloadCallback = downloadCallbacks.get(identifier);
+ if (downloadCallback != null) {
+ DownloadResult downloadResult = downloadCallback.getIntermediaryResult();
+ downloadResult.setFailed(true);
+ downloadResult.setFinished(true);
+ downloadCallback.progressUpdated();
+ downloadCallback.setDone();
+ }
+ /* TODO - check inserts */
+ HighLevelProgress highLevelProgress = new HighLevelProgress(identifier, true);
+ fireProgressReceived(identifier, highLevelProgress);
}
/**
* @see net.pterodactylus.fcp.FcpListener#receivedPutFetchable(net.pterodactylus.fcp.FcpConnection,
* net.pterodactylus.fcp.PutFetchable)
*/
+ @SuppressWarnings("synthetic-access")
public void receivedPutFetchable(FcpConnection fcpConnection, PutFetchable putFetchable) {
- /* TODO */
+ if (fcpConnection != HighLevelClient.this.fcpConnection) {
+ return;
+ }
+ String identifier = putFetchable.getIdentifier();
+ /* TODO - check inserts */
+ HighLevelProgress highLevelProgress = new HighLevelProgress(identifier);
+ highLevelProgress.setFetchable(true);
+ fireProgressReceived(identifier, highLevelProgress);
}
/**
* @see net.pterodactylus.fcp.FcpListener#receivedPutSuccessful(net.pterodactylus.fcp.FcpConnection,
* net.pterodactylus.fcp.PutSuccessful)
*/
+ @SuppressWarnings("synthetic-access")
public void receivedPutSuccessful(FcpConnection fcpConnection, PutSuccessful putSuccessful) {
- /* TODO */
+ if (fcpConnection != HighLevelClient.this.fcpConnection) {
+ return;
+ }
+ String identifier = putSuccessful.getIdentifier();
+ HighLevelProgressCallback downloadCallback = downloadCallbacks.get(identifier);
+ if (downloadCallback != null) {
+ DownloadResult downloadResult = downloadCallback.getIntermediaryResult();
+ downloadResult.setFinished(true);
+ downloadResult.setFailed(false);
+ downloadCallback.progressUpdated();
+ }
+ /* TODO - check inserts */
+ HighLevelProgress highLevelProgress = new HighLevelProgress(identifier, true);
+ fireProgressReceived(identifier, highLevelProgress);
}
/**
@@ -1064,6 +1165,7 @@ public class HighLevelClient {
downloadResult.setTotalFinalized(simpleProgress.isFinalizedTotal());
downloadCallback.progressUpdated();
}
+ /* TODO - check inserts */
HighLevelProgress highLevelProgress = new HighLevelProgress(identifier, simpleProgress.getTotal(), simpleProgress.getRequired(), simpleProgress.getSucceeded(), simpleProgress.getFailed(), simpleProgress.getFatallyFailed(), simpleProgress.isFinalizedTotal());
fireProgressReceived(identifier, highLevelProgress);
}
@@ -1136,8 +1238,15 @@ public class HighLevelClient {
* @see net.pterodactylus.fcp.FcpListener#receivedURIGenerated(net.pterodactylus.fcp.FcpConnection,
* net.pterodactylus.fcp.URIGenerated)
*/
+ @SuppressWarnings("synthetic-access")
public void receivedURIGenerated(FcpConnection fcpConnection, URIGenerated uriGenerated) {
- /* TODO */
+ if (fcpConnection != HighLevelClient.this.fcpConnection) {
+ return;
+ }
+ String identifier = uriGenerated.getIdentifier();
+ /* TODO - check inserts */
+ HighLevelProgress highLevelProgress = new HighLevelProgress(identifier, uriGenerated.getURI());
+ fireProgressReceived(identifier, highLevelProgress);
}
/**