X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=e0f26499c9a52f82f0e03910b504af115055e92c;hb=4623504d164c0f3cf870f1b5c5707fb058657e71;hp=cabf544e8a1fb9ce3caed9d405fd85ec48af08f8;hpb=3169a5c4875fdcfe6e5aafd7e7b797acb0697c1a;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 cabf544..e0f2649 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -17,6 +17,7 @@
package net.pterodactylus.sone.core;
+import java.io.InputStream;
import java.net.MalformedURLException;
import java.util.ArrayList;
import java.util.Collection;
@@ -31,6 +32,9 @@ import java.util.UUID;
import java.util.logging.Level;
import java.util.logging.Logger;
+import net.pterodactylus.sone.core.Options.DefaultOption;
+import net.pterodactylus.sone.core.Options.Option;
+import net.pterodactylus.sone.core.Options.OptionWatcher;
import net.pterodactylus.sone.core.SoneException.Type;
import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.data.Profile;
@@ -52,9 +56,32 @@ 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);
+ /** The options. */
+ private final Options options = new Options();
+
/** The configuration. */
private Configuration configuration;
@@ -70,6 +97,9 @@ 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. */
@@ -85,7 +115,7 @@ public class Core extends AbstractService {
* Creates a new core.
*/
public Core() {
- super("Sone Core");
+ super("Sone Core", false);
}
//
@@ -93,6 +123,15 @@ public class Core extends AbstractService {
//
/**
+ * Returns the options of the Sone plugin.
+ *
+ * @return The options of the Sone plugin
+ */
+ public Options getOptions() {
+ return options;
+ }
+
+ /**
* Sets the configuration of the core.
*
* @param configuration
@@ -139,6 +178,7 @@ public class Core extends AbstractService {
if (!soneCache.containsKey(soneId)) {
Sone sone = new Sone(soneId);
soneCache.put(soneId, sone);
+ setSoneStatus(sone, SoneStatus.unknown);
}
return soneCache.get(soneId);
}
@@ -169,6 +209,29 @@ public class Core extends AbstractService {
}
/**
+ * 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
@@ -258,7 +321,8 @@ public class Core extends AbstractService {
*/
public void addLocalSone(Sone sone) {
if (localSones.add(sone)) {
- SoneInserter soneInserter = new SoneInserter(freenetInterface, sone);
+ setSoneStatus(sone, SoneStatus.idle);
+ SoneInserter soneInserter = new SoneInserter(this, freenetInterface, sone);
soneInserter.start();
soneInserters.put(sone, soneInserter);
}
@@ -274,7 +338,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", null, null);
}
/**
@@ -284,6 +348,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 +360,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 +377,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);
@@ -353,6 +419,9 @@ public class Core extends AbstractService {
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) {
@@ -370,6 +439,26 @@ public class Core extends AbstractService {
}
/**
+ * Loads a Sone from an input stream.
+ *
+ * @param soneInputStream
+ * The input stream to load the Sone from
+ * @return The parsed Sone, or {@code null} if the Sone could not be parsed
+ */
+ public Sone loadSone(InputStream soneInputStream) {
+ Sone parsedSone = soneDownloader.parseSone(soneInputStream);
+ if (parsedSone == null) {
+ return null;
+ }
+ if (parsedSone.getInsertUri() != null) {
+ addLocalSone(parsedSone);
+ } else {
+ addSone(parsedSone);
+ }
+ return parsedSone;
+ }
+
+ /**
* Loads and updates the given Sone.
*
* @param sone
@@ -382,10 +471,19 @@ public class Core extends AbstractService {
@SuppressWarnings("synthetic-access")
public void run() {
FreenetURI realRequestUri = sone.getRequestUri().setMetaString(new String[] { "sone.xml" });
- FetchResult fetchResult = freenetInterface.fetchUri(realRequestUri);
- Sone parsedSone = soneDownloader.parseSone(sone, fetchResult, realRequestUri);
- if (parsedSone != null) {
- addSone(parsedSone);
+ 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();
@@ -460,6 +558,52 @@ public class Core extends AbstractService {
return replies;
}
+ /**
+ * Gets all Sones that like the given post.
+ *
+ * @param post
+ * The post to check for
+ * @return All Sones that like the post
+ */
+ public Set getLikes(final Post post) {
+ return Filters.filteredSet(getSones(), new Filter() {
+
+ @Override
+ public boolean filterObject(Sone sone) {
+ return sone.isLikedPostId(post.getId());
+ }
+ });
+ }
+
+ /**
+ * Gets all Sones that like the given reply.
+ *
+ * @param reply
+ * The reply to check for
+ * @return All Sones that like the reply
+ */
+ public Set getLikes(final Reply reply) {
+ return Filters.filteredSet(getSones(), new Filter() {
+
+ @Override
+ public boolean filterObject(Sone sone) {
+ return sone.isLikedReplyId(reply.getId());
+ }
+ });
+ }
+
+ /**
+ * 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
//
@@ -492,9 +636,32 @@ public class Core extends AbstractService {
/**
* Loads the configuration.
*/
+ @SuppressWarnings("unchecked")
private void loadConfiguration() {
logger.entering(Core.class.getName(), "loadConfiguration()");
+ options.addIntegerOption("InsertionDelay", new DefaultOption(60, new OptionWatcher() {
+
+ @Override
+ public void optionChanged(Option option, Integer oldValue, Integer newValue) {
+ SoneInserter.setInsertionDelay(newValue);
+ }
+
+ }));
+
+ options.addBooleanOption("ClearOnNextRestart", new DefaultOption(false)).set(configuration.getBooleanValue("Option/ClearOnNextRestart").getValue(null));
+ options.addBooleanOption("ReallyClearOnNextRestart", new DefaultOption(false)).set(configuration.getBooleanValue("Option/ReallyClearOnNextRestart").getValue(null));
+
+ boolean clearConfiguration = options.getBooleanOption("ClearOnNextRestart").get() && options.getBooleanOption("ReallyClearOnNextRestart").get();
+ options.getBooleanOption("ClearOnNextRestart").set(null);
+ options.getBooleanOption("ReallyClearOnNextRestart").set(null);
+ if (clearConfiguration) {
+ /* stop loading the configuration. */
+ return;
+ }
+
+ options.getIntegerOption("InsertionDelay").set(configuration.getIntValue("Option/InsertionDelay").getValue(null));
+
/* parse local Sones. */
logger.log(Level.INFO, "Loading Sonesâ¦");
int soneId = 0;
@@ -512,11 +679,15 @@ public class Core extends AbstractService {
String firstName = configuration.getStringValue(sonePrefix + "/Profile/FirstName").getValue(null);
String middleName = configuration.getStringValue(sonePrefix + "/Profile/MiddleName").getValue(null);
String lastName = configuration.getStringValue(sonePrefix + "/Profile/LastName").getValue(null);
+ Integer birthDay = configuration.getIntValue(sonePrefix + "/Profile/BirthDay").getValue(null);
+ Integer birthMonth = configuration.getIntValue(sonePrefix + "/Profile/BirthMonth").getValue(null);
+ Integer birthYear = configuration.getIntValue(sonePrefix + "/Profile/BirthYear").getValue(null);
try {
Profile profile = new Profile();
profile.setFirstName(firstName);
profile.setMiddleName(middleName);
profile.setLastName(lastName);
+ profile.setBirthDay(birthDay).setBirthMonth(birthMonth).setBirthYear(birthYear);
Sone sone = getSone(id).setName(name).setTime(time).setRequestUri(new FreenetURI(requestUri)).setInsertUri(new FreenetURI(insertUri));
sone.setProfile(profile);
int postId = 0;
@@ -571,6 +742,28 @@ public class Core extends AbstractService {
sone.addBlockedSoneId(blockedSoneId);
}
+ /* load liked post IDs. */
+ int likedPostIdCounter = 0;
+ while (true) {
+ String likedPostIdPrefix = sonePrefix + "/LikedPostId." + likedPostIdCounter++;
+ String likedPostId = configuration.getStringValue(likedPostIdPrefix + "/ID").getValue(null);
+ if (likedPostId == null) {
+ break;
+ }
+ sone.addLikedPostId(likedPostId);
+ }
+
+ /* load liked reply IDs. */
+ int likedReplyIdCounter = 0;
+ while (true) {
+ String likedReplyIdPrefix = sonePrefix + "/LikedReplyId." + likedReplyIdCounter++;
+ String likedReplyId = configuration.getStringValue(likedReplyIdPrefix + "/ID").getValue(null);
+ if (likedReplyId == null) {
+ break;
+ }
+ sone.addLikedReplyId(likedReplyId);
+ }
+
sone.setModificationCounter(modificationCounter);
addLocalSone(sone);
} catch (MalformedURLException mue1) {
@@ -610,7 +803,13 @@ public class Core extends AbstractService {
private void saveConfiguration() {
Set sones = getSones();
logger.log(Level.INFO, "Storing %d Sonesâ¦", sones.size());
+
try {
+ /* store the options first. */
+ configuration.getIntValue("Option/InsertionDelay").setValue(options.getIntegerOption("InsertionDelay").getReal());
+ configuration.getBooleanValue("Option/ClearOnNextRestart").setValue(options.getBooleanOption("ClearOnNextRestart").getReal());
+ configuration.getBooleanValue("Option/ReallyClearOnNextRestart").setValue(options.getBooleanOption("ReallyClearOnNextRestart").getReal());
+
/* store all Sones. */
int soneId = 0;
for (Sone sone : localSones) {
@@ -625,6 +824,9 @@ public class Core extends AbstractService {
configuration.getStringValue(sonePrefix + "/Profile/FirstName").setValue(profile.getFirstName());
configuration.getStringValue(sonePrefix + "/Profile/MiddleName").setValue(profile.getMiddleName());
configuration.getStringValue(sonePrefix + "/Profile/LastName").setValue(profile.getLastName());
+ configuration.getIntValue(sonePrefix + "/Profile/BirthDay").setValue(profile.getBirthDay());
+ configuration.getIntValue(sonePrefix + "/Profile/BirthMonth").setValue(profile.getBirthMonth());
+ configuration.getIntValue(sonePrefix + "/Profile/BirthYear").setValue(profile.getBirthYear());
int postId = 0;
for (Post post : sone.getPosts()) {
String postPrefix = sonePrefix + "/Post." + postId++;
@@ -664,6 +866,22 @@ public class Core extends AbstractService {
}
configuration.getStringValue(sonePrefix + "/BlockedSone." + blockedSoneCounter + "/ID").setValue(null);
+ /* write all liked posts. */
+ int likedPostIdCounter = 0;
+ for (String soneLikedPostId : sone.getLikedPostIds()) {
+ String likedPostIdPrefix = sonePrefix + "/LikedPostId." + likedPostIdCounter++;
+ configuration.getStringValue(likedPostIdPrefix + "/ID").setValue(soneLikedPostId);
+ }
+ configuration.getStringValue(sonePrefix + "/LikedPostId." + likedPostIdCounter + "/ID").setValue(null);
+
+ /* write all liked replies. */
+ int likedReplyIdCounter = 0;
+ for (String soneLikedReplyId : sone.getLikedReplyIds()) {
+ String likedReplyIdPrefix = sonePrefix + "/LikedReplyId." + likedReplyIdCounter++;
+ configuration.getStringValue(likedReplyIdPrefix + "/ID").setValue(soneLikedReplyId);
+ }
+ configuration.getStringValue(sonePrefix + "/LikedReplyId." + likedReplyIdCounter + "/ID").setValue(null);
+
}
/* write null ID as terminator. */
configuration.getStringValue("Sone/Sone." + soneId + "/ID").setValue(null);