Store latest edition in Sone, update WoT properties after inserting.

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 21b2213..b929c23 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -507,7 +507,7 @@ public class Core implements IdentityListener {
                                storedSone.setReplies(sone.getReplies());
                                storedSone.setLikePostIds(sone.getLikedPostIds());
                                storedSone.setLikeReplyIds(sone.getLikedReplyIds());
                                storedSone.setReplies(sone.getReplies());
                                storedSone.setLikePostIds(sone.getLikedPostIds());
                                storedSone.setLikeReplyIds(sone.getLikedReplyIds());

-                               storedSone.updateUris(sone.getRequestUri().getEdition());
+                               storedSone.setLatestEdition(sone.getRequestUri().getEdition());

                        }
                        saveSone(storedSone);
                }
                        }
                        saveSone(storedSone);
                }


@@ -547,7 +547,13 @@ public class Core implements IdentityListener {
        public void saveSone(Sone sone) {
                if (!isLocalSone(sone)) {
                        logger.log(Level.FINE, "Tried to save non-local Sone: %s", sone);
        public void saveSone(Sone sone) {
                if (!isLocalSone(sone)) {
                        logger.log(Level.FINE, "Tried to save non-local Sone: %s", sone);

+                       return;
+               }
+               if (!(sone.getIdentity() instanceof OwnIdentity)) {
+                       logger.log(Level.WARNING, "Local Sone without OwnIdentity found, refusing to save: %s", sone);
+                       return;

                }
                }

+               identityManager.setProperty((OwnIdentity) sone.getIdentity(), "Sone.LatestEdition", String.valueOf(sone.getLatestEdition()));

                /* TODO - implement saving. */
        }
 
                /* TODO - implement saving. */
        }
 

diff --git a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
index 30ba69a..9ff3a12 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) {
                                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.suggestedEdition);
+                                               sone.setLatestEdition(key.suggestedEdition);

                                                soneDownloader.fetchSone(sone);
                                        }
                                }
                                                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 8a27979..d84a1c4 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@ -226,7 +226,7 @@ public class SoneDownloader extends AbstractService {
                if ((soneInsertUri != null) && (sone.getInsertUri() == null)) {
                        try {
                                sone.setInsertUri(new FreenetURI(soneInsertUri));
                if ((soneInsertUri != null) && (sone.getInsertUri() == null)) {
                        try {
                                sone.setInsertUri(new FreenetURI(soneInsertUri));

-                               sone.updateUris(Math.max(sone.getRequestUri().getSuggestedEdition(), sone.getInsertUri().getSuggestedEdition()));
+                               sone.setLatestEdition(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);
                        } 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 2a1f1fb..ea85f2d 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -32,7 +32,6 @@ import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.freenet.StringBucket;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.freenet.StringBucket;

-import net.pterodactylus.sone.freenet.wot.OwnIdentity;

 import net.pterodactylus.util.io.Closer;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.service.AbstractService;
 import net.pterodactylus.util.io.Closer;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.service.AbstractService;


@@ -144,9 +143,9 @@ 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");
                                try {
                                        core.setSoneStatus(sone, SoneStatus.inserting);
                                        FreenetURI finalUri = freenetInterface.insertDirectory(insertInformation.getInsertUri().setKeyType("USK").setSuggestedEdition(0), insertInformation.generateManifestEntries(), "index.html");

-                                       sone.updateUris(finalUri.getEdition());
+                                       sone.setLatestEdition(finalUri.getEdition());

                                        /* TODO - better encapsulation? */
                                        /* TODO - better encapsulation? */

-                                       core.getIdentityManager().setProperty((OwnIdentity) sone.getIdentity(), "Sone.LatestEdition", String.valueOf(finalUri.getEdition()));
+                                       core.saveSone(sone);

                                        success = true;
                                        logger.log(Level.INFO, "Inserted Sone “%s” at %s.", new Object[] { sone.getName(), finalUri });
                                } catch (SoneException se1) {
                                        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 da1967c..21ffd6f 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -69,6 +69,9 @@ public class Sone {
        /* This will be null for remote Sones! */
        private volatile FreenetURI insertUri;
 
        /* This will be null for remote Sones! */
        private volatile FreenetURI insertUri;
 

+       /** The latest edition of the Sone. */
+       private volatile long latestEdition;
+

        /** The time of the last inserted update. */
        private volatile long time;
 
        /** The time of the last inserted update. */
        private volatile long time;
 


@@ -140,7 +143,7 @@ public class Sone {
         * @return The request URI of this Sone
         */
        public FreenetURI getRequestUri() {
         * @return The request URI of this Sone
         */
        public FreenetURI getRequestUri() {

-               return requestUri;
+               return requestUri.setSuggestedEdition(latestEdition);

        }
 
        /**
        }
 
        /**


@@ -153,17 +156,13 @@ public class Sone {
        public Sone setRequestUri(FreenetURI requestUri) {
                if (this.requestUri == null) {
                        this.requestUri = requestUri;
        public Sone setRequestUri(FreenetURI 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;
                }
                        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);
-               }
+               setLatestEdition(requestUri.getEdition());

                return this;
        }
 
                return this;
        }
 


@@ -173,7 +172,7 @@ public class Sone {
         * @return The insert URI of this Sone
         */
        public FreenetURI getInsertUri() {
         * @return The insert URI of this Sone
         */
        public FreenetURI getInsertUri() {

-               return insertUri;
+               return insertUri.setSuggestedEdition(latestEdition);

        }
 
        /**
        }
 
        /**


@@ -186,21 +185,42 @@ public class Sone {
        public Sone setInsertUri(FreenetURI insertUri) {
                if (this.insertUri == null) {
                        this.insertUri = insertUri;
        public Sone setInsertUri(FreenetURI 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;
                }
                        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);
-               }
+               setLatestEdition(insertUri.getEdition());

                return this;
        }
 
        /**
                return this;
        }
 
        /**

+        * Returns the latest edition of this Sone.
+        *
+        * @return The latest edition of this Sone
+        */
+       public long getLatestEdition() {
+               return latestEdition;
+       }
+
+       /**
+        * Sets the latest edition of this Sone. If the given latest edition is not
+        * greater than the current latest edition, the latest edition of this Sone
+        * is not changed.
+        *
+        * @param latestEdition
+        *            The latest edition of this Sone
+        */
+       public void setLatestEdition(long latestEdition) {
+               if (!(latestEdition > this.latestEdition)) {
+                       logger.log(Level.INFO, "New latest edition %d is not greater than current latest edition %d!", new Object[] { latestEdition, this.latestEdition });
+                       return;
+               }
+               this.latestEdition = latestEdition;
+       }
+
+       /**

         * Return the time of the last inserted update of this Sone.
         *
         * @return The time of the update (in milliseconds since Jan 1, 1970 UTC)
         * Return the time of the last inserted update of this Sone.
         *
         * @return The time of the update (in milliseconds since Jan 1, 1970 UTC)


@@ -569,41 +589,6 @@ public class Sone {
                this.modificationCounter = modificationCounter;
        }
 
                this.modificationCounter = modificationCounter;
        }
 

-       /**
-        * Updates the suggested edition in both the request URI and the insert URI.
-        *
-        * @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));
-       }
-

        //
        // OBJECT METHODS
        //
        //
        // OBJECT METHODS
        //