X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=3dad6f6dcd3a6daba9a570e7c3ab59cc76fa3b07;hp=a66069f19ac7f127d9ab208a3f88b918303ddac8;hb=a47643aed43d118ca68044f95451bb5374cdb332;hpb=bde1cf20c781b7c33934e58cb0beafd1cea5e43b

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
index a66069f..3dad6f6 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -1,5 +1,5 @@
 /*
- * Sone - SoneInserter.java - Copyright © 2010 David Roden
+ * Sone - SoneInserter.java - Copyright © 2010–2012 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
@@ -27,10 +27,11 @@ import java.util.Map;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import net.pterodactylus.sone.core.Core.SoneStatus;
 import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.PostReply;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.data.Sone.SoneStatus;
 import net.pterodactylus.sone.freenet.StringBucket;
 import net.pterodactylus.sone.main.SonePlugin;
 import net.pterodactylus.util.collection.ListBuilder;
@@ -189,6 +190,7 @@ public class SoneInserter extends AbstractService {
 	@Override
 	protected void serviceRun() {
 		long lastModificationTime = 0;
+		String lastInsertedFingerprint = lastInsertFingerprint;
 		String lastFingerprint = "";
 		while (!shouldStop()) { try {
 			/* check every seconds. */
@@ -198,7 +200,7 @@ public class SoneInserter extends AbstractService {
 			if (core.isLocked(sone)) {
 				/* trigger redetection when the Sone is unlocked. */
 				synchronized (sone) {
-					modified = !sone.getFingerprint().equals(lastInsertFingerprint);
+					modified = !sone.getFingerprint().equals(lastInsertedFingerprint);
 				}
 				lastFingerprint = "";
 				lastModificationTime = 0;
@@ -209,7 +211,7 @@ public class SoneInserter extends AbstractService {
 			synchronized (sone) {
 				String fingerprint = sone.getFingerprint();
 				if (!fingerprint.equals(lastFingerprint)) {
-					if (fingerprint.equals(lastInsertFingerprint)) {
+					if (fingerprint.equals(lastInsertedFingerprint)) {
 						modified = false;
 						lastModificationTime = 0;
 						logger.log(Level.FINE, "Sone %s has been reverted to last insert state.", sone);
@@ -221,7 +223,7 @@ public class SoneInserter extends AbstractService {
 					lastFingerprint = fingerprint;
 				}
 				if (modified && (lastModificationTime > 0) && ((System.currentTimeMillis() - lastModificationTime) > (insertionDelay * 1000))) {
-					lastInsertFingerprint = fingerprint;
+					lastInsertedFingerprint = fingerprint;
 					insertInformation = new InsertInformation(sone);
 				}
 			}
@@ -231,7 +233,7 @@ public class SoneInserter extends AbstractService {
 
 				boolean success = false;
 				try {
-					core.setSoneStatus(sone, SoneStatus.inserting);
+					sone.setStatus(SoneStatus.inserting);
 					long insertTime = System.currentTimeMillis();
 					insertInformation.setTime(insertTime);
 					soneInsertListenerManager.fireInsertStarted();
@@ -251,7 +253,7 @@ public class SoneInserter extends AbstractService {
 					soneInsertListenerManager.fireInsertAborted(se1);
 					logger.log(Level.WARNING, "Could not insert Sone “" + sone.getName() + "”!", se1);
 				} finally {
-					core.setSoneStatus(sone, SoneStatus.idle);
+					sone.setStatus(SoneStatus.idle);
 				}
 
 				/*
@@ -260,9 +262,11 @@ public class SoneInserter extends AbstractService {
 				 */
 				if (success) {
 					synchronized (sone) {
-						if (lastInsertFingerprint.equals(sone.getFingerprint())) {
+						if (lastInsertedFingerprint.equals(sone.getFingerprint())) {
 							logger.log(Level.FINE, "Sone “%s” was not modified further, resetting counter…", new Object[] { sone });
 							lastModificationTime = 0;
+							lastInsertFingerprint = lastInsertedFingerprint;
+							core.touchConfiguration();
 							modified = false;
 						}
 					}
@@ -299,7 +303,7 @@ public class SoneInserter extends AbstractService {
 			soneProperties.put("insertUri", sone.getInsertUri());
 			soneProperties.put("profile", sone.getProfile());
 			soneProperties.put("posts", new ListBuilder<Post>(new ArrayList<Post>(sone.getPosts())).sort(Post.TIME_COMPARATOR).get());
-			soneProperties.put("replies", new ListBuilder<Reply>(new ArrayList<Reply>(sone.getReplies())).sort(new ReverseComparator<Reply>(Reply.TIME_COMPARATOR)).get());
+			soneProperties.put("replies", new ListBuilder<PostReply>(new ArrayList<PostReply>(sone.getReplies())).sort(new ReverseComparator<Reply<?>>(Reply.TIME_COMPARATOR)).get());
 			soneProperties.put("likedPostIds", new HashSet<String>(sone.getLikedPostIds()));
 			soneProperties.put("likedReplyIds", new HashSet<String>(sone.getLikedReplyIds()));
 			soneProperties.put("albums", sone.getAllAlbums());