X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=inline;f=src%2Fnet%2Fpterodactylus%2Ffcp%2Fhighlevel%2FHighLevelClient.java;h=b7064d0842667028f4435ad0d7a8ba3dabc467b6;hb=7b73e6e23b03d9412e9dcc0ff3b4f681baa301c5;hp=93378d34bea36c2df823a440833804e11ef5d41d;hpb=b188a5d4f66c1bc99d5e9695f97fe317393da931;p=jFCPlib.git diff --git a/src/net/pterodactylus/fcp/highlevel/HighLevelClient.java b/src/net/pterodactylus/fcp/highlevel/HighLevelClient.java index 93378d3..b7064d0 100644 --- a/src/net/pterodactylus/fcp/highlevel/HighLevelClient.java +++ b/src/net/pterodactylus/fcp/highlevel/HighLevelClient.java @@ -177,7 +177,7 @@ 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); } } @@ -190,7 +190,7 @@ public class HighLevelClient { * if there was no exception */ private void fireClientDisconnected(Throwable throwable) { - for (HighLevelClientListener highLevelClientListener: highLevelClientListeners) { + for (HighLevelClientListener highLevelClientListener : highLevelClientListeners) { highLevelClientListener.clientDisconnected(this, throwable); } } @@ -225,7 +225,7 @@ public class HighLevelClient { * 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); } } @@ -304,7 +304,9 @@ public class HighLevelClient { */ public HighLevelCallback connect(InetAddress address, int port) throws IOException { try { - fcpConnection = new FcpConnection(address, port); + synchronized (this) { + fcpConnection = new FcpConnection(address, port); + } fcpConnection.addFcpListener(highLevelClientFcpListener); fcpConnection.connect(); ClientHello clientHello = new ClientHello(clientName); @@ -330,8 +332,11 @@ public class HighLevelClient { * @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)); @@ -349,8 +354,11 @@ public class HighLevelClient { * 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); } @@ -361,8 +369,11 @@ public class HighLevelClient { * @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)); @@ -379,8 +390,11 @@ public class HighLevelClient { * @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)); @@ -397,8 +411,11 @@ public class HighLevelClient { * @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)); @@ -415,8 +432,11 @@ public class HighLevelClient { * @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)); @@ -438,8 +458,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); @@ -464,8 +488,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); @@ -481,8 +508,11 @@ public class HighLevelClient { * @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) { @@ -500,6 +530,21 @@ 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 @@ -571,31 +616,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(); } @@ -747,7 +792,20 @@ public class HighLevelClient { * net.pterodactylus.fcp.DataFound) */ 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); } /** @@ -814,7 +872,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; } @@ -1010,7 +1070,21 @@ public class HighLevelClient { * net.pterodactylus.fcp.PutFailed) */ 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); } /** @@ -1018,7 +1092,14 @@ public class HighLevelClient { * net.pterodactylus.fcp.PutFetchable) */ 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); } /** @@ -1026,7 +1107,20 @@ public class HighLevelClient { * net.pterodactylus.fcp.PutSuccessful) */ 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); } /** @@ -1069,6 +1163,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); }