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.util.io.Closer;
/** 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();
/** 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;
/**
* 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;
+ }
+
+ //
// SERVICE METHODS
//
@Override
protected void serviceRun() {
long modificationCounter = 0;
- boolean restartNow = true;
+ long lastModificationTime = 0;
while (!shouldStop()) {
- if (!restartNow) {
- logger.log(Level.FINEST, "Waiting 60 seconds before checking Sone “" + sone.getName() + "”.");
- sleep(60 * 1000);
- }
- restartNow = false;
+ /* check every seconds. */
+ sleep(1000);
+
InsertInformation insertInformation = null;
synchronized (sone) {
- modificationCounter = sone.getModificationCounter();
- if (modificationCounter > 0) {
- insertInformation = new InsertInformation(sone.getRequestUri(), sone.getInsertUri());
+ if (sone.getModificationCounter() > modificationCounter) {
+ modificationCounter = sone.getModificationCounter();
+ lastModificationTime = System.currentTimeMillis();
+ sone.setTime(lastModificationTime);
+ logger.log(Level.FINE, "Sone %s has been modified, waiting %d seconds before inserting.", new Object[] { sone.getName(), insertionDelay });
+ }
+ if ((lastModificationTime > 0) && ((System.currentTimeMillis() - lastModificationTime) > (insertionDelay * 1000))) {
+ 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);
+ FreenetURI finalUri = freenetInterface.insertDirectory(insertInformation.getInsertUri().setKeyType("USK").setSuggestedEdition(0), insertInformation.generateManifestEntries(), "index.html");
+ 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);
}
/*
if (sone.getModificationCounter() == modificationCounter) {
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);
+ modificationCounter = 0;
+ lastModificationTime = 0;
}
}
}
*/
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<String, Object> soneProperties = new HashMap<String, Object>();
/**
* 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<Post>(sone.getPosts()));
+ soneProperties.put("replies", new HashSet<Reply>(sone.getReplies()));
+ soneProperties.put("likedPostIds", new HashSet<String>(sone.getLikedPostIds()));
+ soneProperties.put("likeReplyIds", new HashSet<String>(sone.getLikedReplyIds()));
}
//
//
/**
- * 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");
}
//
} finally {
Closer.close(templateInputStreamReader);
}
- template.set("currentSone", sone);
+
+ template.set("currentSone", soneProperties);
StringWriter writer = new StringWriter();
StringBucket bucket = null;
try {
projects / Sone.git / blobdiff