X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=51882e92b55b0a3f14e4de4febd09a77259f3a51;hb=755fb3405eb56f264559a60caf5115b4482392d7;hp=01e414d814b99825768bd2c485bf8249a00cd61a;hpb=9a920789e2b9109d4de0adb676a00797f2d36bfb;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 01e414d..51882e9 100644 --- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java +++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java @@ -18,6 +18,7 @@ package net.pterodactylus.sone.core; import static com.google.common.base.Preconditions.checkArgument; +import static net.pterodactylus.sone.data.Album.NOT_EMPTY; import java.io.InputStreamReader; import java.io.StringWriter; @@ -190,14 +191,13 @@ public class SoneInserter extends AbstractService { long lastModificationTime = 0; 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) { @@ -308,7 +308,7 @@ public class SoneInserter extends AbstractService { soneProperties.put("replies", Ordering.from(Reply.TIME_COMPARATOR).reverse().sortedCopy(sone.getReplies())); soneProperties.put("likedPostIds", new HashSet(sone.getLikedPostIds())); soneProperties.put("likedReplyIds", new HashSet(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()); } //