Don’t increment the properties counter twice.
[Sone.git] / src / main / java / net / pterodactylus / sone / freenet / wot / WebOfTrustConnector.java
index a8e2f41..4758d95 100644 (file)
@@ -75,7 +75,7 @@ public class WebOfTrustConnector implements ConnectorListener {
         *             if the own identities can not be loaded
         */
        public Set<OwnIdentity> loadAllOwnIdentities() throws PluginException {
-               Reply reply = performRequest("OwnIdentities", SimpleFieldSetConstructor.create().put("Message", "GetOwnIdentities").get());
+               Reply reply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetOwnIdentities").get(), "OwnIdentities");
                SimpleFieldSet fields = reply.getFields();
                int ownIdentityCounter = -1;
                Set<OwnIdentity> ownIdentities = new HashSet<OwnIdentity>();
@@ -87,37 +87,15 @@ public class WebOfTrustConnector implements ConnectorListener {
                        String requestUri = fields.get("RequestURI" + ownIdentityCounter);
                        String insertUri = fields.get("InsertURI" + ownIdentityCounter);
                        String nickname = fields.get("Nickname" + ownIdentityCounter);
-                       OwnIdentity ownIdentity = new OwnIdentity(this, id, nickname, requestUri, insertUri);
+                       OwnIdentity ownIdentity = new OwnIdentity(id, nickname, requestUri, insertUri);
+                       ownIdentity.setContexts(parseContexts("Contexts" + ownIdentityCounter, fields));
+                       ownIdentity.setProperties(parseProperties("Properties" + ownIdentityCounter, fields));
                        ownIdentities.add(ownIdentity);
                }
                return ownIdentities;
        }
 
        /**
-        * Loads the contexts of the given identity.
-        *
-        * @param identity
-        *            The identity to load the contexts for
-        * @return The contexts of the identity
-        * @throws PluginException
-        *             if an error occured talking to the Web of Trust plugin
-        */
-       public Set<String> loadIdentityContexts(Identity identity) throws PluginException {
-               Reply reply = performRequest("Identity", SimpleFieldSetConstructor.create().put("Message", "GetIdentity").put("TreeOwner", identity.getId()).put("Identity", identity.getId()).get());
-               SimpleFieldSet fields = reply.getFields();
-               int contextCounter = -1;
-               Set<String> contexts = new HashSet<String>();
-               while (true) {
-                       String context = fields.get("Context" + ++contextCounter);
-                       if (context == null) {
-                               break;
-                       }
-                       contexts.add(context);
-               }
-               return contexts;
-       }
-
-       /**
         * Loads all identities that the given identities trusts with a score of
         * more than 0.
         *
@@ -144,7 +122,7 @@ public class WebOfTrustConnector implements ConnectorListener {
         *             if an error occured talking to the Web of Trust plugin
         */
        public Set<Identity> loadTrustedIdentities(OwnIdentity ownIdentity, String context) throws PluginException {
-               Reply reply = performRequest("Identities", SimpleFieldSetConstructor.create().put("Message", "GetIdentitiesByScore").put("TreeOwner", ownIdentity.getId()).put("Selection", "+").put("Context", (context == null) ? "" : context).get());
+               Reply reply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetIdentitiesByScore").put("TreeOwner", ownIdentity.getId()).put("Selection", "+").put("Context", (context == null) ? "" : context).get(), "Identities");
                SimpleFieldSet fields = reply.getFields();
                Set<Identity> identities = new HashSet<Identity>();
                int identityCounter = -1;
@@ -155,7 +133,10 @@ public class WebOfTrustConnector implements ConnectorListener {
                        }
                        String nickname = fields.get("Nickname" + identityCounter);
                        String requestUri = fields.get("RequestURI" + identityCounter);
-                       identities.add(new Identity(this, id, nickname, requestUri));
+                       Identity identity = new Identity(id, nickname, requestUri);
+                       identity.setContexts(parseContexts("Contexts" + identityCounter, fields));
+                       identity.setProperties(parseProperties("Properties" + identityCounter, fields));
+                       identities.add(identity);
                }
                return identities;
        }
@@ -171,7 +152,7 @@ public class WebOfTrustConnector implements ConnectorListener {
         *             if an error occured talking to the Web of Trust plugin
         */
        public void addContext(OwnIdentity ownIdentity, String context) throws PluginException {
-               performRequest("ContextAdded", SimpleFieldSetConstructor.create().put("Message", "AddContext").put("Identity", ownIdentity.getId()).put("Context", context).get());
+               performRequest(SimpleFieldSetConstructor.create().put("Message", "AddContext").put("Identity", ownIdentity.getId()).put("Context", context).get(), "ContextAdded");
        }
 
        /**
@@ -185,7 +166,53 @@ public class WebOfTrustConnector implements ConnectorListener {
         *             if an error occured talking to the Web of Trust plugin
         */
        public void removeContext(OwnIdentity ownIdentity, String context) throws PluginException {
-               performRequest("ContextRemoved", SimpleFieldSetConstructor.create().put("Message", "RemoveContext").put("Identity", ownIdentity.getId()).put("Context", context).get());
+               performRequest(SimpleFieldSetConstructor.create().put("Message", "RemoveContext").put("Identity", ownIdentity.getId()).put("Context", context).get(), "ContextRemoved");
+       }
+
+       /**
+        * Returns the value of the property with the given name.
+        *
+        * @param identity
+        *            The identity whose properties to check
+        * @param name
+        *            The name of the property to return
+        * @return The value of the property, or {@code null} if there is no value
+        * @throws PluginException
+        *             if an error occured talking to the Web of Trust plugin
+        */
+       public String getProperty(Identity identity, String name) throws PluginException {
+               Reply reply = performRequest(SimpleFieldSetConstructor.create().put("Message", "GetProperty").put("Identity", identity.getId()).put("Property", name).get(), "PropertyValue");
+               return reply.getFields().get("Property");
+       }
+
+       /**
+        * Sets the property with the given name to the given value.
+        *
+        * @param ownIdentity
+        *            The identity to set the property on
+        * @param name
+        *            The name of the property to set
+        * @param value
+        *            The value to set
+        * @throws PluginException
+        *             if an error occured talking to the Web of Trust plugin
+        */
+       public void setProperty(OwnIdentity ownIdentity, String name, String value) throws PluginException {
+               performRequest(SimpleFieldSetConstructor.create().put("Message", "SetProperty").put("Identity", ownIdentity.getId()).put("Property", name).put("Value", value).get(), "PropertyAdded");
+       }
+
+       /**
+        * Removes the property with the given name.
+        *
+        * @param ownIdentity
+        *            The identity to remove the property from
+        * @param name
+        *            The name of the property to remove
+        * @throws PluginException
+        *             if an error occured talking to the Web of Trust plugin
+        */
+       public void removeProperty(OwnIdentity ownIdentity, String name) throws PluginException {
+               performRequest(SimpleFieldSetConstructor.create().put("Message", "RemoveProperty").put("Identity", ownIdentity.getId()).put("Property", name).get(), "PropertyRemoved");
        }
 
        //
@@ -193,47 +220,102 @@ public class WebOfTrustConnector implements ConnectorListener {
        //
 
        /**
+        * Parses the contexts from the given fields.
+        *
+        * @param prefix
+        *            The prefix to use to access the contexts
+        * @param fields
+        *            The fields to parse the contexts from
+        * @return The parsed contexts
+        */
+       private Set<String> parseContexts(String prefix, SimpleFieldSet fields) {
+               Set<String> contexts = new HashSet<String>();
+               int contextCounter = -1;
+               while (true) {
+                       String context = fields.get(prefix + "Context" + ++contextCounter);
+                       if (context == null) {
+                               break;
+                       }
+                       contexts.add(context);
+               }
+               return contexts;
+       }
+
+       /**
+        * Parses the properties from the given fields.
+        *
+        * @param prefix
+        *            The prefix to use to access the properties
+        * @param fields
+        *            The fields to parse the properties from
+        * @return The parsed properties
+        */
+       private Map<String, String> parseProperties(String prefix, SimpleFieldSet fields) {
+               Map<String, String> properties = new HashMap<String, String>();
+               int propertiesCounter = -1;
+               while (true) {
+                       String propertyName = fields.get(prefix + "Property" + ++propertiesCounter + "Name");
+                       if (propertyName == null) {
+                               break;
+                       }
+                       String propertyValue = fields.get(prefix + "Property" + propertiesCounter + "Value");
+                       properties.put(propertyName, propertyValue);
+               }
+               return properties;
+       }
+
+       /**
         * Sends a request containing the given fields and waits for the target
         * message.
         *
-        * @param targetMessage
-        *            The message of the reply to wait for
         * @param fields
         *            The fields of the message
+        * @param targetMessages
+        *            The messages of the reply to wait for
         * @return The reply message
         * @throws PluginException
         *             if the request could not be sent
         */
-       private Reply performRequest(String targetMessage, SimpleFieldSet fields) throws PluginException {
-               return performRequest(targetMessage, fields, null);
+       private Reply performRequest(SimpleFieldSet fields, String... targetMessages) throws PluginException {
+               return performRequest(fields, null, targetMessages);
        }
 
        /**
         * Sends a request containing the given fields and waits for the target
         * message.
         *
-        * @param targetMessage
-        *            The message of the reply to wait for
         * @param fields
         *            The fields of the message
         * @param data
         *            The payload of the message
+        * @param targetMessages
+        *            The messages of the reply to wait for
         * @return The reply message
         * @throws PluginException
         *             if the request could not be sent
         */
-       private Reply performRequest(String targetMessage, SimpleFieldSet fields, Bucket data) throws PluginException {
+       private Reply performRequest(SimpleFieldSet fields, Bucket data, String... targetMessages) throws PluginException {
                @SuppressWarnings("synthetic-access")
                Reply reply = new Reply();
-               replies.put(targetMessage, reply);
+               for (String targetMessage : targetMessages) {
+                       replies.put(targetMessage, reply);
+               }
+               replies.put("Error", reply);
                synchronized (reply) {
                        pluginConnector.sendRequest(WOT_PLUGIN_NAME, PLUGIN_CONNECTION_IDENTIFIER, fields, data);
                        try {
-                               reply.wait();
+                               reply.wait(60000);
                        } catch (InterruptedException ie1) {
                                logger.log(Level.WARNING, "Got interrupted while waiting for reply on GetOwnIdentities.", ie1);
                        }
                }
+               for (String targetMessage : targetMessages) {
+                       replies.remove(targetMessage);
+               }
+               replies.remove("Error");
+               if ((reply.getFields() != null) && reply.getFields().get("Message").equals("Error")) {
+                       throw new PluginException("Could not perform request for " + targetMessages[0]);
+               }
                return reply;
        }