X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=15e054f957413db5725a818b893f1977b5a746df;hb=bb272e31ec32fb5f7d09ff08180ffafd41e91796;hp=259667bb4af97ef37ad7a93252a850868ffe6d2f;hpb=08f0784ec6247da055b3d07835aa089333de0bcb;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
index 259667b..15e054f 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -20,19 +20,29 @@ package net.pterodactylus.sone.core;
import java.io.InputStreamReader;
import java.io.StringWriter;
import java.nio.charset.Charset;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;
+import net.pterodactylus.sone.core.Core.SoneStatus;
+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.main.SonePlugin;
import net.pterodactylus.util.io.Closer;
import net.pterodactylus.util.logging.Logging;
import net.pterodactylus.util.service.AbstractService;
-import net.pterodactylus.util.template.DefaultTemplateFactory;
+import net.pterodactylus.util.template.HtmlFilter;
import net.pterodactylus.util.template.ReflectionAccessor;
import net.pterodactylus.util.template.Template;
+import net.pterodactylus.util.template.TemplateContext;
+import net.pterodactylus.util.template.TemplateContextFactory;
import net.pterodactylus.util.template.TemplateException;
+import net.pterodactylus.util.template.TemplateParser;
import net.pterodactylus.util.template.XmlFilter;
import freenet.client.async.ManifestElement;
import freenet.keys.FreenetURI;
@@ -47,38 +57,99 @@ public class SoneInserter extends AbstractService {
/** The logger. */
private static final Logger logger = Logging.getLogger(SoneInserter.class);
+ /** The insertion delay (in seconds). */
+ private static volatile int insertionDelay = 60;
+
/** The template factory used to create the templates. */
- private static final DefaultTemplateFactory templateFactory = new DefaultTemplateFactory();
+ private static final TemplateContextFactory templateContextFactory = new TemplateContextFactory();
static {
- templateFactory.addAccessor(Object.class, new ReflectionAccessor());
- templateFactory.addFilter("xml", new XmlFilter());
+ templateContextFactory.addAccessor(Object.class, new ReflectionAccessor());
+ templateContextFactory.addFilter("xml", new XmlFilter());
+ templateContextFactory.addFilter("html", new HtmlFilter());
}
/** The UTF-8 charset. */
private static final Charset utf8Charset = Charset.forName("UTF-8");
+ /** The core. */
+ private final Core core;
+
/** The Freenet interface. */
private final FreenetInterface freenetInterface;
/** The Sone to insert. */
private final Sone sone;
+ /** Whether a modification has been detected. */
+ private volatile boolean modified = false;
+
+ /** The fingerprint of the last insert. */
+ private volatile String lastInsertFingerprint;
+
/**
* Creates a new Sone inserter.
*
+ * @param core
+ * The core
* @param freenetInterface
* The freenet interface
* @param sone
* The Sone to insert
*/
- public SoneInserter(FreenetInterface freenetInterface, Sone sone) {
- super("Sone Inserter for â" + sone.getName() + "â");
+ public SoneInserter(Core core, FreenetInterface freenetInterface, Sone sone) {
+ super("Sone Inserter for â" + sone.getName() + "â", false);
+ this.core = core;
this.freenetInterface = freenetInterface;
this.sone = sone;
}
//
+ // ACCESSORS
+ //
+
+ /**
+ * Changes the insertion delay, i.e. the time the Sone inserter waits after
+ * it has noticed a Sone modification before it starts the insert.
+ *
+ * @param insertionDelay
+ * The insertion delay (in seconds)
+ */
+ public static void setInsertionDelay(int insertionDelay) {
+ SoneInserter.insertionDelay = insertionDelay;
+ }
+
+ /**
+ * Returns the fingerprint of the last insert.
+ *
+ * @return The fingerprint of the last insert
+ */
+ public String getLastInsertFingerprint() {
+ return lastInsertFingerprint;
+ }
+
+ /**
+ * Sets the fingerprint of the last insert.
+ *
+ * @param lastInsertFingerprint
+ * The fingerprint of the last insert
+ */
+ public void setLastInsertFingerprint(String lastInsertFingerprint) {
+ this.lastInsertFingerprint = lastInsertFingerprint;
+ }
+
+ /**
+ * Returns whether the Sone inserter has detected a modification of the
+ * Sone.
+ *
+ * @return {@code true} if the Sone has been modified, {@code false}
+ * otherwise
+ */
+ public boolean isModified() {
+ return modified;
+ }
+
+ //
// SERVICE METHODS
//
@@ -87,33 +158,67 @@ public class SoneInserter extends AbstractService {
*/
@Override
protected void serviceRun() {
- long modificationCounter = 0;
- boolean restartNow = true;
- while (!shouldStop()) {
- if (!restartNow) {
- logger.log(Level.FINEST, "Waiting 60 seconds before checking Sone â" + sone.getName() + "â.");
- sleep(60 * 1000);
+ long lastModificationTime = 0;
+ String lastFingerprint = "";
+ while (!shouldStop()) { try {
+ /* check every seconds. */
+ sleep(1000);
+
+ /* donât insert locked Sones. */
+ if (core.isLocked(sone)) {
+ /* trigger redetection when the Sone is unlocked. */
+ synchronized (sone) {
+ modified = !sone.getFingerprint().equals(lastInsertFingerprint);
+ }
+ lastFingerprint = "";
+ lastModificationTime = 0;
+ continue;
}
- restartNow = false;
+
InsertInformation insertInformation = null;
synchronized (sone) {
- modificationCounter = sone.getModificationCounter();
- if (modificationCounter > 0) {
- sone.setTime(System.currentTimeMillis());
- insertInformation = new InsertInformation(sone.getRequestUri(), sone.getInsertUri());
+ String fingerprint = sone.getFingerprint();
+ if (!fingerprint.equals(lastFingerprint)) {
+ if (fingerprint.equals(lastInsertFingerprint)) {
+ modified = false;
+ lastModificationTime = 0;
+ logger.log(Level.FINE, "Sone %s has been reverted to last insert state.", sone);
+ } else {
+ lastModificationTime = System.currentTimeMillis();
+ modified = true;
+ logger.log(Level.FINE, "Sone %s has been modified, waiting %d seconds before inserting.", new Object[] { sone.getName(), insertionDelay });
+ }
+ lastFingerprint = fingerprint;
+ }
+ if (modified && (lastModificationTime > 0) && ((System.currentTimeMillis() - lastModificationTime) > (insertionDelay * 1000))) {
+ lastInsertFingerprint = fingerprint;
+ insertInformation = new InsertInformation(sone);
}
}
+
if (insertInformation != null) {
logger.log(Level.INFO, "Inserting Sone â%sââ¦", new Object[] { sone.getName() });
boolean success = false;
try {
- FreenetURI finalUri = freenetInterface.insertDirectory(insertInformation.getInsertUri().setKeyType("USK").setDocName("Sone-" + sone.getName()).setSuggestedEdition(0), insertInformation.generateManifestEntries(), "index.html");
- sone.updateUris(finalUri);
+ core.setSoneStatus(sone, SoneStatus.inserting);
+ long insertTime = System.currentTimeMillis();
+ insertInformation.setTime(insertTime);
+ FreenetURI finalUri = freenetInterface.insertDirectory(insertInformation.getInsertUri(), insertInformation.generateManifestEntries(), "index.html");
+ /* at this point we might already be stopped. */
+ if (shouldStop()) {
+ /* if so, bail out, donât change anything. */
+ break;
+ }
+ sone.setTime(insertTime);
+ sone.setLatestEdition(finalUri.getEdition());
+ core.saveSone(sone);
success = true;
logger.log(Level.INFO, "Inserted Sone â%sâ at %s.", new Object[] { sone.getName(), finalUri });
} catch (SoneException se1) {
logger.log(Level.WARNING, "Could not insert Sone â" + sone.getName() + "â!", se1);
+ } finally {
+ core.setSoneStatus(sone, SoneStatus.idle);
}
/*
@@ -122,17 +227,18 @@ public class SoneInserter extends AbstractService {
*/
if (success) {
synchronized (sone) {
- if (sone.getModificationCounter() == modificationCounter) {
+ if (lastInsertFingerprint.equals(sone.getFingerprint())) {
logger.log(Level.FINE, "Sone â%sâ was not modified further, resetting counterâ¦", new Object[] { sone });
- sone.setModificationCounter(0);
- } else {
- logger.log(Level.FINE, "Sone â%sâ was modified since the insert started, starting another insertâ¦", new Object[] { sone });
- restartNow = true;
+ core.saveSone(sone);
+ lastModificationTime = 0;
+ modified = false;
}
}
}
}
- }
+ } catch (Throwable t1) {
+ logger.log(Level.SEVERE, "SoneInserter threw an Exception!", t1);
+ }}
}
/**
@@ -142,25 +248,28 @@ public class SoneInserter extends AbstractService {
*
* @author David âBombeâ Roden
*/
- private class InsertInformation {
-
- /** The request URI of the Sone. */
- private final FreenetURI requestUri;
+ private static class InsertInformation {
- /** The insert URI of the Sone. */
- private final FreenetURI insertUri;
+ /** All properties of the Sone, copied for thread safety. */
+ private final Map soneProperties = new HashMap();
/**
* Creates a new insert information container.
*
- * @param requestUri
- * The request URI of the Sone
- * @param insertUri
- * The insert URI of the Sone
+ * @param sone
+ * The sone to insert
*/
- public InsertInformation(FreenetURI requestUri, FreenetURI insertUri) {
- this.requestUri = requestUri;
- this.insertUri = insertUri;
+ public InsertInformation(Sone sone) {
+ soneProperties.put("id", sone.getId());
+ soneProperties.put("name", sone.getName());
+ soneProperties.put("time", sone.getTime());
+ soneProperties.put("requestUri", sone.getRequestUri());
+ soneProperties.put("insertUri", sone.getInsertUri());
+ soneProperties.put("profile", sone.getProfile());
+ soneProperties.put("posts", new ArrayList(sone.getPosts()));
+ soneProperties.put("replies", new HashSet(sone.getReplies()));
+ soneProperties.put("likedPostIds", new HashSet(sone.getLikedPostIds()));
+ soneProperties.put("likedReplyIds", new HashSet(sone.getLikedReplyIds()));
}
//
@@ -168,22 +277,22 @@ public class SoneInserter extends AbstractService {
//
/**
- * Returns the request URI of the Sone.
+ * Returns the insert URI of the Sone.
*
- * @return The request URI of the Sone
+ * @return The insert URI of the Sone
*/
- @SuppressWarnings("unused")
- public FreenetURI getRequestUri() {
- return requestUri;
+ public FreenetURI getInsertUri() {
+ return (FreenetURI) soneProperties.get("insertUri");
}
/**
- * Returns the insert URI of the Sone.
+ * Sets the time of the Sone at the time of the insert.
*
- * @return The insert URI of the Sone
+ * @param time
+ * The time of the Sone
*/
- public FreenetURI getInsertUri() {
- return insertUri;
+ public void setTime(long time) {
+ soneProperties.put("time", time);
}
//
@@ -224,21 +333,25 @@ public class SoneInserter extends AbstractService {
*/
@SuppressWarnings("synthetic-access")
private ManifestElement createManifestElement(String name, String contentType, String templateName) {
- InputStreamReader templateInputStreamReader;
- Template template = templateFactory.createTemplate(templateInputStreamReader = new InputStreamReader(getClass().getResourceAsStream(templateName), utf8Charset));
+ InputStreamReader templateInputStreamReader = null;
+ Template template;
try {
- template.parse();
+ templateInputStreamReader = new InputStreamReader(getClass().getResourceAsStream(templateName), utf8Charset);
+ template = TemplateParser.parse(templateInputStreamReader);
} catch (TemplateException te1) {
logger.log(Level.SEVERE, "Could not parse template â" + templateName + "â!", te1);
return null;
} finally {
Closer.close(templateInputStreamReader);
}
- template.set("currentSone", sone);
+
+ TemplateContext templateContext = templateContextFactory.createTemplateContext();
+ templateContext.set("currentSone", soneProperties);
+ templateContext.set("version", SonePlugin.VERSION);
StringWriter writer = new StringWriter();
StringBucket bucket = null;
try {
- template.render(writer);
+ template.render(templateContext, writer);
bucket = new StringBucket(writer.toString(), utf8Charset);
return new ManifestElement(name, bucket, contentType, bucket.size());
} catch (TemplateException te1) {