X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Ffcp%2Fhighlevel%2FFcpClient.java;h=6d51c92432ff7c4b09c5235c3d019c1e87831271;hb=72420249ffac25cab4c5c9e4ff737f6930a9d14b;hp=65bc227fa381d6a1b44004234d6de19e2c2e808a;hpb=369d751e2d866f4263c2ef9652068b11ea515c7f;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 65bc227..6d51c92 100644 --- a/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java +++ b/src/main/java/net/pterodactylus/fcp/highlevel/FcpClient.java @@ -18,6 +18,7 @@ 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; @@ -40,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; @@ -50,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; @@ -1128,6 +1131,49 @@ public class FcpClient implements Closeable { } // + // 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 // @@ -1258,7 +1304,7 @@ public class FcpClient implements Closeable { */ @Override public void receivedProtocolError(FcpConnection fcpConnection, ProtocolError protocolError) { - fcpException = new FcpException("Protocol error (" + protocolError.getCode() + ", " + protocolError.getCodeDescription()); + fcpException = FcpProtocolException.from(protocolError); completionLatch.countDown(); }