X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=fec4e8f66c6d887fa7c0448db03a378df5767465;hb=7379bb70d4db3b419deed77f0df95f74c4b0e038;hp=af0f27ee3832a099ecb5a6f921ea141a1c280975;hpb=c81560515806933fcf632cafa8cdc3da7dc165e5;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 af0f27e..fec4e8f 100644 --- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java +++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java @@ -20,17 +20,27 @@ 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.ReflectionAccessor; import net.pterodactylus.util.template.Template; +import net.pterodactylus.util.template.TemplateException; +import net.pterodactylus.util.template.XmlFilter; import freenet.client.async.ManifestElement; import freenet.keys.FreenetURI; @@ -44,37 +54,98 @@ 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(); static { templateFactory.addAccessor(Object.class, new ReflectionAccessor()); + templateFactory.addFilter("xml", new XmlFilter()); } /** 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 // @@ -83,25 +154,64 @@ public class SoneInserter extends AbstractService { */ @Override protected void serviceRun() { - long modificationCounter = 0; + long lastModificationTime = 0; + String lastFingerprint = ""; while (!shouldStop()) { + /* 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; + } + InsertInformation insertInformation = null; synchronized (sone) { - modificationCounter = sone.getModificationCounter(); - if (modificationCounter > 0) { - 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; + sone.setTime(lastModificationTime); + 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"); + core.setSoneStatus(sone, SoneStatus.inserting); + FreenetURI finalUri = freenetInterface.insertDirectory(insertInformation.getInsertUri().setKeyType("USK").setSuggestedEdition(0), insertInformation.generateManifestEntries(), "index.html"); + /* at this point we might already be stopped. */ + if (shouldStop()) { + /* if so, bail out, don’t change anything. */ + break; + } + sone.setLatestEdition(finalUri.getEdition()); 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); } /* @@ -110,14 +220,15 @@ public class SoneInserter extends AbstractService { */ if (success) { synchronized (sone) { - if (sone.getModificationCounter() == modificationCounter) { - sone.setModificationCounter(0); + if (lastInsertFingerprint.equals(sone.getFingerprint())) { + logger.log(Level.FINE, "Sone “%s” was not modified further, resetting counter…", new Object[] { sone }); + core.saveSone(sone); + lastModificationTime = 0; + modified = false; } } } } - logger.log(Level.FINEST, "Waiting 60 seconds before checking Sone “" + sone.getName() + "” again."); - sleep(60 * 1000); } } @@ -130,23 +241,26 @@ public class SoneInserter extends AbstractService { */ private class InsertInformation { - /** The request URI of the Sone. */ - private final FreenetURI requestUri; - - /** 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())); } // @@ -154,22 +268,12 @@ public class SoneInserter extends AbstractService { // /** - * Returns the request URI of the Sone. - * - * @return The request URI of the Sone - */ - @SuppressWarnings("unused") - public FreenetURI getRequestUri() { - return requestUri; - } - - /** * Returns the insert URI of the Sone. * * @return The insert URI of the Sone */ public FreenetURI getInsertUri() { - return insertUri; + return (FreenetURI) soneProperties.get("insertUri"); } // @@ -210,12 +314,34 @@ public class SoneInserter extends AbstractService { */ @SuppressWarnings("synthetic-access") private ManifestElement createManifestElement(String name, String contentType, String templateName) { - Template template = templateFactory.createTemplate(new InputStreamReader(getClass().getResourceAsStream(templateName), utf8Charset)); - template.set("currentSone", sone); + InputStreamReader templateInputStreamReader; + Template template = templateFactory.createTemplate(templateInputStreamReader = new InputStreamReader(getClass().getResourceAsStream(templateName), utf8Charset)); + try { + template.parse(); + } catch (TemplateException te1) { + logger.log(Level.SEVERE, "Could not parse template “" + templateName + "”!", te1); + return null; + } finally { + Closer.close(templateInputStreamReader); + } + + template.set("currentSone", soneProperties); + template.set("version", SonePlugin.VERSION); StringWriter writer = new StringWriter(); - template.render(writer); - StringBucket bucket = new StringBucket(writer.toString(), utf8Charset); - return new ManifestElement(name, bucket, contentType, bucket.size()); + StringBucket bucket = null; + try { + template.render(writer); + bucket = new StringBucket(writer.toString(), utf8Charset); + return new ManifestElement(name, bucket, contentType, bucket.size()); + } catch (TemplateException te1) { + logger.log(Level.SEVERE, "Could not render template “" + templateName + "”!", te1); + return null; + } finally { + Closer.close(writer); + if (bucket != null) { + bucket.free(); + } + } } }