Use an optional instead of a magic value.

[Sone.git] / src / main / java / net / pterodactylus / sone / core / SoneInserter.java

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
index be9f831..d5fe9a2 100644 (file)
--- 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–2012 David Roden
+ * Sone - SoneInserter.java - Copyright © 2010–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,6 +17,12 @@
 
 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;
 import java.io.StringWriter;
 import java.nio.charset.Charset;
@@ -29,6 +35,7 @@ import java.util.logging.Logger;
 import net.pterodactylus.sone.core.event.SoneInsertAbortedEvent;
 import net.pterodactylus.sone.core.event.SoneInsertedEvent;
 import net.pterodactylus.sone.core.event.SoneInsertingEvent;
+import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Post;
 import net.pterodactylus.sone.data.Reply;
 import net.pterodactylus.sone.data.Sone;
@@ -47,6 +54,8 @@ 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;
 
@@ -88,7 +97,7 @@ public class SoneInserter extends AbstractService {
        private final FreenetInterface freenetInterface;
 
        /** The Sone to insert. */
-       private final Sone sone;
+       private volatile Sone sone;
 
        /** Whether a modification has been detected. */
        private volatile boolean modified = false;
@@ -121,8 +130,21 @@ public class SoneInserter extends AbstractService {
        //
 
        /**
-        * Changes the insertion delay, i.e. the time the Sone inserter waits after
-        * it has noticed a Sone modification before it starts the insert.
+        * Sets the Sone to insert.
+        *
+        * @param sone
+        *              The Sone to insert
+        * @return This Sone inserter
+        */
+       public SoneInserter setSone(Sone sone) {
+               checkArgument((this.sone == null) || sone.equals(this.sone), "Sone to insert can not be set to a different Sone");
+               this.sone = sone;
+               return this;
+       }
+
+       /**
+        * Changes the insertion delay, i.e. the time the Sone inserter waits after it
+        * has noticed a Sone modification before it starts the insert.
         *
         * @param insertionDelay
         *            The insertion delay (in seconds)
@@ -170,22 +192,23 @@ public class SoneInserter extends AbstractService {
         */
        @Override
        protected void serviceRun() {
-               long lastModificationTime = 0;
+               Optional<Long> lastModificationTime = absent();
                String lastInsertedFingerprint = lastInsertFingerprint;
                String lastFingerprint = "";
                while (!shouldStop()) {
                        try {
-                               /* check every seconds. */
+                               /* check every second. */
                                sleep(1000);
 
                                /* don’t insert locked Sones. */
+                               Sone sone = this.sone;
                                if (core.isLocked(sone)) {
                                        /* trigger redetection when the Sone is unlocked. */
                                        synchronized (sone) {
                                                modified = !sone.getFingerprint().equals(lastInsertedFingerprint);
                                        }
                                        lastFingerprint = "";
-                                       lastModificationTime = 0;
+                                       lastModificationTime = absent();
                                        continue;
                                }
 
@@ -195,16 +218,16 @@ public class SoneInserter extends AbstractService {
                                        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);
                                        }
@@ -216,11 +239,11 @@ public class SoneInserter extends AbstractService {
                                        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. */
@@ -246,7 +269,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;
@@ -289,7 +312,7 @@ public class SoneInserter extends AbstractService {
                        soneProperties.put("replies", Ordering.from(Reply.TIME_COMPARATOR).reverse().sortedCopy(sone.getReplies()));
                        soneProperties.put("likedPostIds", new HashSet<String>(sone.getLikedPostIds()));
                        soneProperties.put("likedReplyIds", new HashSet<String>(sone.getLikedReplyIds()));
-                       soneProperties.put("albums", sone.getAllAlbums());
+                       soneProperties.put("albums", FluentIterable.from(sone.getRootAlbum().getAlbums()).transformAndConcat(Album.FLATTENER).filter(NOT_EMPTY).toList());
                }
 
                //