Prevent insert and request URIs from being overwritten once set, make edition updatin...

diff --git a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
index 901019c..30ba69a 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
+++ b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
@@ -151,7 +151,7 @@ public class FreenetInterface {
                                public void onFoundEdition(long edition, USK key, ObjectContainer objectContainer, ClientContext clientContext, boolean metadata, short codec, byte[] data, boolean newKnownGood, boolean newSlotToo) {
                                        logger.log(Level.FINE, "Found USK update for Sone “%s” at %s, new known good: %s, new slot too: %s.", new Object[] { sone, key, newKnownGood, newSlotToo });
                                        if (newKnownGood) {
-                                               sone.updateUris(key.getURI());
+                                               sone.updateUris(key.suggestedEdition);
                                                soneDownloader.fetchSone(sone);
                                        }
                                }

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
index 94001a7..94f2b63 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@ -257,9 +257,10 @@ public class SoneDownloader extends AbstractService {
                }
 
                String soneInsertUri = soneXml.getValue("insert-uri", null);
-               if (soneInsertUri != null) {
+               if ((soneInsertUri != null) && (sone.getInsertUri() == null)) {
                        try {
                                sone.setInsertUri(new FreenetURI(soneInsertUri));
+                               sone.updateUris(Math.max(sone.getRequestUri().getSuggestedEdition(), sone.getInsertUri().getSuggestedEdition()));
                        } catch (MalformedURLException mue1) {
                                /* TODO - mark Sone as bad. */
                                logger.log(Level.WARNING, "Downloaded Sone " + sone + " has invalid insert URI: " + soneInsertUri, mue1);

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
index 89f1b5e..05e3600 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -147,7 +147,7 @@ public class SoneInserter extends AbstractService {
                                try {
                                        core.setSoneStatus(sone, SoneStatus.inserting);
                                        FreenetURI finalUri = freenetInterface.insertDirectory(insertInformation.getInsertUri().setKeyType("USK").setSuggestedEdition(0), insertInformation.generateManifestEntries(), "index.html");
-                                       sone.updateUris(finalUri);
+                                       sone.updateUris(finalUri.getEdition());
                                        success = true;
                                        logger.log(Level.INFO, "Inserted Sone “%s” at %s.", new Object[] { sone.getName(), finalUri });
                                } catch (SoneException se1) {

diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java
index dd31c03..f6d5181 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -146,7 +146,19 @@ public class Sone {
         * @return This Sone (for method chaining)
         */
        public Sone setRequestUri(FreenetURI requestUri) {
-               this.requestUri = requestUri;
+               if (this.requestUri == null) {
+                       this.requestUri = requestUri;
+                       updateEditions();
+                       return this;
+               }
+               if (!this.requestUri.equalsKeypair(requestUri)) {
+                       logger.log(Level.WARNING, "Request URI %s tried to overwrite %s!", new Object[] { requestUri, this.requestUri });
+                       return this;
+               }
+               long latestEdition = requestUri.getEdition();
+               if ((latestEdition > this.requestUri.getEdition()) || (latestEdition > this.requestUri.getSuggestedEdition())) {
+                       this.requestUri.setSuggestedEdition(latestEdition);
+               }
                return this;
        }
 
@@ -167,7 +179,19 @@ public class Sone {
         * @return This Sone (for method chaining)
         */
        public Sone setInsertUri(FreenetURI insertUri) {
-               this.insertUri = insertUri;
+               if (this.insertUri == null) {
+                       this.insertUri = insertUri;
+                       updateEditions();
+                       return this;
+               }
+               if (!this.insertUri.equalsKeypair(insertUri)) {
+                       logger.log(Level.WARNING, "Request URI %s tried to overwrite %s!", new Object[] { insertUri, this.insertUri });
+                       return this;
+               }
+               long latestEdition = insertUri.getEdition();
+               if ((latestEdition > this.insertUri.getEdition()) || (latestEdition > this.insertUri.getSuggestedEdition())) {
+                       this.insertUri.setSuggestedEdition(latestEdition);
+               }
                return this;
        }
 
@@ -589,16 +613,36 @@ public class Sone {
        /**
         * Updates the suggested edition in both the request URI and the insert URI.
         *
-        * @param requestUri
-        *            The request URI that resulted from an insert
-        */
-       public void updateUris(FreenetURI requestUri) {
-               /* TODO - check for the correct URI. */
-               long latestEdition = requestUri.getSuggestedEdition();
-               this.requestUri = this.requestUri.setSuggestedEdition(latestEdition);
-               if (this.insertUri != null) {
-                       this.insertUri = this.insertUri.setSuggestedEdition(latestEdition);
+        * @param latestEdition
+        *            The latest edition to update the URIs to
+        */
+       public void updateUris(long latestEdition) {
+               if ((requestUri != null) && (requestUri.getEdition() < latestEdition)) {
+                       requestUri = requestUri.setSuggestedEdition(latestEdition);
+               }
+               if ((insertUri != null) && (insertUri.getEdition() < latestEdition)) {
+                       insertUri = insertUri.setSuggestedEdition(latestEdition);
+               }
+       }
+
+       //
+       // PRIVATE METHODS
+       //
+
+       /**
+        * Updates the editions of the request URI and the insert URI (if latter is
+        * not {@code null}) with the greater edition of either one.
+        */
+       private void updateEditions() {
+               long requestEdition = 0;
+               if (requestUri != null) {
+                       requestEdition = requestUri.getEdition();
+               }
+               long insertEdition = 0;
+               if (insertUri != null) {
+                       insertEdition = insertUri.getEdition();
                }
+               updateUris(Math.max(requestEdition, insertEdition));
        }
 
        //