X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=734847ae7e035b3eac8fe3379863438dbbea98d0;hb=e89893822ee0b116f964b815b8515acc733ec512;hp=a511d14d27a48880585e47f9e182ecbd1c8eddb3;hpb=c96777831ddacd8399f945a741145b814eef498b;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 a511d14..734847a 100644 --- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java +++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java @@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkArgument; import static java.lang.System.currentTimeMillis; import static net.pterodactylus.sone.data.Album.NOT_EMPTY; +import java.io.InputStream; import java.io.InputStreamReader; import java.io.StringWriter; import java.nio.charset.Charset; @@ -31,6 +32,8 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.logging.Level; import java.util.logging.Logger; +import net.pterodactylus.sone.core.Options.Option; +import net.pterodactylus.sone.core.Options.OptionWatcher; import net.pterodactylus.sone.core.event.SoneInsertAbortedEvent; import net.pterodactylus.sone.core.event.SoneInsertedEvent; import net.pterodactylus.sone.core.event.SoneInsertingEvent; @@ -53,6 +56,7 @@ import net.pterodactylus.util.template.TemplateException; import net.pterodactylus.util.template.TemplateParser; import net.pterodactylus.util.template.XmlFilter; +import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.FluentIterable; import com.google.common.collect.Ordering; import com.google.common.eventbus.EventBus; @@ -94,12 +98,11 @@ public class SoneInserter extends AbstractService { /** The Freenet interface. */ private final FreenetInterface freenetInterface; + private final SoneModificationDetector soneModificationDetector; + /** The Sone to insert. */ private volatile Sone sone; - /** The fingerprint of the last insert. */ - private volatile String lastInsertFingerprint; - /** * Creates a new Sone inserter. * @@ -118,6 +121,7 @@ public class SoneInserter extends AbstractService { this.eventBus = eventBus; this.freenetInterface = freenetInterface; this.sone = sone; + this.soneModificationDetector = new SoneModificationDetector(core, sone, insertionDelay); } // @@ -137,6 +141,11 @@ public class SoneInserter extends AbstractService { return this; } + @VisibleForTesting + static AtomicInteger getInsertionDelay() { + return insertionDelay; + } + /** * Changes the insertion delay, i.e. the time the Sone inserter waits after it * has noticed a Sone modification before it starts the insert. @@ -154,7 +163,7 @@ public class SoneInserter extends AbstractService { * @return The fingerprint of the last insert */ public String getLastInsertFingerprint() { - return lastInsertFingerprint; + return soneModificationDetector.getOriginalFingerprint(); } /** @@ -164,7 +173,7 @@ public class SoneInserter extends AbstractService { * The fingerprint of the last insert */ public void setLastInsertFingerprint(String lastInsertFingerprint) { - this.lastInsertFingerprint = lastInsertFingerprint; + soneModificationDetector.setFingerprint(lastInsertFingerprint); } /** @@ -175,7 +184,7 @@ public class SoneInserter extends AbstractService { * otherwise */ public boolean isModified() { - return !lastInsertFingerprint.equals(sone.getFingerprint()); + return soneModificationDetector.isModified(); } // @@ -187,7 +196,6 @@ public class SoneInserter extends AbstractService { */ @Override protected void serviceRun() { - SoneModificationDetector soneModificationDetector = new SoneModificationDetector(core, sone, insertionDelay); while (!shouldStop()) { try { /* check every second. */ @@ -201,7 +209,6 @@ public class SoneInserter extends AbstractService { try { sone.setStatus(SoneStatus.inserting); long insertTime = currentTimeMillis(); - insertInformation.setTime(insertTime); eventBus.post(new SoneInsertingEvent(sone)); FreenetURI finalUri = freenetInterface.insertDirectory(insertInformation.getInsertUri(), insertInformation.generateManifestEntries(), "index.html"); eventBus.post(new SoneInsertedEvent(sone, currentTimeMillis() - insertTime)); @@ -231,7 +238,6 @@ public class SoneInserter extends AbstractService { if (insertInformation.getFingerprint().equals(sone.getFingerprint())) { logger.log(Level.FINE, String.format("Sone “%s” was not modified further, resetting counter…", sone)); soneModificationDetector.setFingerprint(insertInformation.getFingerprint()); - lastInsertFingerprint = insertInformation.getFingerprint(); core.touchConfiguration(); } } @@ -243,6 +249,15 @@ public class SoneInserter extends AbstractService { } } + static class SetInsertionDelay implements OptionWatcher { + + @Override + public void optionChanged(Option option, Integer oldValue, Integer newValue) { + setInsertionDelay(newValue); + } + + } + /** * Container for information that are required to insert a Sone. This * container merely exists to copy all relevant data without holding a lock @@ -250,7 +265,8 @@ public class SoneInserter extends AbstractService { * * @author David ‘Bombe’ Roden */ - private class InsertInformation { + @VisibleForTesting + class InsertInformation { private final String fingerprint; @@ -267,7 +283,7 @@ public class SoneInserter extends AbstractService { this.fingerprint = sone.getFingerprint(); soneProperties.put("id", sone.getId()); soneProperties.put("name", sone.getName()); - soneProperties.put("time", sone.getTime()); + soneProperties.put("time", currentTimeMillis()); soneProperties.put("requestUri", sone.getRequestUri()); soneProperties.put("insertUri", sone.getInsertUri()); soneProperties.put("profile", sone.getProfile()); @@ -282,7 +298,8 @@ public class SoneInserter extends AbstractService { // ACCESSORS // - private String getFingerprint() { + @VisibleForTesting + String getFingerprint() { return fingerprint; } @@ -295,16 +312,6 @@ public class SoneInserter extends AbstractService { return (FreenetURI) soneProperties.get("insertUri"); } - /** - * Sets the time of the Sone at the time of the insert. - * - * @param time - * The time of the Sone - */ - public void setTime(long time) { - soneProperties.put("time", time); - } - // // ACTIONS // @@ -344,15 +351,18 @@ public class SoneInserter extends AbstractService { @SuppressWarnings("synthetic-access") private ManifestElement createManifestElement(String name, String contentType, String templateName) { InputStreamReader templateInputStreamReader = null; + InputStream templateInputStream = null; Template template; try { - templateInputStreamReader = new InputStreamReader(getClass().getResourceAsStream(templateName), utf8Charset); + templateInputStream = getClass().getResourceAsStream(templateName); + templateInputStreamReader = new InputStreamReader(templateInputStream, utf8Charset); template = TemplateParser.parse(templateInputStreamReader); } catch (TemplateException te1) { logger.log(Level.SEVERE, String.format("Could not parse template “%s”!", templateName), te1); return null; } finally { Closer.close(templateInputStreamReader); + Closer.close(templateInputStream); } TemplateContext templateContext = templateContextFactory.createTemplateContext();