X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneRescuer.java;h=e28f49dc3ddddb97a71c3639efa0013fcf55339f;hb=532076508aac8e03e0ef9914e90c7a0558b66bbe;hp=542ec4aa69596c609af5d0159afa56ca77641016;hpb=0df5e91852f737d760c5a9f54c5667309fbadcc2;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneRescuer.java b/src/main/java/net/pterodactylus/sone/core/SoneRescuer.java
index 542ec4a..e28f49d 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneRescuer.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneRescuer.java
@@ -1,5 +1,5 @@
 /*
- * Sone - SoneRescuer.java - Copyright © 2011 David Roden
+ * Sone - SoneRescuer.java - Copyright © 2011–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,10 +17,15 @@
 
 package net.pterodactylus.sone.core;
 
+import static net.pterodactylus.sone.data.Sone.TO_FREENET_URI;
+
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.util.service.AbstractService;
+
 import freenet.keys.FreenetURI;
 
+import com.google.common.base.Optional;
+
 /**
  * The Sone rescuer downloads older editions of a Sone and updates the currently
  * stored Sone with it.
@@ -62,7 +67,7 @@ public class SoneRescuer extends AbstractService {
 		this.core = core;
 		this.soneDownloader = soneDownloader;
 		this.sone = sone;
-		currentEdition = sone.getRequestUri().getEdition();
+		currentEdition = TO_FREENET_URI.apply(sone).getEdition();
 	}
 
 	//
@@ -146,9 +151,6 @@ public class SoneRescuer extends AbstractService {
 	// SERVICE METHODS
 	//
 
-	/**
-	 * {@inheritDoc}
-	 */
 	@Override
 	protected void serviceRun() {
 		while (!shouldStop()) {
@@ -157,13 +159,13 @@ public class SoneRescuer extends AbstractService {
 			}
 			if (fetching) {
 				core.lockSone(sone);
-				FreenetURI soneUri = sone.getRequestUri().setKeyType("SSK").setDocName("Sone-" + currentEdition).setMetaString(new String[] { "sone.xml" });
+				FreenetURI soneUri = TO_FREENET_URI.apply(sone).setKeyType("SSK").setDocName("Sone-" + currentEdition).setMetaString(new String[] { "sone.xml" });
 				System.out.println("URI: " + soneUri);
-				Sone fetchedSone = soneDownloader.fetchSone(sone, soneUri, true);
+				Optional<Sone> fetchedSone = soneDownloader.fetchSone(sone, soneUri, true);
 				System.out.println("Sone: " + fetchedSone);
-				lastFetchSuccessful = (fetchedSone != null);
+				lastFetchSuccessful = fetchedSone.isPresent();
 				if (lastFetchSuccessful) {
-					core.updateSone(fetchedSone, true);
+					core.updateSone(fetchedSone.get(), true);
 				}
 				fetching = false;
 			}