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 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;
*/
@Override
protected void serviceRun() {
- long lastModificationTime = 0;
+ Optional<Long> lastModificationTime = absent();
String lastInsertedFingerprint = lastInsertFingerprint;
String lastFingerprint = "";
- Sone sone;
while (!shouldStop()) {
try {
- /* check every seconds. */
+ /* check every second. */
sleep(1000);
/* don’t insert locked Sones. */
- sone = this.sone;
+ 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;
}
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);
}
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. */
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;
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", FluentIterable.from(sone.getAlbums()).transformAndConcat(Album.FLATTENER).toList());
+ soneProperties.put("albums", FluentIterable.from(sone.getRootAlbum().getAlbums()).transformAndConcat(Album.FLATTENER).filter(NOT_EMPTY).toList());
}
//