X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=5b281f6cd52bf3923c948870659164a7a5e9b3ac;hb=275d2834f2222ffa370cbdf0d38813dda62a3d72;hp=11369738fcd172817cba9ab744d6bb8897705077;hpb=8e73d78985dbf9b12257bcd1408d17cef98394c6;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
index 1136973..5b281f6 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -21,7 +21,6 @@ import java.io.InputStreamReader;
 import java.io.StringWriter;
 import java.nio.charset.Charset;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
@@ -33,8 +32,6 @@ import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
 import net.pterodactylus.sone.freenet.StringBucket;
-import net.pterodactylus.util.filter.Filter;
-import net.pterodactylus.util.filter.Filters;
 import net.pterodactylus.util.io.Closer;
 import net.pterodactylus.util.logging.Logging;
 import net.pterodactylus.util.service.AbstractService;
@@ -146,7 +143,12 @@ public class SoneInserter extends AbstractService {
 				try {
 					core.setSoneStatus(sone, SoneStatus.inserting);
 					FreenetURI finalUri = freenetInterface.insertDirectory(insertInformation.getInsertUri().setKeyType("USK").setSuggestedEdition(0), insertInformation.generateManifestEntries(), "index.html");
-					sone.updateUris(finalUri.getEdition());
+					/* at this point we might already be stopped. */
+					if (shouldStop()) {
+						/* if so, bail out, don’t change anything. */
+						break;
+					}
+					sone.setLatestEdition(finalUri.getEdition());
 					success = true;
 					logger.log(Level.INFO, "Inserted Sone “%s” at %s.", new Object[] { sone.getName(), finalUri });
 				} catch (SoneException se1) {
@@ -164,6 +166,7 @@ public class SoneInserter extends AbstractService {
 						if (sone.getModificationCounter() == modificationCounter) {
 							logger.log(Level.FINE, "Sone “%s” was not modified further, resetting counter…", new Object[] { sone });
 							sone.setModificationCounter(0);
+							core.saveSone(sone);
 							modificationCounter = 0;
 							lastModificationTime = 0;
 						}
@@ -265,19 +268,8 @@ public class SoneInserter extends AbstractService {
 			} finally {
 				Closer.close(templateInputStreamReader);
 			}
-			Collection<Sone> knownSones = Filters.filteredCollection(core.getKnownSones(), new Filter<Sone>() {
-
-				/**
-				 * {@inheritDoc}
-				 */
-				@Override
-				public boolean filterObject(Sone object) {
-					return !object.getId().equals(soneProperties.get("id"));
-				}
-			});
 
 			template.set("currentSone", soneProperties);
-			template.set("knownSones", knownSones);
 			StringWriter writer = new StringWriter();
 			StringBucket bucket = null;
 			try {