}
/**
+ * 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)}.
*
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);
- }
+ parseSone(sone, fetchResult);
}
- //
- // 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
+ * @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) {
+ 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();
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;
+ 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);
}
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;
}
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. */
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<Post> posts = new HashSet<Post>();
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(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;
}
}
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<Reply> replies = new HashSet<Reply>();
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;
+ 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;
+ return null;
}
}
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);
+ }
}
}