X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloader.java;h=be0be02ef948634d832d9c61c8c7e4da7af48474;hb=144cf48d9b40d0379456d61a504999612f530733;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..be0be02 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@ -1,217 +1,23 @@
-/*
- * Sone - SoneDownloader.java - Copyright © 2010 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
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
package net.pterodactylus.sone.core;
-import java.io.IOException;
-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.data.Sone;
-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 net.pterodactylus.util.service.Service;
-import org.w3c.dom.Document;
-
-import freenet.client.FetchResult;
-import freenet.support.api.Bucket;
+import freenet.keys.FreenetURI;
/**
- * The Sone downloader is responsible for download Sones as they are updated.
+ * Downloads and parses Sone and {@link Core#updateSone(Sone) updates the
+ * core}.
*
* @author David âBombeâ Roden
*/
-public class SoneDownloader extends AbstractService {
-
- /** The logger. */
- private static final Logger logger = Logging.getLogger(SoneDownloader.class);
-
- /** The Freenet interface. */
- private final FreenetInterface freenetInterface;
-
- /** The sones to update. */
- private final Set sones = new HashSet();
-
- /**
- * Creates a new Sone downloader.
- *
- * @param freenetInterface
- * The Freenet interface
- */
- public SoneDownloader(FreenetInterface freenetInterface) {
- super("Sone Downloader");
- this.freenetInterface = freenetInterface;
- }
-
- //
- // ACTIONS
- //
-
- /**
- * Adds the given Sone to the set of Sones that will be watched for updates.
- *
- * @param sone
- * The Sone to add
- */
- public void addSone(Sone sone) {
- if (sones.add(sone)) {
- freenetInterface.registerUsk(sone, this);
- }
- }
-
- /**
- * Fetches the updated Sone. This method is a callback method for
- * {@link FreenetInterface#registerUsk(Sone, SoneDownloader)}.
- *
- * @param sone
- * 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);
- }
-
- //
- // SERVICE METHODS
- //
-
- /**
- * {@inheritDoc}
- */
- @Override
- protected void serviceStop() {
- for (Sone sone : sones) {
- freenetInterface.unregisterUsk(sone);
- }
- }
-
- //
- // PRIVATE METHODS
- //
-
- /**
- * Updates the contents of the given Sone from the given fetch result.
- *
- * @param sone
- * The Sone to update
- * @param fetchResult
- * The fetch result
- */
- 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;
- try {
- xmlBucket = fetchResult.asBucket();
- xmlInputStream = xmlBucket.getInputStream();
- Document document = XML.transformToDocument(xmlInputStream);
- SimpleXML soneXml = SimpleXML.fromDocument(document);
-
- /* 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) {
- /* TODO - mark Sone as bad. */
- logger.log(Level.WARNING, "Downloaded Sone %s has no profile!", new Object[] { sone });
- return;
- }
-
- /* 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;
- }
-
- 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(new Post(postId, sone, Long.parseLong(postTime), 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;
- }
- }
+public interface SoneDownloader extends Service {
- /* 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;
- }
+ void addSone(Sone sone);
+ void fetchSone(Sone sone, FreenetURI soneUri);
+ Sone fetchSone(Sone sone, FreenetURI soneUri, boolean fetchOnly);
- 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);
- /* TODO - finish! */
- }
- } catch (IOException ioe1) {
- logger.log(Level.WARNING, "Could not read XML file from " + sone + "!", ioe1);
- } finally {
- if (xmlBucket != null) {
- xmlBucket.free();
- }
- Closer.close(xmlInputStream);
- }
- }
+ Runnable fetchSoneWithUriAction(Sone sone);
+ Runnable fetchSoneAction(Sone sone);
}