X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=e8c828cb640b3aa588344bfb212e0bf12f85f3c9;hp=ee98cb2d8aa7dcbe9470f2839baf533868d28862;hb=7615a45cbc702122ab8bfe8d6a5c4932b90c4427;hpb=d30a8ff8477a24f8a1f7c90924ba6d89c0c6242e diff --git a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java index ee98cb2..e8c828c 100644 --- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java +++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java @@ -20,17 +20,30 @@ 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.Collection; import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; 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.filter.Filter; +import net.pterodactylus.util.filter.Filters; +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; @@ -49,8 +62,15 @@ public class SoneInserter extends AbstractService { 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; @@ -60,13 +80,16 @@ public class SoneInserter extends AbstractService { /** * 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) { + public SoneInserter(Core core, FreenetInterface freenetInterface, Sone sone) { super("Sone Inserter for “" + sone.getName() + "”"); + this.core = core; this.freenetInterface = freenetInterface; this.sone = sone; } @@ -81,12 +104,19 @@ 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); + } + restartNow = false; InsertInformation insertInformation = null; synchronized (sone) { modificationCounter = sone.getModificationCounter(); if (modificationCounter > 0) { - insertInformation = new InsertInformation(sone.getRequestUri(), sone.getInsertUri()); + sone.setTime(System.currentTimeMillis()); + insertInformation = new InsertInformation(sone); } } if (insertInformation != null) { @@ -94,11 +124,15 @@ public class SoneInserter extends AbstractService { boolean success = false; try { + core.setSoneStatus(sone, SoneStatus.inserting); FreenetURI finalUri = freenetInterface.insertDirectory(insertInformation.getInsertUri().setKeyType("USK").setDocName("Sone-" + sone.getName()).setSuggestedEdition(0), insertInformation.generateManifestEntries(), "index.html"); + sone.updateUris(finalUri); 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); } /* @@ -108,13 +142,15 @@ public class SoneInserter extends AbstractService { if (success) { synchronized (sone) { 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; } } } } - logger.log(Level.FINEST, "Waiting 60 seconds before checking Sone “" + sone.getName() + "” again."); - sleep(60 * 1000); } } @@ -127,23 +163,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("friends", new HashSet(sone.getFriends())); + soneProperties.put("blockedSoneIds", new HashSet(sone.getBlockedSoneIds())); } // @@ -151,22 +190,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"); } // @@ -178,20 +207,14 @@ public class SoneInserter extends AbstractService { * * @return The manifest entries for the Sone insert */ - @SuppressWarnings("synthetic-access") public HashMap generateManifestEntries() { HashMap manifestEntries = new HashMap(); - Charset utf8Charset = Charset.forName("UTF-8"); - /* first, create an index.html. */ - Template indexTemplate = templateFactory.createTemplate(new InputStreamReader(getClass().getResourceAsStream("/templates/insert/index.html"), utf8Charset)); - indexTemplate.set("currentSone", sone); - StringWriter indexWriter = new StringWriter(); - indexTemplate.render(indexWriter); - StringBucket indexBucket = new StringBucket(indexWriter.toString(), utf8Charset); - ManifestElement indexManifestElement = new ManifestElement("index.html", indexBucket, "text/html; charset=utf-8", indexBucket.size()); - manifestEntries.put("index.html", indexManifestElement); + manifestEntries.put("index.html", 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")); return manifestEntries; } @@ -200,6 +223,61 @@ public class SoneInserter extends AbstractService { // PRIVATE METHODS // + /** + * 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) { + 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); + } + @SuppressWarnings("unchecked") + final Set blockedSoneIds = (Set) soneProperties.get("blockedSoneIds"); + Collection knownSones = Filters.filteredCollection(core.getKnownSones(), new Filter() { + + /** + * {@inheritDoc} + */ + @Override + public boolean filterObject(Sone object) { + return !blockedSoneIds.contains(object.getId()) && !object.getId().equals(soneProperties.get("id")); + } + }); + + template.set("currentSone", soneProperties); + template.set("knownSones", knownSones); + StringWriter writer = new StringWriter(); + 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(); + } + } + } + } }