Add “modified” property.

[Sone.git] / src / main / java / net / pterodactylus / sone / core / Core.java

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 6ecd5fc..a6cbc82 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -258,7 +258,7 @@ public class Core extends AbstractService {
         */
        public void addLocalSone(Sone sone) {
                if (localSones.add(sone)) {
-                       SoneInserter soneInserter = new SoneInserter(freenetInterface, sone);
+                       SoneInserter soneInserter = new SoneInserter(this, freenetInterface, sone);
                        soneInserter.start();
                        soneInserters.put(sone, soneInserter);
                }
@@ -274,7 +274,7 @@ public class Core extends AbstractService {
         *             if a Sone error occurs
         */
        public Sone createSone(String name) throws SoneException {
-               return createSone(name, null, null);
+               return createSone(name, "Sone-" + name, null, null);
        }
 
        /**
@@ -284,6 +284,8 @@ public class Core extends AbstractService {
         *
         * @param name
         *            The name of the Sone
+        * @param documentName
+        *            The document name in the SSK
         * @param requestUri
         *            The request URI of the Sone, or {@link NullPointerException}
         *            to create a Sone at a random location
@@ -294,7 +296,7 @@ public class Core extends AbstractService {
         * @throws SoneException
         *             if a Sone error occurs
         */
-       public Sone createSone(String name, String requestUri, String insertUri) throws SoneException {
+       public Sone createSone(String name, String documentName, String requestUri, String insertUri) throws SoneException {
                if ((name == null) || (name.trim().length() == 0)) {
                        throw new SoneException(Type.INVALID_SONE_NAME);
                }
@@ -311,7 +313,7 @@ public class Core extends AbstractService {
                Sone sone;
                try {
                        logger.log(Level.FINEST, "Creating new Sone “%s” at %s (%s)…", new Object[] { name, finalRequestUri, finalInsertUri });
-                       sone = getSone(UUID.randomUUID().toString()).setName(name).setRequestUri(new FreenetURI(finalRequestUri).setKeyType("USK").setDocName("Sone-" + name)).setInsertUri(new FreenetURI(finalInsertUri).setKeyType("USK").setDocName("Sone-" + name));
+                       sone = getSone(UUID.randomUUID().toString()).setName(name).setRequestUri(new FreenetURI(finalRequestUri).setKeyType("USK").setDocName(documentName)).setInsertUri(new FreenetURI(finalInsertUri).setKeyType("USK").setDocName(documentName));
                        sone.setProfile(new Profile());
                        /* set modification counter to 1 so it is inserted immediately. */
                        sone.setModificationCounter(1);
@@ -330,6 +332,21 @@ public class Core extends AbstractService {
         *            The request URI to load the Sone from
         */
        public void loadSone(final String requestUri) {
+               loadSone(requestUri, null);
+       }
+
+       /**
+        * Loads the Sone from the given request URI. The fetching of the data is
+        * performed in a new thread so this method returns immediately. If
+        * {@code insertUri} is not {@code null} the loaded Sone is converted into a
+        * local Sone and available using as any other local Sone.
+        *
+        * @param requestUri
+        *            The request URI to load the Sone from
+        * @param insertUri
+        *            The insert URI of the Sone
+        */
+       public void loadSone(final String requestUri, final String insertUri) {
                new Thread(new Runnable() {
 
                        @Override
@@ -340,7 +357,12 @@ public class Core extends AbstractService {
                                        FetchResult fetchResult = freenetInterface.fetchUri(realRequestUri);
                                        Sone parsedSone = soneDownloader.parseSone(null, fetchResult, realRequestUri);
                                        if (parsedSone != null) {
-                                               addSone(parsedSone);
+                                               if (insertUri != null) {
+                                                       parsedSone.setInsertUri(new FreenetURI(insertUri));
+                                                       addLocalSone(parsedSone);
+                                               } else {
+                                                       addSone(parsedSone);
+                                               }
                                        }
                                } catch (MalformedURLException mue1) {
                                        logger.log(Level.INFO, "Could not create URI from “" + requestUri + "”.", mue1);
@@ -485,6 +507,7 @@ public class Core extends AbstractService {
                                break;
                        }
                        String name = configuration.getStringValue(sonePrefix + "/Name").getValue(null);
+                       long time = configuration.getLongValue(sonePrefix + "/Time").getValue((long) 0);
                        String insertUri = configuration.getStringValue(sonePrefix + "/InsertURI").getValue(null);
                        String requestUri = configuration.getStringValue(sonePrefix + "/RequestURI").getValue(null);
                        long modificationCounter = configuration.getLongValue(sonePrefix + "/ModificationCounter").getValue((long) 0);
@@ -496,7 +519,7 @@ public class Core extends AbstractService {
                                profile.setFirstName(firstName);
                                profile.setMiddleName(middleName);
                                profile.setLastName(lastName);
-                               Sone sone = getSone(id).setName(name).setRequestUri(new FreenetURI(requestUri)).setInsertUri(new FreenetURI(insertUri));
+                               Sone sone = getSone(id).setName(name).setTime(time).setRequestUri(new FreenetURI(requestUri)).setInsertUri(new FreenetURI(insertUri));
                                sone.setProfile(profile);
                                int postId = 0;
                                do {
@@ -505,7 +528,7 @@ public class Core extends AbstractService {
                                        if (id == null) {
                                                break;
                                        }
-                                       long time = configuration.getLongValue(postPrefix + "/Time").getValue(null);
+                                       time = configuration.getLongValue(postPrefix + "/Time").getValue((long) 0);
                                        String text = configuration.getStringValue(postPrefix + "/Text").getValue(null);
                                        Post post = getPost(id).setSone(sone).setTime(time).setText(text);
                                        sone.addPost(post);
@@ -539,6 +562,17 @@ public class Core extends AbstractService {
                                        sone.addFriend(friendSone);
                                }
 
+                               /* load blocked Sone IDs. */
+                               int blockedSoneCounter = 0;
+                               while (true) {
+                                       String blockedSonePrefix = sonePrefix + "/BlockedSone." + blockedSoneCounter++;
+                                       String blockedSoneId = configuration.getStringValue(blockedSonePrefix + "/ID").getValue(null);
+                                       if (blockedSoneId == null) {
+                                               break;
+                                       }
+                                       sone.addBlockedSoneId(blockedSoneId);
+                               }
+
                                sone.setModificationCounter(modificationCounter);
                                addLocalSone(sone);
                        } catch (MalformedURLException mue1) {
@@ -547,6 +581,23 @@ public class Core extends AbstractService {
                } while (true);
                logger.log(Level.INFO, "Loaded %d Sones.", getSones().size());
 
+               /* load all known Sones. */
+               int knownSonesCounter = 0;
+               while (true) {
+                       String knownSonePrefix = "KnownSone." + knownSonesCounter++;
+                       String knownSoneId = configuration.getStringValue(knownSonePrefix + "/ID").getValue(null);
+                       if (knownSoneId == null) {
+                               break;
+                       }
+                       String knownSoneName = configuration.getStringValue(knownSonePrefix + "/Name").getValue(null);
+                       String knownSoneKey = configuration.getStringValue(knownSonePrefix + "/Key").getValue(null);
+                       try {
+                               getSone(knownSoneId).setName(knownSoneName).setRequestUri(new FreenetURI(knownSoneKey));
+                       } catch (MalformedURLException mue1) {
+                               logger.log(Level.WARNING, "Could not create Sone from requestUri (“" + knownSoneKey + "”)!", mue1);
+                       }
+               }
+
                /* load all remote Sones. */
                for (Sone remoteSone : getRemoteSones()) {
                        loadSone(remoteSone);
@@ -568,6 +619,7 @@ public class Core extends AbstractService {
                                String sonePrefix = "Sone/Sone." + soneId++;
                                configuration.getStringValue(sonePrefix + "/ID").setValue(sone.getId());
                                configuration.getStringValue(sonePrefix + "/Name").setValue(sone.getName());
+                               configuration.getLongValue(sonePrefix + "/Time").setValue(sone.getTime());
                                configuration.getStringValue(sonePrefix + "/RequestURI").setValue(sone.getRequestUri().toString());
                                configuration.getStringValue(sonePrefix + "/InsertURI").setValue(sone.getInsertUri().toString());
                                configuration.getLongValue(sonePrefix + "/ModificationCounter").setValue(sone.getModificationCounter());
@@ -606,10 +658,29 @@ public class Core extends AbstractService {
                                /* write null ID as terminator. */
                                configuration.getStringValue(sonePrefix + "/Friend." + friendId + "/ID").setValue(null);
 
+                               /* write all blocked Sones. */
+                               int blockedSoneCounter = 0;
+                               for (String blockedSoneId : sone.getBlockedSoneIds()) {
+                                       String blockedSonePrefix = sonePrefix + "/BlockedSone." + blockedSoneCounter++;
+                                       configuration.getStringValue(blockedSonePrefix + "/ID").setValue(blockedSoneId);
+                               }
+                               configuration.getStringValue(sonePrefix + "/BlockedSone." + blockedSoneCounter + "/ID").setValue(null);
+
                        }
                        /* write null ID as terminator. */
                        configuration.getStringValue("Sone/Sone." + soneId + "/ID").setValue(null);
 
+                       /* write all known Sones. */
+                       int knownSonesCounter = 0;
+                       for (Sone knownSone : getRemoteSones()) {
+                               String knownSonePrefix = "KnownSone." + knownSonesCounter++;
+                               configuration.getStringValue(knownSonePrefix + "/ID").setValue(knownSone.getId());
+                               configuration.getStringValue(knownSonePrefix + "/Name").setValue(knownSone.getName());
+                               configuration.getStringValue(knownSonePrefix + "/Key").setValue(knownSone.getRequestUri().toString());
+                               /* TODO - store all known stuff? */
+                       }
+                       configuration.getStringValue("KnownSone." + knownSonesCounter + "/ID").setValue(null);
+
                } catch (ConfigurationException ce1) {
                        logger.log(Level.WARNING, "Could not store configuration!", ce1);
                }