X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloader.java;h=a406f1b4ff44417cb35e821861a984fc2e5bc84b;hb=4d49ba7b5f6ebed20a91678ebdcda1388d470dc0;hp=a36c17a917f64ef1136e3809afa341b15cc51ea7;hpb=3fd1050cc49a462ebe956ffaac7ea6b866bbeb9f;p=Sone.git diff --git a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java index a36c17a..a406f1b 100644 --- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java +++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java @@ -1,5 +1,5 @@ /* - * Sone - SoneDownloader.java - Copyright © 2010 David Roden + * Sone - SoneDownloader.java - Copyright © 2010–2013 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,26 +17,24 @@ package net.pterodactylus.sone.core; -import java.io.IOException; +import static java.util.logging.Level.FINER; +import static net.pterodactylus.sone.data.Sone.TO_FREENET_URI; + import java.io.InputStream; import java.util.HashSet; import java.util.Set; import java.util.logging.Level; import java.util.logging.Logger; -import net.pterodactylus.sone.data.Post; -import net.pterodactylus.sone.data.Profile; -import net.pterodactylus.sone.data.Reply; +import net.pterodactylus.sone.core.FreenetInterface.Fetched; import net.pterodactylus.sone.data.Sone; +import net.pterodactylus.sone.data.Sone.SoneStatus; import net.pterodactylus.util.io.Closer; import net.pterodactylus.util.logging.Logging; import net.pterodactylus.util.service.AbstractService; -import net.pterodactylus.util.xml.SimpleXML; -import net.pterodactylus.util.xml.XML; - -import org.w3c.dom.Document; import freenet.client.FetchResult; +import freenet.keys.FreenetURI; import freenet.support.api.Bucket; /** @@ -49,6 +47,9 @@ public class SoneDownloader extends AbstractService { /** The logger. */ private static final Logger logger = Logging.getLogger(SoneDownloader.class); + /** The maximum protocol version. */ + private static final int MAX_PROTOCOL_VERSION = 0; + /** The core. */ private final Core core; @@ -67,7 +68,7 @@ public class SoneDownloader extends AbstractService { * The Freenet interface */ public SoneDownloader(Core core, FreenetInterface freenetInterface) { - super("Sone Downloader"); + super("Sone Downloader", false); this.core = core; this.freenetInterface = freenetInterface; } @@ -83,8 +84,21 @@ public class SoneDownloader extends AbstractService { * The Sone to add */ public void addSone(Sone sone) { - if (sones.add(sone)) { - freenetInterface.registerUsk(sone, this); + if (!sones.add(sone)) { + freenetInterface.unregisterUsk(sone); + } + freenetInterface.registerUsk(sone, this); + } + + /** + * Removes the given Sone from the downloader. + * + * @param sone + * The Sone to stop watching + */ + public void removeSone(Sone sone) { + if (sones.remove(sone)) { + freenetInterface.unregisterUsk(sone); } } @@ -96,151 +110,117 @@ public class SoneDownloader extends AbstractService { * The Sone to fetch */ public void fetchSone(Sone sone) { - logger.log(Level.FINE, "Starting fetch for Sone “%s” from %s…", new Object[] { sone, sone.getRequestUri().setMetaString(new String[] { "sone.xml" }) }); - FetchResult fetchResult = freenetInterface.fetchUri(sone.getRequestUri().setMetaString(new String[] { "sone.xml" })); - logger.log(Level.FINEST, "Got %d bytes back.", fetchResult.size()); - updateSoneFromXml(sone, fetchResult); + fetchSone(sone, TO_FREENET_URI.apply(sone).sskForUSK()); } - // - // SERVICE METHODS - // - /** - * {@inheritDoc} + * Fetches the updated Sone. This method can be used to fetch a Sone from a + * specific URI. + * + * @param sone + * The Sone to fetch + * @param soneUri + * The URI to fetch the Sone from */ - @Override - protected void serviceStop() { - for (Sone sone : sones) { - freenetInterface.unregisterUsk(sone); - } + public void fetchSone(Sone sone, FreenetURI soneUri) { + fetchSone(sone, soneUri, false); } - // - // PRIVATE METHODS - // - /** - * Updates the contents of the given Sone from the given fetch result. + * Fetches the Sone from the given URI. * * @param sone - * The Sone to update - * @param fetchResult - * The fetch result + * The Sone to fetch + * @param soneUri + * The URI of the Sone to fetch + * @param fetchOnly + * {@code true} to only fetch and parse the Sone, {@code false} + * to {@link Core#updateSone(Sone) update} it in the core + * @return The downloaded Sone, or {@code null} if the Sone could not be + * downloaded */ - private void updateSoneFromXml(Sone sone, FetchResult fetchResult) { - logger.log(Level.FINEST, "Persing FetchResult (%d bytes, %s) for %s…", new Object[] { fetchResult.size(), fetchResult.getMimeType(), sone }); - /* TODO - impose a size limit? */ - InputStream xmlInputStream = null; - Bucket xmlBucket = null; + public Sone fetchSone(Sone sone, FreenetURI soneUri, boolean fetchOnly) { + logger.log(Level.FINE, String.format("Starting fetch for Sone “%s” from %s…", sone, soneUri)); + FreenetURI requestUri = soneUri.setMetaString(new String[] { "sone.xml" }); + sone.setStatus(SoneStatus.downloading); try { - xmlBucket = fetchResult.asBucket(); - xmlInputStream = xmlBucket.getInputStream(); - Document document = XML.transformToDocument(xmlInputStream); - SimpleXML soneXml; - try { - soneXml = SimpleXML.fromDocument(document); - } catch (NullPointerException npe1) { - /* for some reason, invalid XML can cause NPEs. */ - logger.log(Level.WARNING, "XML for Sone " + sone + " can not be parsed!", npe1); - return; - } - - /* check ID. */ - String soneId = soneXml.getValue("id", null); - if (!sone.getId().equals(soneId)) { - /* TODO - mark Sone as bad. */ - logger.log(Level.WARNING, "Downloaded ID for Sone %s (%s) does not match known ID (%s)!", new Object[] { sone, sone.getId(), soneId }); - return; - } - - String soneName = soneXml.getValue("name", null); - if (soneName == null) { - /* TODO - mark Sone as bad. */ - logger.log(Level.WARNING, "Downloaded name for Sone %s was null!", new Object[] { sone }); - return; - } - - SimpleXML profileXml = soneXml.getNode("profile"); - if (profileXml == null) { + Fetched fetchResults = freenetInterface.fetchUri(requestUri); + if (fetchResults == null) { /* TODO - mark Sone as bad. */ - logger.log(Level.WARNING, "Downloaded Sone %s has no profile!", new Object[] { sone }); - return; + return null; } - - /* parse profile. */ - String profileFirstName = profileXml.getValue("first-name", null); - String profileMiddleName = profileXml.getValue("middle-name", null); - String profileLastName = profileXml.getValue("last-name", null); - Profile profile = new Profile().setFirstName(profileFirstName).setMiddleName(profileMiddleName).setLastName(profileLastName); - - /* parse posts. */ - SimpleXML postsXml = soneXml.getNode("posts"); - if (postsXml == null) { - /* TODO - mark Sone as bad. */ - logger.log(Level.WARNING, "Downloaded Sone %s has no posts!", new Object[] { sone }); - return; + if (shouldStop()) { + logger.log(FINER, "Sone was stopped, won’t process download."); + return null; } - - Set posts = new HashSet(); - for (SimpleXML postXml : postsXml.getNodes("post")) { - String postId = postXml.getValue("id", null); - String postTime = postXml.getValue("time", null); - String postText = postXml.getValue("text", null); - if ((postId == null) || (postTime == null) || (postText == null)) { - /* TODO - mark Sone as bad. */ - logger.log(Level.WARNING, "Downloaded post for Sone %s with missing data! ID: %s, Time: %s, Text: %s", new Object[] { sone, postId, postTime, postText }); - return; - } - try { - posts.add(core.getPost(postId).setSone(sone).setTime(Long.parseLong(postTime)).setText(postText)); - } catch (NumberFormatException nfe1) { - /* TODO - mark Sone as bad. */ - logger.log(Level.WARNING, "Downloaded post for Sone %s with invalid time: %s", new Object[] { sone, postTime }); - return; + logger.log(Level.FINEST, String.format("Got %d bytes back.", fetchResults.getFetchResult().size())); + Sone parsedSone = parseSone(sone, fetchResults.getFetchResult(), fetchResults.getFreenetUri()); + if (parsedSone != null) { + if (!fetchOnly) { + parsedSone.setStatus((parsedSone.getTime() == 0) ? SoneStatus.unknown : SoneStatus.idle); + core.updateSone(parsedSone); + addSone(parsedSone); } } + return parsedSone; + } finally { + sone.setStatus((sone.getTime() == 0) ? SoneStatus.unknown : SoneStatus.idle); + } + } - /* parse replies. */ - SimpleXML repliesXml = soneXml.getNode("replies"); - if (repliesXml == null) { - /* TODO - mark Sone as bad. */ - logger.log(Level.WARNING, "Downloaded Sone %s has no replies!", new Object[] { sone }); - return; + /** + * Parses a Sone from a fetch result. + * + * @param originalSone + * The sone to parse, or {@code null} if the Sone is yet unknown + * @param fetchResult + * The fetch result + * @param requestUri + * The requested URI + * @return The parsed Sone, or {@code null} if the Sone could not be parsed + */ + public Sone parseSone(Sone originalSone, FetchResult fetchResult, FreenetURI requestUri) { + logger.log(Level.FINEST, String.format("Parsing FetchResult (%d bytes, %s) for %s…", fetchResult.size(), fetchResult.getMimeType(), originalSone)); + Bucket soneBucket = fetchResult.asBucket(); + InputStream soneInputStream = null; + try { + soneInputStream = soneBucket.getInputStream(); + Sone parsedSone = parseSone(originalSone, soneInputStream); + if (parsedSone != null) { + parsedSone.modify().setLatestEdition(requestUri.getEdition()).update(); } + return parsedSone; + } catch (Exception e1) { + logger.log(Level.WARNING, String.format("Could not parse Sone from %s!", requestUri), e1); + } finally { + Closer.close(soneInputStream); + soneBucket.free(); + } + return null; + } - Set replies = new HashSet(); - for (SimpleXML replyXml : repliesXml.getNodes("reply")) { - String replyId = replyXml.getValue("id", null); - String replyPostId = replyXml.getValue("post-id", null); - String replyTime = replyXml.getValue("time", null); - String replyText = replyXml.getValue("text", null); - if ((replyId == null) || (replyPostId == null) || (replyTime == null) || (replyText == null)) { - /* TODO - mark Sone as bad. */ - logger.log(Level.WARNING, "Downloaded reply for Sone %s with missing data! ID: %s, Post: %s, Time: %s, Text: %s", new Object[] { sone, replyId, replyPostId, replyTime, replyText }); - return; - } - try { - replies.add(core.getReply(replyId).setSone(sone).setPost(core.getPost(replyPostId)).setTime(Long.parseLong(replyTime)).setText(replyText)); - } catch (NumberFormatException nfe1) { - /* TODO - mark Sone as bad. */ - logger.log(Level.WARNING, "Downloaded reply for Sone %s with invalid time: %s", new Object[] { sone, replyTime }); - return; - } - } + /** + * Parses a Sone from the given input stream and creates a new Sone from the + * parsed data. + * + * @param originalSone + * The Sone to update + * @param soneInputStream + * The input stream to parse the Sone from + * @return The parsed Sone + */ + public Sone parseSone(Sone originalSone, InputStream soneInputStream) { + return new SoneParser().parseSone(core.getDatabase(), originalSone, soneInputStream); + } - /* okay, apparently everything was parsed correctly. Now import. */ - /* atomic setter operation on the Sone. */ - synchronized (sone) { - sone.setProfile(profile); - } - } catch (IOException ioe1) { - logger.log(Level.WARNING, "Could not read XML file from " + sone + "!", ioe1); - } finally { - if (xmlBucket != null) { - xmlBucket.free(); - } - Closer.close(xmlInputStream); + // + // SERVICE METHODS + // + + @Override + protected void serviceStop() { + for (Sone sone : sones) { + freenetInterface.unregisterUsk(sone); } }