X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneDownloader.java;h=4328f02078ec45a6d29370cf68b52288c8568421;hp=091efcae0927d7f7b2af74864baea93bf569d3f3;hb=4b42574c9ec4490100ac3e87b9c2f3aac965a202;hpb=554a8f521027da73bd6519f3480b1ed70b108903

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
index 091efca..7c71ab7 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
@@ -1,167 +1,25 @@
-/*
- * 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 <http://www.gnu.org/licenses/>.
- */
-
 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.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.keys.FreenetURI;
 
-import freenet.client.FetchResult;
-import freenet.support.api.Bucket;
+import com.google.inject.ImplementedBy;
 
 /**
- * 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 <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-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<Sone> sones = new HashSet<Sone>();
-
-	/**
-	 * 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;
-			}
+@ImplementedBy(SoneDownloaderImpl.class)
+public interface SoneDownloader extends Service {
 
-			/* parse profile. */
+	void addSone(Sone sone);
+	Sone fetchSone(Sone sone, FreenetURI soneUri, boolean fetchOnly);
 
-		} 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 fetchSoneAsUskAction(Sone sone);
+	Runnable fetchSoneAsSskAction(Sone sone);
 
 }