X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Ffcp%2Fhighlevel%2FFcpClient.java;h=0c13505bf090f39ecf9a2d9fcdc5fc1619a794ab;hb=53d8f9f9c39b88896439970762e5eef7adfdd340;hp=bc1092eacc912b2a1000c5fdc6637526ac85c9ec;hpb=6065356598b699145344a1a873054f2e5b0d23ef;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 bc1092e..0c13505 100644
--- a/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java
+++ b/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java
@@ -1,9 +1,9 @@
/*
- * jFCPlib - FcpClient.java - Copyright © 2009 David Roden
+ * jFCPlib - FcpClient.java - Copyright © 2009â2016 David Roden
*
- * This program is free software; you can redistribute it and/or modify
+ * This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
@@ -12,13 +12,13 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * along with this program. If not, see .
*/
package net.pterodactylus.fcp.highlevel;
import static com.google.common.collect.FluentIterable.from;
+import static java.util.stream.Collectors.toMap;
import java.io.Closeable;
import java.io.IOException;
@@ -41,6 +41,7 @@ import net.pterodactylus.fcp.AllData;
import net.pterodactylus.fcp.ClientGet;
import net.pterodactylus.fcp.ClientHello;
import net.pterodactylus.fcp.CloseConnectionDuplicateClientName;
+import net.pterodactylus.fcp.ConfigData;
import net.pterodactylus.fcp.DataFound;
import net.pterodactylus.fcp.EndListPeerNotes;
import net.pterodactylus.fcp.EndListPeers;
@@ -51,6 +52,7 @@ import net.pterodactylus.fcp.FcpAdapter;
import net.pterodactylus.fcp.FcpConnection;
import net.pterodactylus.fcp.FcpListener;
import net.pterodactylus.fcp.GenerateSSK;
+import net.pterodactylus.fcp.GetConfig;
import net.pterodactylus.fcp.GetFailed;
import net.pterodactylus.fcp.GetNode;
import net.pterodactylus.fcp.ListPeerNotes;
@@ -302,7 +304,7 @@ public class FcpClient implements Closeable {
@SuppressWarnings("synthetic-access")
public void receivedNodeHello(FcpConnection fcpConnection, NodeHello nodeHello) {
FcpClient.this.nodeHello = nodeHello;
- completionLatch.countDown();
+ complete();
}
}.execute();
}
@@ -368,11 +370,11 @@ public class FcpClient implements Closeable {
fcpConnection.sendMessage(clientGet);
} catch (IOException ioe1) {
getResult.success(false).exception(ioe1);
- completionLatch.countDown();
+ complete();
}
} else {
getResult.success(false).errorCode(getFailed.getCode());
- completionLatch.countDown();
+ complete();
}
}
@@ -382,7 +384,7 @@ public class FcpClient implements Closeable {
return;
}
getResult.success(true).contentType(allData.getContentType()).contentLength(allData.getDataLength()).inputStream(allData.getPayloadInputStream());
- completionLatch.countDown();
+ complete();
}
}.execute();
@@ -474,7 +476,7 @@ public class FcpClient implements Closeable {
@Override
public void receivedEndListPeers(FcpConnection fcpConnection, EndListPeers endListPeers) {
if (endListPeers.getIdentifier().equals(identifier)) {
- completionLatch.countDown();
+ complete();
}
}
}.execute();
@@ -641,7 +643,7 @@ public class FcpClient implements Closeable {
*/
@Override
public void receivedPeer(FcpConnection fcpConnection, Peer peer) {
- completionLatch.countDown();
+ complete();
}
}.execute();
}
@@ -684,7 +686,7 @@ public class FcpClient implements Closeable {
*/
@Override
public void receivedPeer(FcpConnection fcpConnection, Peer peer) {
- completionLatch.countDown();
+ complete();
}
}.execute();
}
@@ -716,7 +718,7 @@ public class FcpClient implements Closeable {
*/
@Override
public void receivedPeerRemoved(FcpConnection fcpConnection, PeerRemoved peerRemoved) {
- completionLatch.countDown();
+ complete();
}
}.execute();
}
@@ -764,7 +766,7 @@ public class FcpClient implements Closeable {
*/
@Override
public void receivedEndListPeerNotes(FcpConnection fcpConnection, EndListPeerNotes endListPeerNotes) {
- completionLatch.countDown();
+ complete();
}
}.execute();
return objectWrapper.get();
@@ -803,7 +805,7 @@ public class FcpClient implements Closeable {
@Override
public void receivedPeer(FcpConnection fcpConnection, Peer receivedPeer) {
if (receivedPeer.getIdentity().equals(peer.getIdentity())) {
- completionLatch.countDown();
+ complete();
}
}
}.execute();
@@ -841,7 +843,7 @@ public class FcpClient implements Closeable {
@Override
public void receivedSSKKeypair(FcpConnection fcpConnection, SSKKeypair sskKeypair) {
sskKeypairWrapper.set(sskKeypair);
- completionLatch.countDown();
+ complete();
}
}.execute();
return sskKeypairWrapper.get();
@@ -1006,7 +1008,7 @@ public class FcpClient implements Closeable {
*/
@Override
public void receivedEndListPersistentRequests(FcpConnection fcpConnection, EndListPersistentRequests endListPersistentRequests) {
- completionLatch.countDown();
+ complete();
}
}.execute();
return requests.values();
@@ -1079,7 +1081,7 @@ public class FcpClient implements Closeable {
return;
}
pluginReplies.putAll(fcpPluginReply.getReplies());
- completionLatch.countDown();
+ complete();
}
}.execute();
@@ -1122,13 +1124,56 @@ public class FcpClient implements Closeable {
@Override
public void receivedNodeData(FcpConnection fcpConnection, NodeData nodeData) {
nodeDataWrapper.set(nodeData);
- completionLatch.countDown();
+ complete();
}
}.execute();
return nodeDataWrapper.get();
}
//
+ // CONFIG MANAGEMENT
+ //
+
+ public Map getConfig() throws IOException, FcpException {
+ Map results = new HashMap<>();
+ new ExtendedFcpAdapter() {
+ @Override
+ public void run() throws IOException {
+ GetConfig getConfig = new GetConfig(createIdentifier("get-config"));
+ getConfig.setWithCurrent(true);
+ getConfig.setWithDefaults(true);
+ getConfig.setWithShortDescription(true);
+ getConfig.setWithLongDescription(true);
+ getConfig.setWithDataTypes(true);
+ getConfig.setWithExpertFlag(true);
+ getConfig.setWithForceWriteFlag(true);
+ getConfig.setWithSortOrder(true);
+ fcpConnection.sendMessage(getConfig);
+ }
+
+ @Override
+ public void receivedConfigData(FcpConnection fcpConnection, ConfigData configData) {
+ results.putAll(filterByResponseType(configData, "current"));
+ results.putAll(filterByResponseType(configData, "default"));
+ results.putAll(filterByResponseType(configData, "shortDescription"));
+ results.putAll(filterByResponseType(configData, "longDescription"));
+ results.putAll(filterByResponseType(configData, "expertFlag"));
+ results.putAll(filterByResponseType(configData, "dataType"));
+ results.putAll(filterByResponseType(configData, "sortOrder"));
+ results.putAll(filterByResponseType(configData, "forceWriteFlag"));
+ complete();
+ }
+
+ private Map filterByResponseType(ConfigData configData, String responseType) {
+ return configData.getFields().entrySet().stream()
+ .filter(e -> e.getKey().startsWith(responseType + "."))
+ .collect(toMap(Entry::getKey, Entry::getValue));
+ }
+ }.execute();
+ return results;
+ }
+
+ //
// PRIVATE METHODS
//
@@ -1174,7 +1219,7 @@ public class FcpClient implements Closeable {
private abstract class ExtendedFcpAdapter extends FcpAdapter {
/** The count down latch used to wait for completion. */
- protected final CountDownLatch completionLatch = new CountDownLatch(1);
+ private final CountDownLatch completionLatch = new CountDownLatch(1);
/** The FCP exception, if any. */
protected FcpException fcpException;
@@ -1230,6 +1275,13 @@ public class FcpClient implements Closeable {
public abstract void run() throws IOException;
/**
+ * Signals completion of the command processing.
+ */
+ protected void complete() {
+ completionLatch.countDown();
+ }
+
+ /**
* {@inheritDoc}
*/
@Override