X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=ba5d0a93bfa7deb5c76bab89c26be732cd165e71;hb=846bb1e4e723b6a7bd260fd723bf5b4bdef0f3d0;hp=1e93aa67229bca4fa4a8741ba8346bb51ee78bd3;hpb=c74a6b50636ab4c13967ac90fa4155eea028b836;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 1e93aa6..ba5d0a9 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -1,5 +1,5 @@
/*
- * Sone - SoneInserter.java - Copyright © 2010â2013 David Roden
+ * Sone - SoneInserter.java - Copyright © 2010â2016 David Roden
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -17,10 +17,12 @@
package net.pterodactylus.sone.core;
-import static com.google.common.base.Preconditions.checkArgument;
+import static java.lang.String.format;
import static java.lang.System.currentTimeMillis;
+import static java.util.logging.Logger.getLogger;
import static net.pterodactylus.sone.data.Album.NOT_EMPTY;
+import java.io.Closeable;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.StringWriter;
@@ -28,12 +30,13 @@ import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
+import java.util.Set;
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.SoneModificationDetector.LockableFingerprintProvider;
+import net.pterodactylus.sone.core.event.InsertionDelayChangedEvent;
import net.pterodactylus.sone.core.event.SoneInsertAbortedEvent;
import net.pterodactylus.sone.core.event.SoneInsertedEvent;
import net.pterodactylus.sone.core.event.SoneInsertingEvent;
@@ -42,10 +45,8 @@ import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.data.Reply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.data.Sone.SoneStatus;
-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.HtmlFilter;
import net.pterodactylus.util.template.ReflectionAccessor;
@@ -57,22 +58,25 @@ import net.pterodactylus.util.template.TemplateParser;
import net.pterodactylus.util.template.XmlFilter;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Charsets;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.Ordering;
import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
-import freenet.client.async.ManifestElement;
import freenet.keys.FreenetURI;
+import freenet.support.api.Bucket;
+import freenet.support.api.ManifestElement;
+import freenet.support.api.RandomAccessBucket;
+import freenet.support.io.ArrayBucket;
/**
* A Sone inserter is responsible for inserting a Sone if it has changed.
- *
- * @author David âBombeâ Roden
*/
public class SoneInserter extends AbstractService {
/** The logger. */
- private static final Logger logger = Logging.getLogger(SoneInserter.class);
+ private static final Logger logger = getLogger(SoneInserter.class.getName());
/** The insertion delay (in seconds). */
private static final AtomicInteger insertionDelay = new AtomicInteger(60);
@@ -99,9 +103,8 @@ public class SoneInserter extends AbstractService {
private final FreenetInterface freenetInterface;
private final SoneModificationDetector soneModificationDetector;
-
- /** The Sone to insert. */
- private volatile Sone sone;
+ private final long delay;
+ private final String soneId;
/**
* Creates a new Sone inserter.
@@ -112,40 +115,46 @@ public class SoneInserter extends AbstractService {
* The event bus
* @param freenetInterface
* The freenet interface
- * @param sone
- * The Sone to insert
+ * @param soneId
+ * The ID of the Sone to insert
*/
- public SoneInserter(Core core, EventBus eventBus, FreenetInterface freenetInterface, Sone sone) {
- this(core, eventBus, freenetInterface, sone, new SoneModificationDetector(core, sone, insertionDelay));
+ public SoneInserter(final Core core, EventBus eventBus, FreenetInterface freenetInterface, final String soneId) {
+ this(core, eventBus, freenetInterface, soneId, new SoneModificationDetector(new LockableFingerprintProvider() {
+ @Override
+ public boolean isLocked() {
+ Sone sone = core.getSone(soneId);
+ if (sone == null) {
+ return false;
+ }
+ return core.isLocked(sone);
+ }
+
+ @Override
+ public String getFingerprint() {
+ Sone sone = core.getSone(soneId);
+ if (sone == null) {
+ return null;
+ }
+ return sone.getFingerprint();
+ }
+ }, insertionDelay), 1000);
}
@VisibleForTesting
- SoneInserter(Core core, EventBus eventBus, FreenetInterface freenetInterface, Sone sone, SoneModificationDetector soneModificationDetector) {
- super("Sone Inserter for â" + sone.getName() + "â", false);
+ SoneInserter(Core core, EventBus eventBus, FreenetInterface freenetInterface, String soneId, SoneModificationDetector soneModificationDetector, long delay) {
+ super("Sone Inserter for â" + soneId + "â", false);
this.core = core;
this.eventBus = eventBus;
this.freenetInterface = freenetInterface;
- this.sone = sone;
+ this.soneId = soneId;
this.soneModificationDetector = soneModificationDetector;
+ this.delay = delay;
}
//
// ACCESSORS
//
- /**
- * Sets the Sone to insert.
- *
- * @param sone
- * The Sone to insert
- * @return This Sone inserter
- */
- public SoneInserter setSone(Sone sone) {
- checkArgument(sone.equals(this.sone), "Sone to insert can not be set to a different Sone");
- this.sone = sone;
- return this;
- }
-
@VisibleForTesting
static AtomicInteger getInsertionDelay() {
return insertionDelay;
@@ -158,7 +167,7 @@ public class SoneInserter extends AbstractService {
* @param insertionDelay
* The insertion delay (in seconds)
*/
- public static void setInsertionDelay(int insertionDelay) {
+ private static void setInsertionDelay(int insertionDelay) {
SoneInserter.insertionDelay.set(insertionDelay);
}
@@ -168,7 +177,7 @@ public class SoneInserter extends AbstractService {
* @return The fingerprint of the last insert
*/
public String getLastInsertFingerprint() {
- return soneModificationDetector.getOriginalFingerprint();
+ return soneModificationDetector.getLastInsertFingerprint();
}
/**
@@ -204,9 +213,14 @@ public class SoneInserter extends AbstractService {
while (!shouldStop()) {
try {
/* check every second. */
- sleep(1000);
+ sleep(delay);
if (soneModificationDetector.isEligibleForInsert()) {
+ Sone sone = core.getSone(soneId);
+ if (sone == null) {
+ logger.log(Level.WARNING, format("Sone %s has disappeared, exiting inserter.", soneId));
+ return;
+ }
InsertInformation insertInformation = new InsertInformation(sone);
logger.log(Level.INFO, String.format("Inserting Sone â%sââ¦", sone.getName()));
@@ -215,8 +229,8 @@ public class SoneInserter extends AbstractService {
sone.setStatus(SoneStatus.inserting);
long insertTime = currentTimeMillis();
eventBus.post(new SoneInsertingEvent(sone));
- FreenetURI finalUri = freenetInterface.insertDirectory(insertInformation.getInsertUri(), insertInformation.generateManifestEntries(), "index.html");
- eventBus.post(new SoneInsertedEvent(sone, currentTimeMillis() - insertTime));
+ FreenetURI finalUri = freenetInterface.insertDirectory(sone.getInsertUri(), insertInformation.generateManifestEntries(), "index.html");
+ eventBus.post(new SoneInsertedEvent(sone, currentTimeMillis() - insertTime, insertInformation.getFingerprint()));
/* at this point we might already be stopped. */
if (shouldStop()) {
/* if so, bail out, donât change anything. */
@@ -231,6 +245,7 @@ public class SoneInserter extends AbstractService {
eventBus.post(new SoneInsertAbortedEvent(sone, se1));
logger.log(Level.WARNING, String.format("Could not insert Sone â%sâ!", sone.getName()), se1);
} finally {
+ insertInformation.close();
sone.setStatus(SoneStatus.idle);
}
@@ -254,29 +269,23 @@ public class SoneInserter extends AbstractService {
}
}
- static class SetInsertionDelay implements OptionWatcher {
-
- @Override
- public void optionChanged(Option option, Integer oldValue, Integer newValue) {
- setInsertionDelay(newValue);
- }
-
+ @Subscribe
+ public void insertionDelayChanged(InsertionDelayChangedEvent insertionDelayChangedEvent) {
+ setInsertionDelay(insertionDelayChangedEvent.getInsertionDelay());
}
/**
* Container for information that are required to insert a Sone. This
* container merely exists to copy all relevant data without holding a lock
* on the {@link Sone} object for too long.
- *
- * @author David âBombeâ Roden
*/
@VisibleForTesting
- class InsertInformation {
-
- private final String fingerprint;
+ class InsertInformation implements Closeable {
/** All properties of the Sone, copied for thread safety. */
private final Map soneProperties = new HashMap();
+ private final String fingerprint;
+ private final ManifestCreator manifestCreator;
/**
* Creates a new insert information container.
@@ -286,17 +295,18 @@ public class SoneInserter extends AbstractService {
*/
public InsertInformation(Sone sone) {
this.fingerprint = sone.getFingerprint();
+ Map soneProperties = new HashMap();
soneProperties.put("id", sone.getId());
soneProperties.put("name", sone.getName());
soneProperties.put("time", currentTimeMillis());
soneProperties.put("requestUri", sone.getRequestUri());
- soneProperties.put("insertUri", sone.getInsertUri());
soneProperties.put("profile", sone.getProfile());
- soneProperties.put("posts", Ordering.from(Post.TIME_COMPARATOR).sortedCopy(sone.getPosts()));
+ soneProperties.put("posts", Ordering.from(Post.NEWEST_FIRST).sortedCopy(sone.getPosts()));
soneProperties.put("replies", Ordering.from(Reply.TIME_COMPARATOR).reverse().sortedCopy(sone.getReplies()));
soneProperties.put("likedPostIds", new HashSet(sone.getLikedPostIds()));
soneProperties.put("likedReplyIds", new HashSet(sone.getLikedReplyIds()));
soneProperties.put("albums", FluentIterable.from(sone.getRootAlbum().getAlbums()).transformAndConcat(Album.FLATTENER).filter(NOT_EMPTY).toList());
+ manifestCreator = new ManifestCreator(core, soneProperties);
}
//
@@ -308,15 +318,6 @@ public class SoneInserter extends AbstractService {
return fingerprint;
}
- /**
- * Returns the insert URI of the Sone.
- *
- * @return The insert URI of the Sone
- */
- public FreenetURI getInsertUri() {
- return (FreenetURI) soneProperties.get("insertUri");
- }
-
//
// ACTIONS
//
@@ -330,31 +331,41 @@ public class SoneInserter extends AbstractService {
HashMap manifestEntries = new HashMap();
/* first, create an index.html. */
- manifestEntries.put("index.html", createManifestElement("index.html", "text/html; charset=utf-8", "/templates/insert/index.html"));
+ manifestEntries.put("index.html", manifestCreator.createManifestElement(
+ "index.html", "text/html; charset=utf-8",
+ "/templates/insert/index.html"));
/* now, store the sone. */
- manifestEntries.put("sone.xml", createManifestElement("sone.xml", "text/xml; charset=utf-8", "/templates/insert/sone.xml"));
+ manifestEntries.put("sone.xml", manifestCreator.createManifestElement(
+ "sone.xml", "text/xml; charset=utf-8",
+ "/templates/insert/sone.xml"));
return manifestEntries;
}
- //
- // PRIVATE METHODS
- //
+ @Override
+ public void close() {
+ manifestCreator.close();
+ }
- /**
- * Creates a new manifest element.
- *
- * @param name
- * The name of the file
- * @param contentType
- * The content type of the file
- * @param templateName
- * The name of the template to render
- * @return The manifest element
- */
- @SuppressWarnings("synthetic-access")
- private ManifestElement createManifestElement(String name, String contentType, String templateName) {
+ }
+
+ /**
+ * Creates manifest elements for an insert by rendering a template.
+ */
+ @VisibleForTesting
+ static class ManifestCreator implements Closeable {
+
+ private final Core core;
+ private final Map soneProperties;
+ private final Set buckets = new HashSet();
+
+ ManifestCreator(Core core, Map soneProperties) {
+ this.core = core;
+ this.soneProperties = soneProperties;
+ }
+
+ public ManifestElement createManifestElement(String name, String contentType, String templateName) {
InputStreamReader templateInputStreamReader = null;
InputStream templateInputStream = null;
Template template;
@@ -374,21 +385,24 @@ public class SoneInserter extends AbstractService {
templateContext.set("core", core);
templateContext.set("currentSone", soneProperties);
templateContext.set("currentEdition", core.getUpdateChecker().getLatestEdition());
- templateContext.set("version", SonePlugin.VERSION);
+ templateContext.set("version", SonePlugin.getPluginVersion());
StringWriter writer = new StringWriter();
- StringBucket bucket = null;
try {
template.render(templateContext, writer);
- bucket = new StringBucket(writer.toString(), utf8Charset);
+ RandomAccessBucket bucket = new ArrayBucket(writer.toString().getBytes(Charsets.UTF_8));
+ buckets.add(bucket);
return new ManifestElement(name, bucket, contentType, bucket.size());
} catch (TemplateException te1) {
logger.log(Level.SEVERE, String.format("Could not render template â%sâ!", templateName), te1);
return null;
} finally {
Closer.close(writer);
- if (bucket != null) {
- bucket.free();
- }
+ }
+ }
+
+ public void close() {
+ for (Bucket bucket : buckets) {
+ bucket.free();
}
}