X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=1445613f52c7684a824b414705b518b71a130047;hb=8f2392b1ad71157ffdbc78f8074d5a35543c8c75;hp=51882e92b55b0a3f14e4de4febd09a77259f3a51;hpb=755fb3405eb56f264559a60caf5115b4482392d7;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 51882e9..1445613 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -17,7 +17,10 @@
 
 package net.pterodactylus.sone.core;
 
+import static com.google.common.base.Optional.absent;
+import static com.google.common.base.Optional.of;
 import static com.google.common.base.Preconditions.checkArgument;
+import static java.lang.System.currentTimeMillis;
 import static net.pterodactylus.sone.data.Album.NOT_EMPTY;
 
 import java.io.InputStreamReader;
@@ -51,6 +54,7 @@ import net.pterodactylus.util.template.TemplateException;
 import net.pterodactylus.util.template.TemplateParser;
 import net.pterodactylus.util.template.XmlFilter;
 
+import com.google.common.base.Optional;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.Ordering;
 import com.google.common.eventbus.EventBus;
@@ -188,7 +192,7 @@ public class SoneInserter extends AbstractService {
 	 */
 	@Override
 	protected void serviceRun() {
-		long lastModificationTime = 0;
+		Optional<Long> lastModificationTime = absent();
 		String lastInsertedFingerprint = lastInsertFingerprint;
 		String lastFingerprint = "";
 		while (!shouldStop()) {
@@ -204,42 +208,43 @@ public class SoneInserter extends AbstractService {
 						modified = !sone.getFingerprint().equals(lastInsertedFingerprint);
 					}
 					lastFingerprint = "";
-					lastModificationTime = 0;
+					lastModificationTime = absent();
 					continue;
 				}
 
-				InsertInformation insertInformation = null;
+				boolean insertSoneNow = false;
 				synchronized (sone) {
 					String fingerprint = sone.getFingerprint();
 					if (!fingerprint.equals(lastFingerprint)) {
 						if (fingerprint.equals(lastInsertedFingerprint)) {
 							modified = false;
-							lastModificationTime = 0;
+							lastModificationTime = absent();
 							logger.log(Level.FINE, String.format("Sone %s has been reverted to last insert state.", sone));
 						} else {
-							lastModificationTime = System.currentTimeMillis();
+							lastModificationTime = of(currentTimeMillis());
 							modified = true;
 							logger.log(Level.FINE, String.format("Sone %s has been modified, waiting %d seconds before inserting.", sone.getName(), insertionDelay));
 						}
 						lastFingerprint = fingerprint;
 					}
-					if (modified && (lastModificationTime > 0) && ((System.currentTimeMillis() - lastModificationTime) > (insertionDelay * 1000))) {
+					if (modified && lastModificationTime.isPresent() && ((currentTimeMillis() - lastModificationTime.get()) > (insertionDelay * 1000))) {
 						lastInsertedFingerprint = fingerprint;
-						insertInformation = new InsertInformation(sone);
+						insertSoneNow = true;
 					}
 				}
 
-				if (insertInformation != null) {
+				if (insertSoneNow) {
+					InsertInformation insertInformation = new InsertInformation(sone);
 					logger.log(Level.INFO, String.format("Inserting Sone “%s”…", sone.getName()));
 
 					boolean success = false;
 					try {
 						sone.setStatus(SoneStatus.inserting);
-						long insertTime = System.currentTimeMillis();
+						long insertTime = currentTimeMillis();
 						insertInformation.setTime(insertTime);
 						eventBus.post(new SoneInsertingEvent(sone));
 						FreenetURI finalUri = freenetInterface.insertDirectory(insertInformation.getInsertUri(), insertInformation.generateManifestEntries(), "index.html");
-						eventBus.post(new SoneInsertedEvent(sone, System.currentTimeMillis() - insertTime));
+						eventBus.post(new SoneInsertedEvent(sone, currentTimeMillis() - insertTime));
 						/* at this point we might already be stopped. */
 						if (shouldStop()) {
 							/* if so, bail out, don’t change anything. */
@@ -265,7 +270,7 @@ public class SoneInserter extends AbstractService {
 						synchronized (sone) {
 							if (lastInsertedFingerprint.equals(sone.getFingerprint())) {
 								logger.log(Level.FINE, String.format("Sone “%s” was not modified further, resetting counter…", sone));
-								lastModificationTime = 0;
+								lastModificationTime = absent();
 								lastInsertFingerprint = lastInsertedFingerprint;
 								core.touchConfiguration();
 								modified = false;