X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloader.java;h=9b48d7d0fe569bb159c3ebf2fe635c3a99d546e3;hb=793370e43152d61ca04699fdfccf39fd73707806;hp=47bd9405cd50bd5bc69151b24763e1cd2caa3c05;hpb=dc741dd2dd66c879f1fe79807933994851c03c5e;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 47bd940..9b48d7d 100644 --- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java +++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java @@ -24,6 +24,7 @@ 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.Profile; import net.pterodactylus.sone.data.Reply; @@ -37,6 +38,7 @@ 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 +51,9 @@ public class SoneDownloader extends AbstractService { /** The logger. */ private static final Logger logger = Logging.getLogger(SoneDownloader.class); + /** The core. */ + private final Core core; + /** The Freenet interface. */ private final FreenetInterface freenetInterface; @@ -58,11 +63,14 @@ public class SoneDownloader extends AbstractService { /** * Creates a new Sone downloader. * + * @param core + * The core * @param freenetInterface * The Freenet interface */ - public SoneDownloader(FreenetInterface freenetInterface) { - super("Sone Downloader"); + public SoneDownloader(Core core, FreenetInterface freenetInterface) { + super("Sone Downloader", false); + this.core = core; this.freenetInterface = freenetInterface; } @@ -83,6 +91,18 @@ public class SoneDownloader extends AbstractService { } /** + * 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); + } + } + + /** * Fetches the updated Sone. This method is a callback method for * {@link FreenetInterface#registerUsk(Sone, SoneDownloader)}. * @@ -91,68 +111,95 @@ public class SoneDownloader extends AbstractService { */ 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); - } - - // - // SERVICE METHODS - // - - /** - * {@inheritDoc} - */ - @Override - protected void serviceStop() { - for (Sone sone : sones) { - freenetInterface.unregisterUsk(sone); + FreenetURI requestUri = sone.getRequestUri().setMetaString(new String[] { "sone.xml" }); + core.setSoneStatus(sone, SoneStatus.downloading); + try { + FetchResult fetchResult = freenetInterface.fetchUri(requestUri); + if (fetchResult == null) { + /* TODO - mark Sone as bad. */ + return; + } + logger.log(Level.FINEST, "Got %d bytes back.", fetchResult.size()); + Sone parsedSone = parseSone(sone, fetchResult, requestUri); + if (parsedSone != null) { + core.addSone(parsedSone); + } + } finally { + core.setSoneStatus(sone, (sone.getTime() == 0) ? SoneStatus.unknown : SoneStatus.idle); } } - // - // PRIVATE METHODS - // - /** - * Updates the contents of the given Sone from the given fetch result. + * Parses a Sone from a fetch result. * - * @param sone - * The Sone to update + * @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 */ - 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 }); + public Sone parseSone(Sone originalSone, FetchResult fetchResult, FreenetURI requestUri) { + logger.log(Level.FINEST, "Persing FetchResult (%d bytes, %s) for %s…", new Object[] { fetchResult.size(), fetchResult.getMimeType(), originalSone }); /* TODO - impose a size limit? */ InputStream xmlInputStream = null; Bucket xmlBucket = null; + Sone sone; try { xmlBucket = fetchResult.asBucket(); xmlInputStream = xmlBucket.getInputStream(); Document document = XML.transformToDocument(xmlInputStream); - SimpleXML soneXml = SimpleXML.fromDocument(document); + 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 " + originalSone + " can not be parsed!", npe1); + return null; + } /* check ID. */ String soneId = soneXml.getValue("id", null); - if (!sone.getId().equals(soneId)) { + if ((originalSone != null) && !originalSone.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; + logger.log(Level.WARNING, "Downloaded ID for Sone %s (%s) does not match known ID (%s)!", new Object[] { originalSone, originalSone.getId(), soneId }); + return null; + } + + /* load Sone from core. */ + sone = originalSone; + if (sone == null) { + sone = core.getSone(soneId).setRequestUri(requestUri.setMetaString(new String[] {})); } 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; + return null; + } + sone.setName(soneName); + + String soneTime = soneXml.getValue("time", null); + if (soneTime == null) { + /* TODO - mark Sone as bad. */ + logger.log(Level.WARNING, "Downloaded time for Sone %s was null!", new Object[] { sone }); + return null; + } + try { + sone.setTime(Long.parseLong(soneTime)); + } catch (NumberFormatException nfe1) { + /* TODO - mark Sone as bad. */ + logger.log(Level.WARNING, "Downloaded Sone %s with invalid time: %s", new Object[] { sone, soneTime }); + return null; } SimpleXML profileXml = soneXml.getNode("profile"); if (profileXml == null) { /* TODO - mark Sone as bad. */ logger.log(Level.WARNING, "Downloaded Sone %s has no profile!", new Object[] { sone }); - return; + return null; } /* parse profile. */ @@ -166,7 +213,7 @@ public class SoneDownloader extends AbstractService { if (postsXml == null) { /* TODO - mark Sone as bad. */ logger.log(Level.WARNING, "Downloaded Sone %s has no posts!", new Object[] { sone }); - return; + return null; } Set posts = new HashSet(); @@ -177,14 +224,14 @@ public class SoneDownloader extends AbstractService { 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; + return null; } try { - posts.add(new Post(postId, sone, Long.parseLong(postTime), postText)); + 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; + return null; } } @@ -193,7 +240,7 @@ public class SoneDownloader extends AbstractService { if (repliesXml == null) { /* TODO - mark Sone as bad. */ logger.log(Level.WARNING, "Downloaded Sone %s has no replies!", new Object[] { sone }); - return; + return null; } Set replies = new HashSet(); @@ -202,16 +249,52 @@ public class SoneDownloader extends AbstractService { String replyPostId = replyXml.getValue("post-id", null); String replyTime = replyXml.getValue("time", null); String replyText = replyXml.getValue("text", null); - /* TODO - finish! */ + 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 null; + } + 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 null; + } + } + + /* okay, apparently everything was parsed correctly. Now import. */ + /* atomic setter operation on the Sone. */ + synchronized (sone) { + sone.setProfile(profile); + sone.setPosts(posts); + sone.setReplies(replies); + sone.setModificationCounter(0); } } catch (IOException ioe1) { - logger.log(Level.WARNING, "Could not read XML file from " + sone + "!", ioe1); + logger.log(Level.WARNING, "Could not read XML file from " + originalSone + "!", ioe1); + return null; } finally { if (xmlBucket != null) { xmlBucket.free(); } Closer.close(xmlInputStream); } + return sone; + } + + // + // SERVICE METHODS + // + + /** + * {@inheritDoc} + */ + @Override + protected void serviceStop() { + for (Sone sone : sones) { + freenetInterface.unregisterUsk(sone); + } } }