X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=200066f1b93737972bf6e074732ed7cd3452927e;hb=3172a3accc6409cbd0fb11456e0cc441602d0e8e;hp=3c3a659872c6d980607cbf43840f7e9f5c92aadd;hpb=adf590c0b33f1cc3f136d8d3a714f7051407535f;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 3c3a659..200066f 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -18,9 +18,13 @@
package net.pterodactylus.sone.core;
import java.net.MalformedURLException;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.UUID;
@@ -29,18 +33,16 @@ import java.util.logging.Logger;
import net.pterodactylus.sone.core.SoneException.Type;
import net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.data.PostShell;
import net.pterodactylus.sone.data.Profile;
import net.pterodactylus.sone.data.Reply;
-import net.pterodactylus.sone.data.ReplyShell;
-import net.pterodactylus.sone.data.Shell;
-import net.pterodactylus.sone.data.ShellCache;
import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.data.SoneShell;
import net.pterodactylus.util.config.Configuration;
import net.pterodactylus.util.config.ConfigurationException;
+import net.pterodactylus.util.filter.Filter;
+import net.pterodactylus.util.filter.Filters;
import net.pterodactylus.util.logging.Logging;
import net.pterodactylus.util.service.AbstractService;
+import freenet.client.FetchResult;
import freenet.keys.FreenetURI;
/**
@@ -50,6 +52,26 @@ import freenet.keys.FreenetURI;
*/
public class Core extends AbstractService {
+ /**
+ * Enumeration for the possible states of a {@link Sone}.
+ *
+ * @author David âBombeâ Roden
+ */
+ public enum SoneStatus {
+
+ /** The Sone is unknown, i.e. not yet downloaded. */
+ unknown,
+
+ /** The Sone is idle, i.e. not being downloaded or inserted. */
+ idle,
+
+ /** The Sone is currently being inserted. */
+ inserting,
+
+ /** The Sone is currently being downloaded. */
+ downloading,
+ }
+
/** The logger. */
private static final Logger logger = Logging.getLogger(Core.class);
@@ -68,22 +90,25 @@ public class Core extends AbstractService {
/** Sone inserters. */
private final Map soneInserters = new HashMap();
+ /** The Sonesâ statuses. */
+ private final Map soneStatuses = Collections.synchronizedMap(new HashMap());
+
/* various caches follow here. */
/** Cache for all known Sones. */
- private final ShellCache soneCache = new ShellCache(SoneShell.creator);
+ private final Map soneCache = new HashMap();
/** Cache for all known posts. */
- private final ShellCache postCache = new ShellCache(PostShell.creator);
+ private final Map postCache = new HashMap();
/** Cache for all known replies. */
- private final ShellCache replyCache = new ShellCache(ReplyShell.creator);
+ private final Map replyCache = new HashMap();
/**
* Creates a new core.
*/
public Core() {
- super("Sone Core");
+ super("Sone Core", false);
}
//
@@ -111,7 +136,8 @@ public class Core extends AbstractService {
*/
public Core freenetInterface(FreenetInterface freenetInterface) {
this.freenetInterface = freenetInterface;
- soneDownloader = new SoneDownloader(freenetInterface);
+ soneDownloader = new SoneDownloader(this, freenetInterface);
+ soneDownloader.start();
return this;
}
@@ -125,18 +151,132 @@ public class Core extends AbstractService {
}
/**
- * Returns a Sone or a {@link Shell} around one for the given ID.
+ * Returns the Sone with the given ID, or an empty Sone that has been
+ * initialized with the given ID.
*
* @param soneId
* The ID of the Sone
- * @return The Sone, or a {@link Shell} around one
+ * @return The Sone
*/
public Sone getSone(String soneId) {
- Sone sone = soneCache.get(soneId);
- if (sone instanceof SoneShell) {
- soneCache.put(soneId, sone = ((SoneShell) sone).getShelled());
+ if (!soneCache.containsKey(soneId)) {
+ Sone sone = new Sone(soneId);
+ soneCache.put(soneId, sone);
+ setSoneStatus(sone, SoneStatus.unknown);
}
- return sone;
+ return soneCache.get(soneId);
+ }
+
+ /**
+ * Returns all known sones.
+ *
+ * @return All known sones
+ */
+ public Collection getKnownSones() {
+ return soneCache.values();
+ }
+
+ /**
+ * Gets all known Sones that are not local Sones.
+ *
+ * @return All remote Sones
+ */
+ public Collection getRemoteSones() {
+ return Filters.filteredCollection(getKnownSones(), new Filter() {
+
+ @Override
+ @SuppressWarnings("synthetic-access")
+ public boolean filterObject(Sone object) {
+ return !localSones.contains(object);
+ }
+ });
+ }
+
+ /**
+ * Returns the status of the given Sone.
+ *
+ * @param sone
+ * The Sone to get the status for
+ * @return The status of the Sone
+ */
+ public SoneStatus getSoneStatus(Sone sone) {
+ return soneStatuses.get(sone);
+ }
+
+ /**
+ * Sets the status of the Sone.
+ *
+ * @param sone
+ * The Sone to set the status for
+ * @param soneStatus
+ * The status of the Sone
+ */
+ public void setSoneStatus(Sone sone, SoneStatus soneStatus) {
+ soneStatuses.put(sone, soneStatus);
+ }
+
+ /**
+ * Creates a new post and adds it to the given Sone.
+ *
+ * @param sone
+ * The sone that creates the post
+ * @param text
+ * The text of the post
+ * @return The created post
+ */
+ public Post createPost(Sone sone, String text) {
+ return createPost(sone, System.currentTimeMillis(), text);
+ }
+
+ /**
+ * Creates a new post and adds it to the given Sone.
+ *
+ * @param sone
+ * The Sone that creates the post
+ * @param time
+ * The time of the post
+ * @param text
+ * The text of the post
+ * @return The created post
+ */
+ public Post createPost(Sone sone, long time, String text) {
+ Post post = getPost(UUID.randomUUID().toString()).setSone(sone).setTime(time).setText(text);
+ sone.addPost(post);
+ return post;
+ }
+
+ /**
+ * Creates a reply.
+ *
+ * @param sone
+ * The Sone that posts the reply
+ * @param post
+ * The post the reply refers to
+ * @param text
+ * The text of the reply
+ * @return The created reply
+ */
+ public Reply createReply(Sone sone, Post post, String text) {
+ return createReply(sone, post, System.currentTimeMillis(), text);
+ }
+
+ /**
+ * Creates a reply.
+ *
+ * @param sone
+ * The Sone that posts the reply
+ * @param post
+ * The post the reply refers to
+ * @param time
+ * The time of the post
+ * @param text
+ * The text of the reply
+ * @return The created reply
+ */
+ public Reply createReply(Sone sone, Post post, long time, String text) {
+ Reply reply = getReply(UUID.randomUUID().toString()).setSone(sone).setPost(post).setTime(time).setText(text);
+ sone.addReply(reply);
+ return reply;
}
//
@@ -144,17 +284,30 @@ public class Core extends AbstractService {
//
/**
+ * Adds a Sone to watch for updates. The Sone needs to be completely
+ * initialized.
+ *
+ * @param sone
+ * The Sone to watch for updates
+ */
+ public void addSone(Sone sone) {
+ soneCache.put(sone.getId(), sone);
+ if (!localSones.contains(sone)) {
+ soneDownloader.addSone(sone);
+ }
+ }
+
+ /**
* Adds the given Sone.
*
* @param sone
* The Sone to add
*/
- public void addSone(Sone sone) {
+ public void addLocalSone(Sone sone) {
if (localSones.add(sone)) {
- soneCache.put(sone.getId(), sone);
- SoneInserter soneInserter = new SoneInserter(freenetInterface, sone);
+ setSoneStatus(sone, SoneStatus.idle);
+ SoneInserter soneInserter = new SoneInserter(this, freenetInterface, sone);
soneInserter.start();
- soneDownloader.addSone(sone);
soneInserters.put(sone, soneInserter);
}
}
@@ -169,7 +322,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);
}
/**
@@ -179,6 +332,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
@@ -189,7 +344,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);
}
@@ -206,11 +361,11 @@ 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 = new Sone(UUID.randomUUID(), name, new FreenetURI(finalRequestUri).setKeyType("USK").setDocName("Sone-" + name), 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);
- addSone(sone);
+ addLocalSone(sone);
} catch (MalformedURLException mue1) {
throw new SoneException(Type.INVALID_URI);
}
@@ -218,6 +373,87 @@ public class Core extends AbstractService {
}
/**
+ * Loads the Sone from the given request URI. The fetching of the data is
+ * performed in a new thread so this method returns immediately.
+ *
+ * @param requestUri
+ * 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
+ @SuppressWarnings("synthetic-access")
+ public void run() {
+ try {
+ FreenetURI realRequestUri = new FreenetURI(requestUri).setMetaString(new String[] { "sone.xml" });
+ FetchResult fetchResult = freenetInterface.fetchUri(realRequestUri);
+ if (fetchResult == null) {
+ return;
+ }
+ Sone parsedSone = soneDownloader.parseSone(null, fetchResult, realRequestUri);
+ if (parsedSone != null) {
+ 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);
+ }
+ }
+ }, "Sone Downloader").start();
+ }
+
+ /**
+ * Loads and updates the given Sone.
+ *
+ * @param sone
+ * The Sone to load
+ */
+ public void loadSone(final Sone sone) {
+ new Thread(new Runnable() {
+
+ @Override
+ @SuppressWarnings("synthetic-access")
+ public void run() {
+ FreenetURI realRequestUri = sone.getRequestUri().setMetaString(new String[] { "sone.xml" });
+ setSoneStatus(sone, SoneStatus.downloading);
+ try {
+ FetchResult fetchResult = freenetInterface.fetchUri(realRequestUri);
+ if (fetchResult == null) {
+ /* TODO - mark Sone as bad. */
+ return;
+ }
+ Sone parsedSone = soneDownloader.parseSone(sone, fetchResult, realRequestUri);
+ if (parsedSone != null) {
+ addSone(parsedSone);
+ }
+ } finally {
+ setSoneStatus(sone, (sone.getTime() == 0) ? SoneStatus.unknown : SoneStatus.idle);
+ }
+ }
+ }, "Sone Downloader").start();
+ }
+
+ /**
* Deletes the given Sone from this plugin instance.
*
* @param sone
@@ -229,6 +465,75 @@ public class Core extends AbstractService {
localSones.remove(sone);
}
+ /**
+ * Returns the post with the given ID. If no post exists yet with the given
+ * ID, a new post is returned.
+ *
+ * @param postId
+ * The ID of the post
+ * @return The post
+ */
+ public Post getPost(String postId) {
+ if (!postCache.containsKey(postId)) {
+ postCache.put(postId, new Post(postId));
+ }
+ return postCache.get(postId);
+ }
+
+ /**
+ * Returns the reply with the given ID. If no reply exists yet with the
+ * given ID, a new reply is returned.
+ *
+ * @param replyId
+ * The ID of the reply
+ * @return The reply
+ */
+ public Reply getReply(String replyId) {
+ if (!replyCache.containsKey(replyId)) {
+ replyCache.put(replyId, new Reply(replyId));
+ }
+ return replyCache.get(replyId);
+ }
+
+ /**
+ * Gets all replies to the given post, sorted by date, oldest first.
+ *
+ * @param post
+ * The post the replies refer to
+ * @return The sorted list of replies for the post
+ */
+ public List getReplies(Post post) {
+ List replies = new ArrayList();
+ for (Reply reply : replyCache.values()) {
+ if (reply.getPost().equals(post)) {
+ replies.add(reply);
+ }
+ }
+ Collections.sort(replies, new Comparator() {
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public int compare(Reply leftReply, Reply rightReply) {
+ return (int) Math.max(Integer.MIN_VALUE, Math.min(Integer.MAX_VALUE, leftReply.getTime() - rightReply.getTime()));
+ }
+ });
+ return replies;
+ }
+
+ /**
+ * Deletes the given reply. It is removed from its Sone and from the reply
+ * cache.
+ *
+ * @param reply
+ * The reply to remove
+ */
+ public void deleteReply(Reply reply) {
+ reply.getSone().removeReply(reply);
+ replyCache.remove(reply.getId());
+ }
+
//
// SERVICE METHODS
//
@@ -274,6 +579,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);
@@ -285,8 +591,7 @@ public class Core extends AbstractService {
profile.setFirstName(firstName);
profile.setMiddleName(middleName);
profile.setLastName(lastName);
- Sone sone = new Sone(UUID.fromString(id), name, new FreenetURI(requestUri), new FreenetURI(insertUri));
- soneCache.put(id, sone);
+ Sone sone = getSone(id).setName(name).setTime(time).setRequestUri(new FreenetURI(requestUri)).setInsertUri(new FreenetURI(insertUri));
sone.setProfile(profile);
int postId = 0;
do {
@@ -295,10 +600,9 @@ 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 = new Post(UUID.fromString(id), sone, time, text);
- postCache.put(id, post);
+ Post post = getPost(id).setSone(sone).setTime(time).setText(text);
sone.addPost(post);
} while (true);
int replyCounter = 0;
@@ -308,26 +612,69 @@ public class Core extends AbstractService {
if (replyId == null) {
break;
}
- Sone replySone = soneCache.get(configuration.getStringValue(replyPrefix + "/Sone/ID").getValue(null));
- String replySoneKey = configuration.getStringValue(replyPrefix + "/Sone/Key").getValue(null);
- String replySoneName = configuration.getStringValue(replyPrefix + "/Sone/Name").getValue(null);
- if (replySone instanceof SoneShell) {
- ((SoneShell) replySone).setRequestUri(new FreenetURI(replySoneKey)).setName(replySoneName);
- }
- Post replyPost = postCache.get(configuration.getStringValue(replyPrefix + "/Post").getValue(null));
+ Post replyPost = getPost(configuration.getStringValue(replyPrefix + "/Post").getValue(null));
long replyTime = configuration.getLongValue(replyPrefix + "/Time").getValue(null);
String replyText = configuration.getStringValue(replyPrefix + "/Text").getValue(null);
- Reply reply = new ReplyShell().setSone(replySone).setPost(replyPost).setTime(replyTime).setText(replyText).getShelled();
- replyCache.put(replyId, reply);
+ Reply reply = getReply(replyId).setSone(sone).setPost(replyPost).setTime(replyTime).setText(replyText);
+ sone.addReply(reply);
} while (true);
+
+ /* load friends. */
+ int friendCounter = 0;
+ while (true) {
+ String friendPrefix = sonePrefix + "/Friend." + friendCounter++;
+ String friendId = configuration.getStringValue(friendPrefix + "/ID").getValue(null);
+ if (friendId == null) {
+ break;
+ }
+ Sone friendSone = getSone(friendId);
+ String friendKey = configuration.getStringValue(friendPrefix + "/Key").getValue(null);
+ String friendName = configuration.getStringValue(friendPrefix + "/Name").getValue(null);
+ friendSone.setRequestUri(new FreenetURI(friendKey)).setName(friendName);
+ 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);
- addSone(sone);
+ addLocalSone(sone);
} catch (MalformedURLException mue1) {
logger.log(Level.WARNING, "Could not create Sone from requestUri (â" + requestUri + "â) and insertUri (â" + insertUri + "â)!", mue1);
}
} 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);
+ }
+
logger.exiting(Core.class.getName(), "loadConfiguration()");
}
@@ -344,6 +691,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());
@@ -365,19 +713,46 @@ public class Core extends AbstractService {
for (Reply reply : sone.getReplies()) {
String replyPrefix = sonePrefix + "/Reply." + replyId++;
configuration.getStringValue(replyPrefix + "/ID").setValue(reply.getId());
- configuration.getStringValue(replyPrefix + "/Sone/ID").setValue(reply.getSone().getId());
- configuration.getStringValue(replyPrefix + "/Sone/Key").setValue(reply.getSone().getRequestUri().toString());
- configuration.getStringValue(replyPrefix + "/Sone/Name").setValue(reply.getSone().getName());
configuration.getStringValue(replyPrefix + "/Post").setValue(reply.getPost().getId());
configuration.getLongValue(replyPrefix + "/Time").setValue(reply.getTime());
configuration.getStringValue(replyPrefix + "/Text").setValue(reply.getText());
}
/* write null ID as terminator. */
configuration.getStringValue(sonePrefix + "/Reply." + replyId + "/ID").setValue(null);
+
+ int friendId = 0;
+ for (Sone friend : sone.getFriends()) {
+ String friendPrefix = sonePrefix + "/Friend." + friendId++;
+ configuration.getStringValue(friendPrefix + "/ID").setValue(friend.getId());
+ configuration.getStringValue(friendPrefix + "/Key").setValue(friend.getRequestUri().toString());
+ configuration.getStringValue(friendPrefix + "/Name").setValue(friend.getName());
+ }
+ /* 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);
}