X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=d24f497df8316e5283913713a0d7394014bd7a01;hb=5bcdc1b924c598b1e59551d44e2302ef29258dad;hp=7f901846d8eccb6db5956777302d22ee23abfb5f;hpb=44c19966b15e377eb446aff94468d2e4457e89e5;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 7f90184..1229448 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -1,5 +1,5 @@
/*
- * Sone - Core.java - Copyright © 2010 David Roden
+ * Sone - Core.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,41 +17,92 @@
package net.pterodactylus.sone.core;
+import static com.google.common.base.Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkNotNull;
+import static com.google.common.base.Predicates.not;
+import static net.pterodactylus.sone.data.Sone.LOCAL_SONE_FILTER;
+
import java.net.MalformedURLException;
import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
import java.util.logging.Level;
import java.util.logging.Logger;
import net.pterodactylus.sone.core.Options.DefaultOption;
-import net.pterodactylus.sone.core.Options.Option;
-import net.pterodactylus.sone.core.Options.OptionWatcher;
+import net.pterodactylus.sone.core.SoneInserter.SetInsertionDelay;
+import net.pterodactylus.sone.core.event.ImageInsertFinishedEvent;
+import net.pterodactylus.sone.core.event.MarkPostKnownEvent;
+import net.pterodactylus.sone.core.event.MarkPostReplyKnownEvent;
+import net.pterodactylus.sone.core.event.MarkSoneKnownEvent;
+import net.pterodactylus.sone.core.event.NewPostFoundEvent;
+import net.pterodactylus.sone.core.event.NewPostReplyFoundEvent;
+import net.pterodactylus.sone.core.event.NewSoneFoundEvent;
+import net.pterodactylus.sone.core.event.PostRemovedEvent;
+import net.pterodactylus.sone.core.event.PostReplyRemovedEvent;
+import net.pterodactylus.sone.core.event.SoneLockedEvent;
+import net.pterodactylus.sone.core.event.SoneRemovedEvent;
+import net.pterodactylus.sone.core.event.SoneUnlockedEvent;
import net.pterodactylus.sone.data.Album;
import net.pterodactylus.sone.data.Client;
import net.pterodactylus.sone.data.Image;
import net.pterodactylus.sone.data.Post;
+import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.data.Profile;
import net.pterodactylus.sone.data.Profile.Field;
import net.pterodactylus.sone.data.Reply;
import net.pterodactylus.sone.data.Sone;
+import net.pterodactylus.sone.data.Sone.ShowCustomAvatars;
+import net.pterodactylus.sone.data.Sone.SoneStatus;
+import net.pterodactylus.sone.data.SoneImpl;
+import net.pterodactylus.sone.data.TemporaryImage;
+import net.pterodactylus.sone.database.Database;
+import net.pterodactylus.sone.database.DatabaseException;
+import net.pterodactylus.sone.database.PostBuilder;
+import net.pterodactylus.sone.database.PostProvider;
+import net.pterodactylus.sone.database.PostReplyBuilder;
+import net.pterodactylus.sone.database.PostReplyProvider;
+import net.pterodactylus.sone.database.SoneProvider;
+import net.pterodactylus.sone.fcp.FcpInterface;
import net.pterodactylus.sone.freenet.wot.Identity;
-import net.pterodactylus.sone.freenet.wot.IdentityListener;
import net.pterodactylus.sone.freenet.wot.IdentityManager;
import net.pterodactylus.sone.freenet.wot.OwnIdentity;
-import net.pterodactylus.sone.freenet.wot.Trust;
-import net.pterodactylus.sone.freenet.wot.WebOfTrustException;
+import net.pterodactylus.sone.freenet.wot.event.IdentityAddedEvent;
+import net.pterodactylus.sone.freenet.wot.event.IdentityRemovedEvent;
+import net.pterodactylus.sone.freenet.wot.event.IdentityUpdatedEvent;
+import net.pterodactylus.sone.freenet.wot.event.OwnIdentityAddedEvent;
+import net.pterodactylus.sone.freenet.wot.event.OwnIdentityRemovedEvent;
import net.pterodactylus.sone.main.SonePlugin;
+import net.pterodactylus.sone.utils.IntegerRangePredicate;
import net.pterodactylus.util.config.Configuration;
import net.pterodactylus.util.config.ConfigurationException;
import net.pterodactylus.util.logging.Logging;
import net.pterodactylus.util.number.Numbers;
-import net.pterodactylus.util.validation.Validation;
-import net.pterodactylus.util.version.Version;
+import net.pterodactylus.util.service.AbstractService;
+import net.pterodactylus.util.thread.NamedThreadFactory;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Optional;
+import com.google.common.base.Predicates;
+import com.google.common.collect.FluentIterable;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Multimap;
+import com.google.common.collect.Multimaps;
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
+import com.google.inject.Inject;
+import com.google.inject.Singleton;
+
import freenet.keys.FreenetURI;
/**
@@ -59,42 +110,26 @@ import freenet.keys.FreenetURI;
*
* @author David âBombeâ Roden
*/
-public class Core implements IdentityListener, UpdateListener {
-
- /**
- * Enumeration for the possible states of a {@link Sone}.
- *
- * @author David âBombeâ Roden
- */
- public enum SoneStatus {
-
- /** The Sone is unknown, i.e. not yet downloaded. */
- unknown,
-
- /** The Sone is idle, i.e. not being downloaded or inserted. */
- idle,
-
- /** The Sone is currently being inserted. */
- inserting,
-
- /** The Sone is currently being downloaded. */
- downloading,
- }
+@Singleton
+public class Core extends AbstractService implements SoneProvider, PostProvider, PostReplyProvider {
/** The logger. */
private static final Logger logger = Logging.getLogger(Core.class);
+ /** The start time. */
+ private final long startupTime = System.currentTimeMillis();
+
/** The options. */
private final Options options = new Options();
/** The preferences. */
private final Preferences preferences = new Preferences(options);
- /** The core listener manager. */
- private final CoreListenerManager coreListenerManager = new CoreListenerManager(this);
+ /** The event bus. */
+ private final EventBus eventBus;
/** The configuration. */
- private Configuration configuration;
+ private final Configuration configuration;
/** Whether weâre currently saving the configuration. */
private boolean storingConfiguration = false;
@@ -108,70 +143,61 @@ public class Core implements IdentityListener, UpdateListener {
/** The Sone downloader. */
private final SoneDownloader soneDownloader;
+ /** The image inserter. */
+ private final ImageInserter imageInserter;
+
+ /** Sone downloader thread-pool. */
+ private final ExecutorService soneDownloaders = Executors.newFixedThreadPool(10, new NamedThreadFactory("Sone Downloader %2$d"));
+
/** The update checker. */
private final UpdateChecker updateChecker;
- /** Whether the core has been stopped. */
- private volatile boolean stopped;
+ /** The trust updater. */
+ private final WebOfTrustUpdater webOfTrustUpdater;
- /** The Sonesâ statuses. */
- /* synchronize access on itself. */
- private final Map soneStatuses = new HashMap();
+ /** The FCP interface. */
+ private volatile FcpInterface fcpInterface;
+
+ /** The times Sones were followed. */
+ private final Map soneFollowingTimes = new HashMap();
/** Locked local Sones. */
/* synchronize on itself. */
private final Set lockedSones = new HashSet();
/** Sone inserters. */
- /* synchronize access on this on localSones. */
+ /* synchronize access on this on sones. */
private final Map soneInserters = new HashMap();
- /** All local Sones. */
- /* synchronize access on this on itself. */
- private Map localSones = new HashMap();
+ /** Sone rescuers. */
+ /* synchronize access on this on sones. */
+ private final Map soneRescuers = new HashMap();
- /** All remote Sones. */
+ /** All Sones. */
/* synchronize access on this on itself. */
- private Map remoteSones = new HashMap();
-
- /** All new Sones. */
- private Set newSones = new HashSet();
+ private final Map sones = new HashMap();
/** All known Sones. */
- /* synchronize access on {@link #newSones}. */
- private Set knownSones = new HashSet();
-
- /** All posts. */
- private Map posts = new HashMap();
-
- /** All new posts. */
- private Set newPosts = new HashSet();
+ private final Set knownSones = new HashSet();
- /** All known posts. */
- /* synchronize access on {@link #newPosts}. */
- private Set knownPosts = new HashSet();
-
- /** All replies. */
- private Map replies = new HashMap();
-
- /** All new replies. */
- private Set newReplies = new HashSet();
-
- /** All known replies. */
- private Set knownReplies = new HashSet();
+ /** The post database. */
+ private final Database database;
/** All bookmarked posts. */
/* synchronize access on itself. */
- private Set bookmarkedPosts = new HashSet();
+ private final Set bookmarkedPosts = new HashSet();
/** Trusted identities, sorted by own identities. */
- private Map> trustedIdentities = Collections.synchronizedMap(new HashMap>());
+ private final Multimap trustedIdentities = Multimaps.synchronizedSetMultimap(HashMultimap.create());
+
+ /** All temporary images. */
+ private final Map temporaryImages = new HashMap();
- /** All known albums. */
- private Map albums = new HashMap();
+ /** Ticker for threads that mark own elements as known. */
+ private final ScheduledExecutorService localElementTicker = Executors.newScheduledThreadPool(1);
- /** All known images. */
- private Map images = new HashMap();
+ /** The time the configuration was last touched. */
+ private volatile long lastConfigurationUpdate;
/**
* Creates a new core.
@@ -182,37 +208,25 @@ public class Core implements IdentityListener, UpdateListener {
* The freenet interface
* @param identityManager
* The identity manager
- */
- public Core(Configuration configuration, FreenetInterface freenetInterface, IdentityManager identityManager) {
+ * @param webOfTrustUpdater
+ * The WebOfTrust updater
+ * @param eventBus
+ * The event bus
+ * @param database
+ * The database
+ */
+ @Inject
+ public Core(Configuration configuration, FreenetInterface freenetInterface, IdentityManager identityManager, WebOfTrustUpdater webOfTrustUpdater, EventBus eventBus, Database database) {
+ super("Sone Core");
this.configuration = configuration;
this.freenetInterface = freenetInterface;
this.identityManager = identityManager;
- this.soneDownloader = new SoneDownloader(this, freenetInterface);
- this.updateChecker = new UpdateChecker(freenetInterface);
- }
-
- //
- // LISTENER MANAGEMENT
- //
-
- /**
- * Adds a new core listener.
- *
- * @param coreListener
- * The listener to add
- */
- public void addCoreListener(CoreListener coreListener) {
- coreListenerManager.addListener(coreListener);
- }
-
- /**
- * Removes a core listener.
- *
- * @param coreListener
- * The listener to remove
- */
- public void removeCoreListener(CoreListener coreListener) {
- coreListenerManager.removeListener(coreListener);
+ this.soneDownloader = new SoneDownloaderImpl(this, freenetInterface);
+ this.imageInserter = new ImageInserter(freenetInterface, freenetInterface.new InsertTokenSupplier());
+ this.updateChecker = new UpdateChecker(eventBus, freenetInterface);
+ this.webOfTrustUpdater = webOfTrustUpdater;
+ this.eventBus = eventBus;
+ this.database = database;
}
//
@@ -220,15 +234,12 @@ public class Core implements IdentityListener, UpdateListener {
//
/**
- * Sets the configuration to use. This will automatically save the current
- * configuration to the given configuration.
+ * Returns the time Sone was started.
*
- * @param configuration
- * The new configuration to use
+ * @return The startup time (in milliseconds since Jan 1, 1970 UTC)
*/
- public void setConfiguration(Configuration configuration) {
- this.configuration = configuration;
- saveConfiguration();
+ public long getStartupTime() {
+ return startupTime;
}
/**
@@ -259,29 +270,33 @@ public class Core implements IdentityListener, UpdateListener {
}
/**
- * Returns the status of the given Sone.
+ * Sets the FCP interface to use.
*
- * @param sone
- * The Sone to get the status for
- * @return The status of the Sone
+ * @param fcpInterface
+ * The FCP interface to use
*/
- public SoneStatus getSoneStatus(Sone sone) {
- synchronized (soneStatuses) {
- return soneStatuses.get(sone);
- }
+ public void setFcpInterface(FcpInterface fcpInterface) {
+ this.fcpInterface = fcpInterface;
}
/**
- * Sets the status of the given Sone.
+ * Returns the Sone rescuer for the given local Sone.
*
* @param sone
- * The Sone to set the status of
- * @param soneStatus
- * The status to set
- */
- public void setSoneStatus(Sone sone, SoneStatus soneStatus) {
- synchronized (soneStatuses) {
- soneStatuses.put(sone, soneStatus);
+ * The local Sone to get the rescuer for
+ * @return The Sone rescuer for the given Sone
+ */
+ public SoneRescuer getSoneRescuer(Sone sone) {
+ checkNotNull(sone, "sone must not be null");
+ checkArgument(sone.isLocal(), "sone must be local");
+ synchronized (sones) {
+ SoneRescuer soneRescuer = soneRescuers.get(sone);
+ if (soneRescuer == null) {
+ soneRescuer = new SoneRescuer(this, soneDownloader, sone);
+ soneRescuers.put(sone, soneRescuer);
+ soneRescuer.start();
+ }
+ return soneRescuer;
}
}
@@ -299,28 +314,13 @@ public class Core implements IdentityListener, UpdateListener {
}
/**
- * Returns all Sones, remote and local.
- *
- * @return All Sones
- */
- public Set getSones() {
- Set allSones = new HashSet();
- allSones.addAll(getLocalSones());
- allSones.addAll(getRemoteSones());
- return allSones;
- }
-
- /**
- * Returns the Sone with the given ID, regardless whether itâs local or
- * remote.
- *
- * @param id
- * The ID of the Sone to get
- * @return The Sone with the given ID, or {@code null} if there is no such
- * Sone
+ * {@inheritDocs}
*/
- public Sone getSone(String id) {
- return getSone(id, true);
+ @Override
+ public Collection getSones() {
+ synchronized (sones) {
+ return ImmutableSet.copyOf(sones.values());
+ }
}
/**
@@ -329,82 +329,27 @@ public class Core implements IdentityListener, UpdateListener {
*
* @param id
* The ID of the Sone to get
- * @param create
- * {@code true} to create a new Sone if none exists,
- * {@code false} to return {@code null} if a Sone with the given
- * ID does not exist
* @return The Sone with the given ID, or {@code null} if there is no such
* Sone
*/
- public Sone getSone(String id, boolean create) {
- if (isLocalSone(id)) {
- return getLocalSone(id);
- }
- return getRemoteSone(id, create);
- }
-
- /**
- * Checks whether the core knows a Sone with the given ID.
- *
- * @param id
- * The ID of the Sone
- * @return {@code true} if there is a Sone with the given ID, {@code false}
- * otherwise
- */
- public boolean hasSone(String id) {
- return isLocalSone(id) || isRemoteSone(id);
- }
-
- /**
- * Returns whether the given Sone is a local Sone.
- *
- * @param sone
- * The Sone to check for its locality
- * @return {@code true} if the given Sone is local, {@code false} otherwise
- */
- public boolean isLocalSone(Sone sone) {
- synchronized (localSones) {
- return localSones.containsKey(sone.getId());
- }
- }
-
- /**
- * Returns whether the given ID is the ID of a local Sone.
- *
- * @param id
- * The Sone ID to check for its locality
- * @return {@code true} if the given ID is a local Sone, {@code false}
- * otherwise
- */
- public boolean isLocalSone(String id) {
- synchronized (localSones) {
- return localSones.containsKey(id);
+ @Override
+ public Optional getSone(String id) {
+ synchronized (sones) {
+ return Optional.fromNullable(sones.get(id));
}
}
/**
- * Returns all local Sones.
- *
- * @return All local Sones
+ * {@inheritDocs}
*/
- public Set getLocalSones() {
- synchronized (localSones) {
- return new HashSet(localSones.values());
+ @Override
+ public Collection getLocalSones() {
+ synchronized (sones) {
+ return FluentIterable.from(sones.values()).filter(LOCAL_SONE_FILTER).toSet();
}
}
/**
- * Returns the local Sone with the given ID.
- *
- * @param id
- * The ID of the Sone to get
- * @return The Sone with the given ID
- */
- public Sone getLocalSone(String id) {
- return getLocalSone(id, true);
- }
-
- /**
* Returns the local Sone with the given ID, optionally creating a new Sone.
*
* @param id
@@ -415,25 +360,27 @@ public class Core implements IdentityListener, UpdateListener {
* @return The Sone with the given ID, or {@code null}
*/
public Sone getLocalSone(String id, boolean create) {
- synchronized (localSones) {
- Sone sone = localSones.get(id);
+ synchronized (sones) {
+ Sone sone = sones.get(id);
if ((sone == null) && create) {
- sone = new Sone(id);
- localSones.put(id, sone);
- setSoneStatus(sone, SoneStatus.unknown);
+ sone = new SoneImpl(id, true);
+ sones.put(id, sone);
+ }
+ if ((sone != null) && !sone.isLocal()) {
+ sone = new SoneImpl(id, true);
+ sones.put(id, sone);
}
return sone;
}
}
/**
- * Returns all remote Sones.
- *
- * @return All remote Sones
+ * {@inheritDocs}
*/
- public Set getRemoteSones() {
- synchronized (remoteSones) {
- return new HashSet(remoteSones.values());
+ @Override
+ public Collection getRemoteSones() {
+ synchronized (sones) {
+ return FluentIterable.from(sones.values()).filter(not(LOCAL_SONE_FILTER)).toSet();
}
}
@@ -442,85 +389,46 @@ public class Core implements IdentityListener, UpdateListener {
*
* @param id
* The ID of the remote Sone to get
- * @return The Sone with the given ID
- */
- public Sone getRemoteSone(String id) {
- return getRemoteSone(id, true);
- }
-
- /**
- * Returns the remote Sone with the given ID.
- *
- * @param id
- * The ID of the remote Sone to get
* @param create
* {@code true} to always create a Sone, {@code false} to return
* {@code null} if no Sone with the given ID exists
* @return The Sone with the given ID
*/
public Sone getRemoteSone(String id, boolean create) {
- synchronized (remoteSones) {
- Sone sone = remoteSones.get(id);
- if ((sone == null) && create) {
- sone = new Sone(id);
- remoteSones.put(id, sone);
- setSoneStatus(sone, SoneStatus.unknown);
+ synchronized (sones) {
+ Sone sone = sones.get(id);
+ if ((sone == null) && create && (id != null) && (id.length() == 43)) {
+ sone = new SoneImpl(id, false);
+ sones.put(id, sone);
}
return sone;
}
}
/**
- * Returns whether the given Sone is a remote Sone.
+ * Returns whether the given Sone has been modified.
*
* @param sone
- * The Sone to check
- * @return {@code true} if the given Sone is a remote Sone, {@code false}
- * otherwise
- */
- public boolean isRemoteSone(Sone sone) {
- synchronized (remoteSones) {
- return remoteSones.containsKey(sone.getId());
- }
- }
-
- /**
- * Returns whether the Sone with the given ID is a remote Sone.
- *
- * @param id
- * The ID of the Sone to check
- * @return {@code true} if the Sone with the given ID is a remote Sone,
+ * The Sone to check for modifications
+ * @return {@code true} if a modification has been detected in the Sone,
* {@code false} otherwise
*/
- public boolean isRemoteSone(String id) {
- synchronized (remoteSones) {
- return remoteSones.containsKey(id);
- }
- }
-
- /**
- * Returns whether the Sone with the given ID is a new Sone.
- *
- * @param soneId
- * The ID of the sone to check for
- * @return {@code true} if the given Sone is new, false otherwise
- */
- public boolean isNewSone(String soneId) {
- synchronized (newSones) {
- return !knownSones.contains(soneId) && newSones.contains(soneId);
- }
+ public boolean isModifiedSone(Sone sone) {
+ return soneInserters.containsKey(sone) && soneInserters.get(sone).isModified();
}
/**
- * Returns whether the given Sone has been modified.
+ * Returns the time when the given was first followed by any local Sone.
*
* @param sone
- * The Sone to check for modifications
- * @return {@code true} if a modification has been detected in the Sone,
- * {@code false} otherwise
+ * The Sone to get the time for
+ * @return The time (in milliseconds since Jan 1, 1970) the Sone has first
+ * been followed, or {@link Long#MAX_VALUE}
*/
- public boolean isModifiedSone(Sone sone) {
- return (soneInserters.containsKey(sone)) ? soneInserters.get(sone).isModified() : false;
+ public long getSoneFollowingTime(Sone sone) {
+ synchronized (soneFollowingTimes) {
+ return Optional.fromNullable(soneFollowingTimes.get(sone.getId())).or(Long.MAX_VALUE);
+ }
}
/**
@@ -533,123 +441,69 @@ public class Core implements IdentityListener, UpdateListener {
* @return {@code true} if the target Sone is trusted by the origin Sone
*/
public boolean isSoneTrusted(Sone origin, Sone target) {
- return trustedIdentities.containsKey(origin) && trustedIdentities.get(origin.getIdentity()).contains(target);
+ checkNotNull(origin, "origin must not be null");
+ checkNotNull(target, "target must not be null");
+ checkArgument(origin.getIdentity() instanceof OwnIdentity, "originâs identity must be an OwnIdentity");
+ return trustedIdentities.containsEntry(origin.getIdentity(), target.getIdentity());
}
/**
- * Returns the post with the given ID.
+ * Returns a post builder.
*
- * @param postId
- * The ID of the post to get
- * @return The post, or {@code null} if there is no such post
+ * @return A new post builder
*/
- public Post getPost(String postId) {
- return getPost(postId, true);
+ public PostBuilder postBuilder() {
+ return database.newPostBuilder();
}
/**
- * Returns the post with the given ID, optionally creating a new post.
- *
- * @param postId
- * The ID of the post to get
- * @param create
- * {@code true} it create a new post if no post with the given ID
- * exists, {@code false} to return {@code null}
- * @return The post, or {@code null} if there is no such post
+ * {@inheritDoc}
*/
- public Post getPost(String postId, boolean create) {
- synchronized (posts) {
- Post post = posts.get(postId);
- if ((post == null) && create) {
- post = new Post(postId);
- posts.put(postId, post);
- }
- return post;
- }
+ @Override
+ public Optional getPost(String postId) {
+ return database.getPost(postId);
}
/**
- * Returns whether the given post ID is new.
- *
- * @param postId
- * The post ID
- * @return {@code true} if the post is considered to be new, {@code false}
- * otherwise
+ * {@inheritDocs}
*/
- public boolean isNewPost(String postId) {
- synchronized (newPosts) {
- return !knownPosts.contains(postId) && newPosts.contains(postId);
- }
+ @Override
+ public Collection getPosts(String soneId) {
+ return database.getPosts(soneId);
}
/**
- * Returns the reply with the given ID. If there is no reply with the given
- * ID yet, a new one is created.
- *
- * @param replyId
- * The ID of the reply to get
- * @return The reply
+ * {@inheritDoc}
*/
- public Reply getReply(String replyId) {
- return getReply(replyId, true);
+ @Override
+ public Collection getDirectedPosts(final String recipientId) {
+ checkNotNull(recipientId, "recipient must not be null");
+ return database.getDirectedPosts(recipientId);
}
/**
- * Returns the reply with the given ID. If there is no reply with the given
- * ID yet, a new one is created, unless {@code create} is false in which
- * case {@code null} is returned.
+ * Returns a post reply builder.
*
- * @param replyId
- * The ID of the reply to get
- * @param create
- * {@code true} to always return a {@link Reply}, {@code false}
- * to return {@code null} if no reply can be found
- * @return The reply, or {@code null} if there is no such reply
+ * @return A new post reply builder
*/
- public Reply getReply(String replyId, boolean create) {
- synchronized (replies) {
- Reply reply = replies.get(replyId);
- if (create && (reply == null)) {
- reply = new Reply(replyId);
- replies.put(replyId, reply);
- }
- return reply;
- }
+ public PostReplyBuilder postReplyBuilder() {
+ return database.newPostReplyBuilder();
}
/**
- * Returns all replies for the given post, order ascending by time.
- *
- * @param post
- * The post to get all replies for
- * @return All replies for the given post
- */
- public List getReplies(Post post) {
- Set sones = getSones();
- List replies = new ArrayList();
- for (Sone sone : sones) {
- for (Reply reply : sone.getReplies()) {
- if (reply.getPost().equals(post)) {
- replies.add(reply);
- }
- }
- }
- Collections.sort(replies, Reply.TIME_COMPARATOR);
- return replies;
+ * {@inheritDoc}
+ */
+ @Override
+ public Optional getPostReply(String replyId) {
+ return database.getPostReply(replyId);
}
/**
- * Returns whether the reply with the given ID is new.
- *
- * @param replyId
- * The ID of the reply to check
- * @return {@code true} if the reply is considered to be new, {@code false}
- * otherwise
+ * {@inheritDoc}
*/
- public boolean isNewReply(String replyId) {
- synchronized (newReplies) {
- return !knownReplies.contains(replyId) && newReplies.contains(replyId);
- }
+ @Override
+ public List getReplies(final String postId) {
+ return database.getReplies(postId);
}
/**
@@ -676,7 +530,7 @@ public class Core implements IdentityListener, UpdateListener {
* The reply to get the liking Sones for
* @return The Sones that like the given reply
*/
- public Set getLikes(Reply reply) {
+ public Set getLikes(PostReply reply) {
Set sones = new HashSet();
for (Sone sone : getSones()) {
if (sone.getLikedReplyIds().contains(reply.getId())) {
@@ -721,9 +575,9 @@ public class Core implements IdentityListener, UpdateListener {
Set posts = new HashSet();
synchronized (bookmarkedPosts) {
for (String bookmarkedPostId : bookmarkedPosts) {
- Post post = getPost(bookmarkedPostId, false);
- if (post != null) {
- posts.add(post);
+ Optional post = getPost(bookmarkedPostId);
+ if (post.isPresent()) {
+ posts.add(post.get());
}
}
}
@@ -731,7 +585,6 @@ public class Core implements IdentityListener, UpdateListener {
}
/**
- *
* Returns the album with the given ID, creating a new album if no album
* with the given ID can be found.
*
@@ -756,14 +609,16 @@ public class Core implements IdentityListener, UpdateListener {
* given ID exists and {@code create} is {@code false}
*/
public Album getAlbum(String albumId, boolean create) {
- synchronized (albums) {
- Album album = albums.get(albumId);
- if (create && (album == null)) {
- album = new Album(albumId);
- albums.put(albumId, album);
- }
- return album;
+ Optional album = database.getAlbum(albumId);
+ if (album.isPresent()) {
+ return album.get();
+ }
+ if (!create) {
+ return null;
}
+ Album newAlbum = database.newAlbumBuilder().withId(albumId).build();
+ database.storeAlbum(newAlbum);
+ return newAlbum;
}
/**
@@ -790,13 +645,29 @@ public class Core implements IdentityListener, UpdateListener {
* none was created
*/
public Image getImage(String imageId, boolean create) {
- synchronized (images) {
- Image image = images.get(imageId);
- if (create && (image == null)) {
- image = new Image(imageId);
- images.put(imageId, image);
- }
- return image;
+ Optional image = database.getImage(imageId);
+ if (image.isPresent()) {
+ return image.get();
+ }
+ if (!create) {
+ return null;
+ }
+ Image newImage = database.newImageBuilder().withId(imageId).build();
+ database.storeImage(newImage);
+ return newImage;
+ }
+
+ /**
+ * Returns the temporary image with the given ID.
+ *
+ * @param imageId
+ * The ID of the temporary image
+ * @return The temporary image, or {@code null} if there is no temporary
+ * image with the given ID
+ */
+ public TemporaryImage getTemporaryImage(String imageId) {
+ synchronized (temporaryImages) {
+ return temporaryImages.get(imageId);
}
}
@@ -815,7 +686,7 @@ public class Core implements IdentityListener, UpdateListener {
public void lockSone(Sone sone) {
synchronized (lockedSones) {
if (lockedSones.add(sone)) {
- coreListenerManager.fireSoneLocked(sone);
+ eventBus.post(new SoneLockedEvent(sone));
}
}
}
@@ -830,31 +701,8 @@ public class Core implements IdentityListener, UpdateListener {
public void unlockSone(Sone sone) {
synchronized (lockedSones) {
if (lockedSones.remove(sone)) {
- coreListenerManager.fireSoneUnlocked(sone);
- }
- }
- }
-
- /**
- * Adds a local Sone from the given ID which has to be the ID of an own
- * identity.
- *
- * @param id
- * The ID of an own identity to add a Sone for
- * @return The added (or already existing) Sone
- */
- public Sone addLocalSone(String id) {
- synchronized (localSones) {
- if (localSones.containsKey(id)) {
- logger.log(Level.FINE, "Tried to add known local Sone: %s", id);
- return localSones.get(id);
- }
- OwnIdentity ownIdentity = identityManager.getOwnIdentity(id);
- if (ownIdentity == null) {
- logger.log(Level.INFO, "Invalid Sone ID: %s", id);
- return null;
+ eventBus.post(new SoneUnlockedEvent(sone));
}
- return addLocalSone(ownIdentity);
}
}
@@ -870,50 +718,25 @@ public class Core implements IdentityListener, UpdateListener {
logger.log(Level.WARNING, "Given OwnIdentity is null!");
return null;
}
- synchronized (localSones) {
+ logger.info(String.format("Adding Sone from OwnIdentity: %s", ownIdentity));
+ synchronized (sones) {
final Sone sone;
try {
- sone = getLocalSone(ownIdentity.getId()).setIdentity(ownIdentity).setInsertUri(new FreenetURI(ownIdentity.getInsertUri())).setRequestUri(new FreenetURI(ownIdentity.getRequestUri()));
+ sone = getLocalSone(ownIdentity.getId(), true).setIdentity(ownIdentity).setInsertUri(new FreenetURI(ownIdentity.getInsertUri())).setRequestUri(new FreenetURI(ownIdentity.getRequestUri()));
} catch (MalformedURLException mue1) {
- logger.log(Level.SEVERE, "Could not convert the Identityâs URIs to Freenet URIs: " + ownIdentity.getInsertUri() + ", " + ownIdentity.getRequestUri(), mue1);
+ logger.log(Level.SEVERE, String.format("Could not convert the Identityâs URIs to Freenet URIs: %s, %s", ownIdentity.getInsertUri(), ownIdentity.getRequestUri()), mue1);
return null;
}
sone.setLatestEdition(Numbers.safeParseLong(ownIdentity.getProperty("Sone.LatestEdition"), (long) 0));
sone.setClient(new Client("Sone", SonePlugin.VERSION.toString()));
+ sone.setKnown(true);
/* TODO - load posts ân stuff */
- localSones.put(ownIdentity.getId(), sone);
- final SoneInserter soneInserter = new SoneInserter(this, freenetInterface, sone);
+ sones.put(ownIdentity.getId(), sone);
+ final SoneInserter soneInserter = new SoneInserter(this, eventBus, freenetInterface, sone);
soneInserters.put(sone, soneInserter);
- setSoneStatus(sone, SoneStatus.idle);
+ sone.setStatus(SoneStatus.idle);
loadSone(sone);
- if (!preferences.isSoneRescueMode()) {
- soneInserter.start();
- }
- new Thread(new Runnable() {
-
- @Override
- @SuppressWarnings("synthetic-access")
- public void run() {
- if (!preferences.isSoneRescueMode()) {
- soneDownloader.fetchSone(sone);
- return;
- }
- logger.log(Level.INFO, "Trying to restore Sone from Freenetâ¦");
- coreListenerManager.fireRescuingSone(sone);
- lockSone(sone);
- long edition = sone.getLatestEdition();
- while (!stopped && (edition >= 0) && preferences.isSoneRescueMode()) {
- logger.log(Level.FINE, "Downloading edition " + edition + "â¦");
- soneDownloader.fetchSone(sone, sone.getRequestUri().setKeyType("SSK").setDocName("Sone-" + edition));
- --edition;
- }
- logger.log(Level.INFO, "Finished restoring Sone from Freenet, starting Inserterâ¦");
- saveSone(sone);
- coreListenerManager.fireRescuedSone(sone);
- soneInserter.start();
- }
-
- }, "Sone Downloader").start();
+ soneInserter.start();
return sone;
}
}
@@ -926,13 +749,14 @@ public class Core implements IdentityListener, UpdateListener {
* @return The created Sone
*/
public Sone createSone(OwnIdentity ownIdentity) {
- try {
- ownIdentity.addContext("Sone");
- } catch (WebOfTrustException wote1) {
- logger.log(Level.SEVERE, "Could not add âSoneâ context to own identity: " + ownIdentity, wote1);
+ if (!webOfTrustUpdater.addContextWait(ownIdentity, "Sone")) {
+ logger.log(Level.SEVERE, String.format("Could not add âSoneâ context to own identity: %s", ownIdentity));
return null;
}
Sone sone = addLocalSone(ownIdentity);
+
+ followSone(sone, "nwa8lHa271k2QvJ8aa0Ov7IHAV-DFOCFgmDt3X6BpCI");
+ touchConfiguration();
return sone;
}
@@ -948,55 +772,92 @@ public class Core implements IdentityListener, UpdateListener {
logger.log(Level.WARNING, "Given Identity is null!");
return null;
}
- synchronized (remoteSones) {
- final Sone sone = getRemoteSone(identity.getId()).setIdentity(identity);
+ synchronized (sones) {
+ final Sone sone = getRemoteSone(identity.getId(), true);
+ if (sone.isLocal()) {
+ return sone;
+ }
+ sone.setIdentity(identity);
boolean newSone = sone.getRequestUri() == null;
- sone.setRequestUri(getSoneUri(identity.getRequestUri()));
+ sone.setRequestUri(SoneUri.create(identity.getRequestUri()));
sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0));
if (newSone) {
- synchronized (newSones) {
+ synchronized (knownSones) {
newSone = !knownSones.contains(sone.getId());
- if (newSone) {
- newSones.add(sone.getId());
- }
}
+ sone.setKnown(!newSone);
if (newSone) {
- coreListenerManager.fireNewSoneFound(sone);
+ eventBus.post(new NewSoneFoundEvent(sone));
+ for (Sone localSone : getLocalSones()) {
+ if (localSone.getOptions().isAutoFollow()) {
+ followSone(localSone, sone.getId());
+ }
+ }
}
}
- remoteSones.put(identity.getId(), sone);
soneDownloader.addSone(sone);
- setSoneStatus(sone, SoneStatus.unknown);
- new Thread(new Runnable() {
+ soneDownloaders.execute(soneDownloader.fetchSoneWithUriAction(sone));
+ return sone;
+ }
+ }
- @Override
- @SuppressWarnings("synthetic-access")
- public void run() {
- soneDownloader.fetchSone(sone);
+ /**
+ * Lets the given local Sone follow the Sone with the given ID.
+ *
+ * @param sone
+ * The local Sone that should follow another Sone
+ * @param soneId
+ * The ID of the Sone to follow
+ */
+ public void followSone(Sone sone, String soneId) {
+ checkNotNull(sone, "sone must not be null");
+ checkNotNull(soneId, "soneId must not be null");
+ sone.addFriend(soneId);
+ synchronized (soneFollowingTimes) {
+ if (!soneFollowingTimes.containsKey(soneId)) {
+ long now = System.currentTimeMillis();
+ soneFollowingTimes.put(soneId, now);
+ Optional followedSone = getSone(soneId);
+ if (!followedSone.isPresent()) {
+ return;
}
-
- }, "Sone Downloader").start();
- return sone;
+ for (Post post : followedSone.get().getPosts()) {
+ if (post.getTime() < now) {
+ markPostKnown(post);
+ }
+ }
+ for (PostReply reply : followedSone.get().getReplies()) {
+ if (reply.getTime() < now) {
+ markReplyKnown(reply);
+ }
+ }
+ }
}
+ touchConfiguration();
}
/**
- * Retrieves the trust relationship from the origin to the target. If the
- * trust relationship can not be retrieved, {@code null} is returned.
+ * Lets the given local Sone unfollow the Sone with the given ID.
*
- * @see Identity#getTrust(OwnIdentity)
- * @param origin
- * The origin of the trust tree
- * @param target
- * The target of the trust
- * @return The trust relationship
- */
- public Trust getTrust(Sone origin, Sone target) {
- if (!isLocalSone(origin)) {
- logger.log(Level.WARNING, "Tried to get trust from remote Sone: %s", origin);
- return null;
+ * @param sone
+ * The local Sone that should unfollow another Sone
+ * @param soneId
+ * The ID of the Sone being unfollowed
+ */
+ public void unfollowSone(Sone sone, String soneId) {
+ checkNotNull(sone, "sone must not be null");
+ checkNotNull(soneId, "soneId must not be null");
+ sone.removeFriend(soneId);
+ boolean unfollowedSoneStillFollowed = false;
+ for (Sone localSone : getLocalSones()) {
+ unfollowedSoneStillFollowed |= localSone.hasFriend(soneId);
+ }
+ if (!unfollowedSoneStillFollowed) {
+ synchronized (soneFollowingTimes) {
+ soneFollowingTimes.remove(soneId);
+ }
}
- return target.getIdentity().getTrust((OwnIdentity) origin.getIdentity());
+ touchConfiguration();
}
/**
@@ -1010,12 +871,11 @@ public class Core implements IdentityListener, UpdateListener {
* The trust value (from {@code -100} to {@code 100})
*/
public void setTrust(Sone origin, Sone target, int trustValue) {
- Validation.begin().isNotNull("Trust Origin", origin).check().isInstanceOf("Trust Origin", origin.getIdentity(), OwnIdentity.class).isNotNull("Trust Target", target).isLessOrEqual("Trust Value", trustValue, 100).isGreaterOrEqual("Trust Value", trustValue, -100).check();
- try {
- ((OwnIdentity) origin.getIdentity()).setTrust(target.getIdentity(), trustValue, preferences.getTrustComment());
- } catch (WebOfTrustException wote1) {
- logger.log(Level.WARNING, "Could not set trust for Sone: " + target, wote1);
- }
+ checkNotNull(origin, "origin must not be null");
+ checkArgument(origin.getIdentity() instanceof OwnIdentity, "origin must be a local Sone");
+ checkNotNull(target, "target must not be null");
+ checkArgument((trustValue >= -100) && (trustValue <= 100), "trustValue must be within [-100, 100]");
+ webOfTrustUpdater.setTrust((OwnIdentity) origin.getIdentity(), target.getIdentity(), trustValue, preferences.getTrustComment());
}
/**
@@ -1027,12 +887,10 @@ public class Core implements IdentityListener, UpdateListener {
* The trust target
*/
public void removeTrust(Sone origin, Sone target) {
- Validation.begin().isNotNull("Trust Origin", origin).isNotNull("Trust Target", target).check().isInstanceOf("Trust Origin Identity", origin.getIdentity(), OwnIdentity.class).check();
- try {
- ((OwnIdentity) origin.getIdentity()).removeTrust(target.getIdentity());
- } catch (WebOfTrustException wote1) {
- logger.log(Level.WARNING, "Could not remove trust for Sone: " + target, wote1);
- }
+ checkNotNull(origin, "origin must not be null");
+ checkNotNull(target, "target must not be null");
+ checkArgument(origin.getIdentity() instanceof OwnIdentity, "origin must be a local Sone");
+ webOfTrustUpdater.setTrust((OwnIdentity) origin.getIdentity(), target.getIdentity(), null, null);
}
/**
@@ -1072,118 +930,137 @@ public class Core implements IdentityListener, UpdateListener {
}
/**
- * Updates the stores Sone with the given Sone.
+ * Updates the stored Sone with the given Sone.
*
* @param sone
* The updated Sone
*/
public void updateSone(Sone sone) {
- if (hasSone(sone.getId())) {
- boolean soneRescueMode = isLocalSone(sone) && preferences.isSoneRescueMode();
- Sone storedSone = getSone(sone.getId());
- if (!soneRescueMode && !(sone.getTime() > storedSone.getTime())) {
- logger.log(Level.FINE, "Downloaded Sone %s is not newer than stored Sone %s.", new Object[] { sone, storedSone });
+ updateSone(sone, false);
+ }
+
+ /**
+ * Updates the stored Sone with the given Sone. If {@code soneRescueMode} is
+ * {@code true}, an older Sone than the current Sone can be given to restore
+ * an old state.
+ *
+ * @param sone
+ * The Sone to update
+ * @param soneRescueMode
+ * {@code true} if the stored Sone should be updated regardless
+ * of the age of the given Sone
+ */
+ public void updateSone(Sone sone, boolean soneRescueMode) {
+ Optional storedSone = getSone(sone.getId());
+ if (storedSone.isPresent()) {
+ if (!soneRescueMode && !(sone.getTime() > storedSone.get().getTime())) {
+ logger.log(Level.FINE, String.format("Downloaded Sone %s is not newer than stored Sone %s.", sone, storedSone));
return;
}
- synchronized (posts) {
- if (!soneRescueMode) {
- for (Post post : storedSone.getPosts()) {
- posts.remove(post.getId());
- if (!sone.getPosts().contains(post)) {
- coreListenerManager.firePostRemoved(post);
- }
- }
+ /* find removed posts. */
+ Collection removedPosts = new ArrayList();
+ Collection newPosts = new ArrayList();
+ Collection existingPosts = database.getPosts(sone.getId());
+ for (Post oldPost : existingPosts) {
+ if (!sone.getPosts().contains(oldPost)) {
+ removedPosts.add(oldPost);
}
- List storedPosts = storedSone.getPosts();
- synchronized (newPosts) {
- for (Post post : sone.getPosts()) {
- post.setSone(storedSone);
- if (!storedPosts.contains(post) && !knownPosts.contains(post.getId())) {
- newPosts.add(post.getId());
- coreListenerManager.fireNewPostFound(post);
- }
- posts.put(post.getId(), post);
- }
+ }
+ /* find new posts. */
+ for (Post newPost : sone.getPosts()) {
+ if (existingPosts.contains(newPost)) {
+ continue;
+ }
+ if (newPost.getTime() < getSoneFollowingTime(sone)) {
+ newPost.setKnown(true);
+ } else if (!newPost.isKnown()) {
+ newPosts.add(newPost);
}
}
- synchronized (replies) {
- if (!soneRescueMode) {
- for (Reply reply : storedSone.getReplies()) {
- replies.remove(reply.getId());
- if (!sone.getReplies().contains(reply)) {
- coreListenerManager.fireReplyRemoved(reply);
- }
+ /* store posts. */
+ database.storePosts(sone, sone.getPosts());
+ Collection newPostReplies = new ArrayList();
+ Collection removedPostReplies = new ArrayList();
+ if (!soneRescueMode) {
+ for (PostReply reply : storedSone.get().getReplies()) {
+ if (!sone.getReplies().contains(reply)) {
+ removedPostReplies.add(reply);
}
}
- Set storedReplies = storedSone.getReplies();
- synchronized (newReplies) {
- for (Reply reply : sone.getReplies()) {
- reply.setSone(storedSone);
- if (!storedReplies.contains(reply) && !knownReplies.contains(reply.getId())) {
- newReplies.add(reply.getId());
- coreListenerManager.fireNewReplyFound(reply);
- }
- replies.put(reply.getId(), reply);
- }
+ }
+ Set storedReplies = storedSone.get().getReplies();
+ for (PostReply reply : sone.getReplies()) {
+ if (storedReplies.contains(reply)) {
+ continue;
+ }
+ if (reply.getTime() < getSoneFollowingTime(sone)) {
+ reply.setKnown(true);
+ } else if (!reply.isKnown()) {
+ newPostReplies.add(reply);
}
}
- synchronized (storedSone) {
- if (!soneRescueMode || (sone.getTime() > storedSone.getTime())) {
- storedSone.setTime(sone.getTime());
+ database.storePostReplies(sone, sone.getReplies());
+ for (Album album : storedSone.get().getRootAlbum().getAlbums()) {
+ database.removeAlbum(album);
+ for (Image image : album.getImages()) {
+ database.removeImage(image);
}
- storedSone.setClient(sone.getClient());
- storedSone.setProfile(sone.getProfile());
- if (soneRescueMode) {
- for (Post post : sone.getPosts()) {
- storedSone.addPost(post);
- }
- for (Reply reply : sone.getReplies()) {
- storedSone.addReply(reply);
- }
- for (String likedPostId : sone.getLikedPostIds()) {
- storedSone.addLikedPostId(likedPostId);
- }
- for (String likedReplyId : sone.getLikedReplyIds()) {
- storedSone.addLikedReplyId(likedReplyId);
- }
- } else {
- storedSone.setPosts(sone.getPosts());
- storedSone.setReplies(sone.getReplies());
- storedSone.setLikePostIds(sone.getLikedPostIds());
- storedSone.setLikeReplyIds(sone.getLikedReplyIds());
+ }
+ for (Post removedPost : removedPosts) {
+ eventBus.post(new PostRemovedEvent(removedPost));
+ }
+ for (Post newPost : newPosts) {
+ eventBus.post(new NewPostFoundEvent(newPost));
+ }
+ for (PostReply removedPostReply : removedPostReplies) {
+ eventBus.post(new PostReplyRemovedEvent(removedPostReply));
+ }
+ for (PostReply newPostReply : newPostReplies) {
+ eventBus.post(new NewPostReplyFoundEvent(newPostReply));
+ }
+ for (Album album : sone.getRootAlbum().getAlbums()) {
+ database.storeAlbum(album);
+ for (Image image : album.getImages()) {
+ database.storeImage(image);
+ }
+ }
+ synchronized (sones) {
+ sone.setOptions(storedSone.get().getOptions());
+ sone.setKnown(storedSone.get().isKnown());
+ sone.setStatus((sone.getTime() == 0) ? SoneStatus.unknown : SoneStatus.idle);
+ if (sone.isLocal()) {
+ soneInserters.get(storedSone.get()).setSone(sone);
+ touchConfiguration();
}
- storedSone.setLatestEdition(sone.getLatestEdition());
+ sones.put(sone.getId(), sone);
}
}
}
/**
* Deletes the given Sone. This will remove the Sone from the
- * {@link #getLocalSone(String) local Sones}, stops its {@link SoneInserter}
- * and remove the context from its identity.
+ * {@link #getLocalSones() local Sones}, stop its {@link SoneInserter} and
+ * remove the context from its identity.
*
* @param sone
* The Sone to delete
*/
public void deleteSone(Sone sone) {
if (!(sone.getIdentity() instanceof OwnIdentity)) {
- logger.log(Level.WARNING, "Tried to delete Sone of non-own identity: %s", sone);
+ logger.log(Level.WARNING, String.format("Tried to delete Sone of non-own identity: %s", sone));
return;
}
- synchronized (localSones) {
- if (!localSones.containsKey(sone.getId())) {
- logger.log(Level.WARNING, "Tried to delete non-local Sone: %s", sone);
+ synchronized (sones) {
+ if (!getLocalSones().contains(sone)) {
+ logger.log(Level.WARNING, String.format("Tried to delete non-local Sone: %s", sone));
return;
}
- localSones.remove(sone.getId());
- soneInserters.remove(sone).stop();
- }
- try {
- ((OwnIdentity) sone.getIdentity()).removeContext("Sone");
- ((OwnIdentity) sone.getIdentity()).removeProperty("Sone.LatestEdition");
- } catch (WebOfTrustException wote1) {
- logger.log(Level.WARNING, "Could not remove context and properties from Sone: " + sone, wote1);
+ sones.remove(sone.getId());
+ SoneInserter soneInserter = soneInserters.remove(sone);
+ soneInserter.stop();
}
+ webOfTrustUpdater.removeContext((OwnIdentity) sone.getIdentity(), "Sone");
+ webOfTrustUpdater.removeProperty((OwnIdentity) sone.getIdentity(), "Sone.LatestEdition");
try {
configuration.getLongValue("Sone/" + sone.getId() + "/Time").setValue(null);
} catch (ConfigurationException ce1) {
@@ -1192,19 +1069,20 @@ public class Core implements IdentityListener, UpdateListener {
}
/**
- * Marks the given Sone as known. If the Sone was {@link #isNewPost(String)
- * new} before, a {@link CoreListener#markSoneKnown(Sone)} event is fired.
+ * Marks the given Sone as known. If the Sone was not {@link Post#isKnown()
+ * known} before, a {@link MarkSoneKnownEvent} is fired.
*
* @param sone
* The Sone to mark as known
*/
public void markSoneKnown(Sone sone) {
- synchronized (newSones) {
- if (newSones.remove(sone.getId())) {
+ if (!sone.isKnown()) {
+ sone.setKnown(true);
+ synchronized (knownSones) {
knownSones.add(sone.getId());
- coreListenerManager.fireMarkSoneKnown(sone);
- saveConfiguration();
}
+ eventBus.post(new MarkSoneKnownEvent(sone));
+ touchConfiguration();
}
}
@@ -1216,10 +1094,11 @@ public class Core implements IdentityListener, UpdateListener {
* The Sone to load and update
*/
public void loadSone(Sone sone) {
- if (!isLocalSone(sone)) {
- logger.log(Level.FINE, "Tried to load non-local Sone: %s", sone);
+ if (!sone.isLocal()) {
+ logger.log(Level.FINE, String.format("Tried to load non-local Sone: %s", sone));
return;
}
+ logger.info(String.format("Loading local Sone: %s", sone));
/* load Sone. */
String sonePrefix = "Sone/" + sone.getId();
@@ -1231,7 +1110,7 @@ public class Core implements IdentityListener, UpdateListener {
String lastInsertFingerprint = configuration.getStringValue(sonePrefix + "/LastInsertFingerprint").getValue("");
/* load profile. */
- Profile profile = new Profile();
+ Profile profile = new Profile(sone);
profile.setFirstName(configuration.getStringValue(sonePrefix + "/Profile/FirstName").getValue(null));
profile.setMiddleName(configuration.getStringValue(sonePrefix + "/Profile/MiddleName").getValue(null));
profile.setLastName(configuration.getStringValue(sonePrefix + "/Profile/LastName").getValue(null));
@@ -1265,15 +1144,15 @@ public class Core implements IdentityListener, UpdateListener {
logger.log(Level.WARNING, "Invalid post found, aborting load!");
return;
}
- Post post = getPost(postId).setSone(sone).setTime(postTime).setText(postText);
+ PostBuilder postBuilder = postBuilder().withId(postId).from(sone.getId()).withTime(postTime).withText(postText);
if ((postRecipientId != null) && (postRecipientId.length() == 43)) {
- post.setRecipient(getSone(postRecipientId));
+ postBuilder.to(postRecipientId);
}
- posts.add(post);
+ posts.add(postBuilder.build());
}
/* load replies. */
- Set replies = new HashSet();
+ Set replies = new HashSet();
while (true) {
String replyPrefix = sonePrefix + "/Replies/" + replies.size();
String replyId = configuration.getStringValue(replyPrefix + "/ID").getValue(null);
@@ -1287,7 +1166,8 @@ public class Core implements IdentityListener, UpdateListener {
logger.log(Level.WARNING, "Invalid reply found, aborting load!");
return;
}
- replies.add(getReply(replyId).setSone(sone).setPost(getPost(postId)).setTime(replyTime).setText(replyText));
+ PostReplyBuilder postReplyBuilder = postReplyBuilder().withId(replyId).from(sone.getId()).to(postId).withTime(replyTime).withText(replyText);
+ replies.add(postReplyBuilder.build());
}
/* load post likes. */
@@ -1320,7 +1200,81 @@ public class Core implements IdentityListener, UpdateListener {
friends.add(friendId);
}
- /* if weâre still here, Sone was loaded successfully. */
+ /* load albums. */
+ List topLevelAlbums = new ArrayList();
+ int albumCounter = 0;
+ while (true) {
+ String albumPrefix = sonePrefix + "/Albums/" + albumCounter++;
+ String albumId = configuration.getStringValue(albumPrefix + "/ID").getValue(null);
+ if (albumId == null) {
+ break;
+ }
+ String albumTitle = configuration.getStringValue(albumPrefix + "/Title").getValue(null);
+ String albumDescription = configuration.getStringValue(albumPrefix + "/Description").getValue(null);
+ String albumParentId = configuration.getStringValue(albumPrefix + "/Parent").getValue(null);
+ String albumImageId = configuration.getStringValue(albumPrefix + "/AlbumImage").getValue(null);
+ if ((albumTitle == null) || (albumDescription == null)) {
+ logger.log(Level.WARNING, "Invalid album found, aborting load!");
+ return;
+ }
+ Album album = getAlbum(albumId).setSone(sone).modify().setTitle(albumTitle).setDescription(albumDescription).setAlbumImage(albumImageId).update();
+ if (albumParentId != null) {
+ Album parentAlbum = getAlbum(albumParentId, false);
+ if (parentAlbum == null) {
+ logger.log(Level.WARNING, String.format("Invalid parent album ID: %s", albumParentId));
+ return;
+ }
+ parentAlbum.addAlbum(album);
+ } else {
+ if (!topLevelAlbums.contains(album)) {
+ topLevelAlbums.add(album);
+ }
+ }
+ }
+
+ /* load images. */
+ int imageCounter = 0;
+ while (true) {
+ String imagePrefix = sonePrefix + "/Images/" + imageCounter++;
+ String imageId = configuration.getStringValue(imagePrefix + "/ID").getValue(null);
+ if (imageId == null) {
+ break;
+ }
+ String albumId = configuration.getStringValue(imagePrefix + "/Album").getValue(null);
+ String key = configuration.getStringValue(imagePrefix + "/Key").getValue(null);
+ String title = configuration.getStringValue(imagePrefix + "/Title").getValue(null);
+ String description = configuration.getStringValue(imagePrefix + "/Description").getValue(null);
+ Long creationTime = configuration.getLongValue(imagePrefix + "/CreationTime").getValue(null);
+ Integer width = configuration.getIntValue(imagePrefix + "/Width").getValue(null);
+ Integer height = configuration.getIntValue(imagePrefix + "/Height").getValue(null);
+ if ((albumId == null) || (key == null) || (title == null) || (description == null) || (creationTime == null) || (width == null) || (height == null)) {
+ logger.log(Level.WARNING, "Invalid image found, aborting load!");
+ return;
+ }
+ Album album = getAlbum(albumId, false);
+ if (album == null) {
+ logger.log(Level.WARNING, "Invalid album image encountered, aborting load!");
+ return;
+ }
+ Image image = getImage(imageId).modify().setSone(sone).setCreationTime(creationTime).setKey(key).setTitle(title).setDescription(description).setWidth(width).setHeight(height).update();
+ album.addImage(image);
+ }
+
+ /* load avatar. */
+ String avatarId = configuration.getStringValue(sonePrefix + "/Profile/Avatar").getValue(null);
+ if (avatarId != null) {
+ profile.setAvatar(getImage(avatarId, false));
+ }
+
+ /* load options. */
+ sone.getOptions().setAutoFollow(configuration.getBooleanValue(sonePrefix + "/Options/AutoFollow").getValue(null));
+ sone.getOptions().setSoneInsertNotificationEnabled(configuration.getBooleanValue(sonePrefix + "/Options/EnableSoneInsertNotifications").getValue(null));
+ sone.getOptions().setShowNewSoneNotifications(configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewSones").getValue(null));
+ sone.getOptions().setShowNewPostNotifications(configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewPosts").getValue(null));
+ sone.getOptions().setShowNewReplyNotifications(configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewReplies").getValue(null));
+ sone.getOptions().setShowCustomAvatars(ShowCustomAvatars.valueOf(configuration.getStringValue(sonePrefix + "/Options/ShowCustomAvatars").getValue(ShowCustomAvatars.NEVER.name())));
+
+ /* if weâre still here, Sone was loaded successfully. */
synchronized (sone) {
sone.setTime(soneTime);
sone.setProfile(profile);
@@ -1328,120 +1282,32 @@ public class Core implements IdentityListener, UpdateListener {
sone.setReplies(replies);
sone.setLikePostIds(likedPostIds);
sone.setLikeReplyIds(likedReplyIds);
- sone.setFriends(friends);
+ for (String friendId : friends) {
+ followSone(sone, friendId);
+ }
+ for (Album album : sone.getRootAlbum().getAlbums()) {
+ sone.getRootAlbum().removeAlbum(album);
+ }
+ for (Album album : topLevelAlbums) {
+ sone.getRootAlbum().addAlbum(album);
+ }
soneInserters.get(sone).setLastInsertFingerprint(lastInsertFingerprint);
}
- synchronized (newSones) {
+ synchronized (knownSones) {
for (String friend : friends) {
knownSones.add(friend);
}
}
- synchronized (newPosts) {
- for (Post post : posts) {
- knownPosts.add(post.getId());
- }
+ database.storePosts(sone, posts);
+ for (Post post : posts) {
+ post.setKnown(true);
}
- synchronized (newReplies) {
- for (Reply reply : replies) {
- knownReplies.add(reply.getId());
- }
+ database.storePostReplies(sone, replies);
+ for (PostReply reply : replies) {
+ reply.setKnown(true);
}
- }
- /**
- * Saves the given Sone. This will persist all local settings for the given
- * Sone, such as the friends list and similar, private options.
- *
- * @param sone
- * The Sone to save
- */
- public synchronized void saveSone(Sone sone) {
- if (!isLocalSone(sone)) {
- logger.log(Level.FINE, "Tried to save non-local Sone: %s", sone);
- return;
- }
- if (!(sone.getIdentity() instanceof OwnIdentity)) {
- logger.log(Level.WARNING, "Local Sone without OwnIdentity found, refusing to save: %s", sone);
- return;
- }
-
- logger.log(Level.INFO, "Saving Sone: %s", sone);
- try {
- ((OwnIdentity) sone.getIdentity()).setProperty("Sone.LatestEdition", String.valueOf(sone.getLatestEdition()));
-
- /* save Sone into configuration. */
- String sonePrefix = "Sone/" + sone.getId();
- configuration.getLongValue(sonePrefix + "/Time").setValue(sone.getTime());
- configuration.getStringValue(sonePrefix + "/LastInsertFingerprint").setValue(soneInserters.get(sone).getLastInsertFingerprint());
-
- /* save profile. */
- Profile profile = sone.getProfile();
- configuration.getStringValue(sonePrefix + "/Profile/FirstName").setValue(profile.getFirstName());
- configuration.getStringValue(sonePrefix + "/Profile/MiddleName").setValue(profile.getMiddleName());
- configuration.getStringValue(sonePrefix + "/Profile/LastName").setValue(profile.getLastName());
- configuration.getIntValue(sonePrefix + "/Profile/BirthDay").setValue(profile.getBirthDay());
- configuration.getIntValue(sonePrefix + "/Profile/BirthMonth").setValue(profile.getBirthMonth());
- configuration.getIntValue(sonePrefix + "/Profile/BirthYear").setValue(profile.getBirthYear());
-
- /* save profile fields. */
- int fieldCounter = 0;
- for (Field profileField : profile.getFields()) {
- String fieldPrefix = sonePrefix + "/Profile/Fields/" + fieldCounter++;
- configuration.getStringValue(fieldPrefix + "/Name").setValue(profileField.getName());
- configuration.getStringValue(fieldPrefix + "/Value").setValue(profileField.getValue());
- }
- configuration.getStringValue(sonePrefix + "/Profile/Fields/" + fieldCounter + "/Name").setValue(null);
-
- /* save posts. */
- int postCounter = 0;
- for (Post post : sone.getPosts()) {
- String postPrefix = sonePrefix + "/Posts/" + postCounter++;
- configuration.getStringValue(postPrefix + "/ID").setValue(post.getId());
- configuration.getStringValue(postPrefix + "/Recipient").setValue((post.getRecipient() != null) ? post.getRecipient().getId() : null);
- configuration.getLongValue(postPrefix + "/Time").setValue(post.getTime());
- configuration.getStringValue(postPrefix + "/Text").setValue(post.getText());
- }
- configuration.getStringValue(sonePrefix + "/Posts/" + postCounter + "/ID").setValue(null);
-
- /* save replies. */
- int replyCounter = 0;
- for (Reply reply : sone.getReplies()) {
- String replyPrefix = sonePrefix + "/Replies/" + replyCounter++;
- configuration.getStringValue(replyPrefix + "/ID").setValue(reply.getId());
- configuration.getStringValue(replyPrefix + "/Post/ID").setValue(reply.getPost().getId());
- configuration.getLongValue(replyPrefix + "/Time").setValue(reply.getTime());
- configuration.getStringValue(replyPrefix + "/Text").setValue(reply.getText());
- }
- configuration.getStringValue(sonePrefix + "/Replies/" + replyCounter + "/ID").setValue(null);
-
- /* save post likes. */
- int postLikeCounter = 0;
- for (String postId : sone.getLikedPostIds()) {
- configuration.getStringValue(sonePrefix + "/Likes/Post/" + postLikeCounter++ + "/ID").setValue(postId);
- }
- configuration.getStringValue(sonePrefix + "/Likes/Post/" + postLikeCounter + "/ID").setValue(null);
-
- /* save reply likes. */
- int replyLikeCounter = 0;
- for (String replyId : sone.getLikedReplyIds()) {
- configuration.getStringValue(sonePrefix + "/Likes/Reply/" + replyLikeCounter++ + "/ID").setValue(replyId);
- }
- configuration.getStringValue(sonePrefix + "/Likes/Reply/" + replyLikeCounter + "/ID").setValue(null);
-
- /* save friends. */
- int friendCounter = 0;
- for (String friendId : sone.getFriends()) {
- configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter++ + "/ID").setValue(friendId);
- }
- configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(null);
-
- configuration.save();
- logger.log(Level.INFO, "Sone %s saved.", sone);
- } catch (ConfigurationException ce1) {
- logger.log(Level.WARNING, "Could not save Sone: " + sone, ce1);
- } catch (WebOfTrustException wote1) {
- logger.log(Level.WARNING, "Could not set WoT property for Sone: " + sone, wote1);
- }
+ logger.info(String.format("Sone loaded successfully: %s", sone));
}
/**
@@ -1484,7 +1350,7 @@ public class Core implements IdentityListener, UpdateListener {
* The text of the post
* @return The created post
*/
- public Post createPost(Sone sone, Sone recipient, String text) {
+ public Post createPost(Sone sone, Optional recipient, String text) {
return createPost(sone, recipient, System.currentTimeMillis(), text);
}
@@ -1502,23 +1368,24 @@ public class Core implements IdentityListener, UpdateListener {
* The text of the post
* @return The created post
*/
- public Post createPost(Sone sone, Sone recipient, long time, String text) {
- if (!isLocalSone(sone)) {
- logger.log(Level.FINE, "Tried to create post for non-local Sone: %s", sone);
+ public Post createPost(Sone sone, Optional recipient, long time, String text) {
+ checkNotNull(text, "text must not be null");
+ checkArgument(text.trim().length() > 0, "text must not be empty");
+ if (!sone.isLocal()) {
+ logger.log(Level.FINE, String.format("Tried to create post for non-local Sone: %s", sone));
return null;
}
- Post post = new Post(sone, time, text);
- if (recipient != null) {
- post.setRecipient(recipient);
- }
- synchronized (posts) {
- posts.put(post.getId(), post);
- }
- synchronized (newPosts) {
- knownPosts.add(post.getId());
+ PostBuilder postBuilder = database.newPostBuilder();
+ postBuilder.from(sone.getId()).randomId().withTime(time).withText(text.trim());
+ if (recipient.isPresent()) {
+ postBuilder.to(recipient.get().getId());
}
+ final Post post = postBuilder.build();
+ database.storePost(post);
+ eventBus.post(new NewPostFoundEvent(post));
sone.addPost(post);
- saveSone(sone);
+ touchConfiguration();
+ localElementTicker.schedule(new MarkPostKnown(post), 10, TimeUnit.SECONDS);
return post;
}
@@ -1529,31 +1396,29 @@ public class Core implements IdentityListener, UpdateListener {
* The post to delete
*/
public void deletePost(Post post) {
- if (!isLocalSone(post.getSone())) {
- logger.log(Level.WARNING, "Tried to delete post of non-local Sone: %s", post.getSone());
+ if (!post.getSone().isLocal()) {
+ logger.log(Level.WARNING, String.format("Tried to delete post of non-local Sone: %s", post.getSone()));
return;
}
- post.getSone().removePost(post);
- synchronized (posts) {
- posts.remove(post.getId());
- }
- saveSone(post.getSone());
+ database.removePost(post);
+ eventBus.post(new PostRemovedEvent(post));
+ markPostKnown(post);
+ touchConfiguration();
}
/**
- * Marks the given post as known, if it is currently a new post (according
- * to {@link #isNewPost(String)}).
+ * Marks the given post as known, if it is currently not a known post
+ * (according to {@link Post#isKnown()}).
*
* @param post
* The post to mark as known
*/
public void markPostKnown(Post post) {
- synchronized (newPosts) {
- if (newPosts.remove(post.getId())) {
- knownPosts.add(post.getId());
- coreListenerManager.fireMarkPostKnown(post);
- saveConfiguration();
- }
+ post.setKnown(true);
+ eventBus.post(new MarkPostKnownEvent(post));
+ touchConfiguration();
+ for (PostReply reply : getReplies(post.getId())) {
+ markReplyKnown(reply);
}
}
@@ -1612,37 +1477,21 @@ public class Core implements IdentityListener, UpdateListener {
* The text of the reply
* @return The created reply
*/
- public Reply createReply(Sone sone, Post post, String text) {
- return createReply(sone, post, System.currentTimeMillis(), text);
- }
-
- /**
- * Creates a new reply.
- *
- * @param sone
- * The Sone that creates the reply
- * @param post
- * The post that this reply refers to
- * @param time
- * The time of the reply
- * @param text
- * The text of the reply
- * @return The created reply
- */
- public Reply createReply(Sone sone, Post post, long time, String text) {
- if (!isLocalSone(sone)) {
- logger.log(Level.FINE, "Tried to create reply for non-local Sone: %s", sone);
+ public PostReply createReply(Sone sone, Post post, String text) {
+ checkNotNull(text, "text must not be null");
+ checkArgument(text.trim().length() > 0, "text must not be empty");
+ if (!sone.isLocal()) {
+ logger.log(Level.FINE, String.format("Tried to create reply for non-local Sone: %s", sone));
return null;
}
- Reply reply = new Reply(sone, post, System.currentTimeMillis(), text);
- synchronized (replies) {
- replies.put(reply.getId(), reply);
- }
- synchronized (newReplies) {
- knownReplies.add(reply.getId());
- }
+ PostReplyBuilder postReplyBuilder = postReplyBuilder();
+ postReplyBuilder.randomId().from(sone.getId()).to(post.getId()).currentTime().withText(text.trim());
+ final PostReply reply = postReplyBuilder.build();
+ database.storePostReply(reply);
+ eventBus.post(new NewPostReplyFoundEvent(reply));
sone.addReply(reply);
- saveSone(sone);
+ touchConfiguration();
+ localElementTicker.schedule(new MarkReplyKnown(reply), 10, TimeUnit.SECONDS);
return reply;
}
@@ -1652,33 +1501,31 @@ public class Core implements IdentityListener, UpdateListener {
* @param reply
* The reply to delete
*/
- public void deleteReply(Reply reply) {
+ public void deleteReply(PostReply reply) {
Sone sone = reply.getSone();
- if (!isLocalSone(sone)) {
- logger.log(Level.FINE, "Tried to delete non-local reply: %s", reply);
+ if (!sone.isLocal()) {
+ logger.log(Level.FINE, String.format("Tried to delete non-local reply: %s", reply));
return;
}
- synchronized (replies) {
- replies.remove(reply.getId());
- }
+ database.removePostReply(reply);
+ markReplyKnown(reply);
sone.removeReply(reply);
- saveSone(sone);
+ touchConfiguration();
}
/**
- * Marks the given reply as known, if it is currently a new reply (according
- * to {@link #isNewReply(String)}).
+ * Marks the given reply as known, if it is currently not a known reply
+ * (according to {@link Reply#isKnown()}).
*
* @param reply
* The reply to mark as known
*/
- public void markReplyKnown(Reply reply) {
- synchronized (newReplies) {
- if (newReplies.remove(reply.getId())) {
- knownReplies.add(reply.getId());
- coreListenerManager.fireMarkReplyKnown(reply);
- saveConfiguration();
- }
+ public void markReplyKnown(PostReply reply) {
+ boolean previouslyKnown = reply.isKnown();
+ reply.setKnown(true);
+ eventBus.post(new MarkPostReplyKnownEvent(reply));
+ if (!previouslyKnown) {
+ touchConfiguration();
}
}
@@ -1690,7 +1537,7 @@ public class Core implements IdentityListener, UpdateListener {
* @return The new album
*/
public Album createAlbum(Sone sone) {
- return createAlbum(sone, null);
+ return createAlbum(sone, sone.getRootAlbum());
}
/**
@@ -1704,47 +1551,330 @@ public class Core implements IdentityListener, UpdateListener {
* @return The new album
*/
public Album createAlbum(Sone sone, Album parent) {
- Album album = new Album();
- synchronized (albums) {
- albums.put(album.getId(), album);
- }
+ Album album = database.newAlbumBuilder().randomId().build();
+ database.storeAlbum(album);
album.setSone(sone);
- if (parent != null) {
- parent.addAlbum(album);
- }
- sone.addAlbum(album);
+ parent.addAlbum(album);
return album;
}
/**
+ * Deletes the given album. The owner of the album has to be a local Sone,
+ * and the album has to be {@link Album#isEmpty() empty} to be deleted.
+ *
+ * @param album
+ * The album to remove
+ */
+ public void deleteAlbum(Album album) {
+ checkNotNull(album, "album must not be null");
+ checkArgument(album.getSone().isLocal(), "albumâs Sone must be a local Sone");
+ if (!album.isEmpty()) {
+ return;
+ }
+ album.getParent().removeAlbum(album);
+ database.removeAlbum(album);
+ touchConfiguration();
+ }
+
+ /**
+ * Creates a new image.
+ *
+ * @param sone
+ * The Sone creating the image
+ * @param album
+ * The album the image will be inserted into
+ * @param temporaryImage
+ * The temporary image to create the image from
+ * @return The newly created image
+ */
+ public Image createImage(Sone sone, Album album, TemporaryImage temporaryImage) {
+ checkNotNull(sone, "sone must not be null");
+ checkNotNull(album, "album must not be null");
+ checkNotNull(temporaryImage, "temporaryImage must not be null");
+ checkArgument(sone.isLocal(), "sone must be a local Sone");
+ checkArgument(sone.equals(album.getSone()), "album must belong to the given Sone");
+ Image image = database.newImageBuilder().withId(temporaryImage.getId()).build().modify().setSone(sone).setCreationTime(System.currentTimeMillis()).update();
+ album.addImage(image);
+ database.storeImage(image);
+ imageInserter.insertImage(temporaryImage, image);
+ return image;
+ }
+
+ /**
+ * Deletes the given image. This method will also delete a matching
+ * temporary image.
+ *
+ * @see #deleteTemporaryImage(TemporaryImage)
+ * @param image
+ * The image to delete
+ */
+ public void deleteImage(Image image) {
+ checkNotNull(image, "image must not be null");
+ checkArgument(image.getSone().isLocal(), "image must belong to a local Sone");
+ deleteTemporaryImage(image.getId());
+ image.getAlbum().removeImage(image);
+ database.removeImage(image);
+ touchConfiguration();
+ }
+
+ /**
+ * Creates a new temporary image.
+ *
+ * @param mimeType
+ * The MIME type of the temporary image
+ * @param imageData
+ * The encoded data of the image
+ * @return The temporary image
+ */
+ public TemporaryImage createTemporaryImage(String mimeType, byte[] imageData) {
+ TemporaryImage temporaryImage = new TemporaryImage();
+ temporaryImage.setMimeType(mimeType).setImageData(imageData);
+ synchronized (temporaryImages) {
+ temporaryImages.put(temporaryImage.getId(), temporaryImage);
+ }
+ return temporaryImage;
+ }
+
+ /**
+ * Deletes the given temporary image.
+ *
+ * @param temporaryImage
+ * The temporary image to delete
+ */
+ public void deleteTemporaryImage(TemporaryImage temporaryImage) {
+ checkNotNull(temporaryImage, "temporaryImage must not be null");
+ deleteTemporaryImage(temporaryImage.getId());
+ }
+
+ /**
+ * Deletes the temporary image with the given ID.
+ *
+ * @param imageId
+ * The ID of the temporary image to delete
+ */
+ public void deleteTemporaryImage(String imageId) {
+ checkNotNull(imageId, "imageId must not be null");
+ synchronized (temporaryImages) {
+ temporaryImages.remove(imageId);
+ }
+ Image image = getImage(imageId, false);
+ if (image != null) {
+ imageInserter.cancelImageInsert(image);
+ }
+ }
+
+ /**
+ * Notifies the core that the configuration, either of the core or of a
+ * single local Sone, has changed, and that the configuration should be
+ * saved.
+ */
+ public void touchConfiguration() {
+ lastConfigurationUpdate = System.currentTimeMillis();
+ }
+
+ //
+ // SERVICE METHODS
+ //
+
+ /**
* Starts the core.
*/
- public void start() {
+ @Override
+ public void serviceStart() {
loadConfiguration();
- updateChecker.addUpdateListener(this);
updateChecker.start();
+ identityManager.start();
+ webOfTrustUpdater.init();
+ webOfTrustUpdater.start();
+ database.start();
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void serviceRun() {
+ long lastSaved = System.currentTimeMillis();
+ while (!shouldStop()) {
+ sleep(1000);
+ long now = System.currentTimeMillis();
+ if (shouldStop() || ((lastConfigurationUpdate > lastSaved) && ((now - lastConfigurationUpdate) > 5000))) {
+ for (Sone localSone : getLocalSones()) {
+ saveSone(localSone);
+ }
+ saveConfiguration();
+ lastSaved = now;
+ }
+ }
}
/**
* Stops the core.
*/
- public void stop() {
- synchronized (localSones) {
- for (SoneInserter soneInserter : soneInserters.values()) {
- soneInserter.stop();
+ @Override
+ public void serviceStop() {
+ localElementTicker.shutdownNow();
+ synchronized (sones) {
+ for (Entry soneInserter : soneInserters.entrySet()) {
+ soneInserter.getValue().stop();
+ saveSone(getLocalSone(soneInserter.getKey().getId(), false));
}
}
+ saveConfiguration();
+ database.stop();
+ webOfTrustUpdater.stop();
updateChecker.stop();
- updateChecker.removeUpdateListener(this);
soneDownloader.stop();
- saveConfiguration();
- stopped = true;
+ soneDownloaders.shutdown();
+ identityManager.stop();
+ }
+
+ //
+ // PRIVATE METHODS
+ //
+
+ /**
+ * Saves the given Sone. This will persist all local settings for the given
+ * Sone, such as the friends list and similar, private options.
+ *
+ * @param sone
+ * The Sone to save
+ */
+ private synchronized void saveSone(Sone sone) {
+ if (!sone.isLocal()) {
+ logger.log(Level.FINE, String.format("Tried to save non-local Sone: %s", sone));
+ return;
+ }
+ if (!(sone.getIdentity() instanceof OwnIdentity)) {
+ logger.log(Level.WARNING, String.format("Local Sone without OwnIdentity found, refusing to save: %s", sone));
+ return;
+ }
+
+ logger.log(Level.INFO, String.format("Saving Sone: %s", sone));
+ try {
+ /* save Sone into configuration. */
+ String sonePrefix = "Sone/" + sone.getId();
+ configuration.getLongValue(sonePrefix + "/Time").setValue(sone.getTime());
+ configuration.getStringValue(sonePrefix + "/LastInsertFingerprint").setValue(soneInserters.get(sone).getLastInsertFingerprint());
+
+ /* save profile. */
+ Profile profile = sone.getProfile();
+ configuration.getStringValue(sonePrefix + "/Profile/FirstName").setValue(profile.getFirstName());
+ configuration.getStringValue(sonePrefix + "/Profile/MiddleName").setValue(profile.getMiddleName());
+ configuration.getStringValue(sonePrefix + "/Profile/LastName").setValue(profile.getLastName());
+ configuration.getIntValue(sonePrefix + "/Profile/BirthDay").setValue(profile.getBirthDay());
+ configuration.getIntValue(sonePrefix + "/Profile/BirthMonth").setValue(profile.getBirthMonth());
+ configuration.getIntValue(sonePrefix + "/Profile/BirthYear").setValue(profile.getBirthYear());
+ configuration.getStringValue(sonePrefix + "/Profile/Avatar").setValue(profile.getAvatar());
+
+ /* save profile fields. */
+ int fieldCounter = 0;
+ for (Field profileField : profile.getFields()) {
+ String fieldPrefix = sonePrefix + "/Profile/Fields/" + fieldCounter++;
+ configuration.getStringValue(fieldPrefix + "/Name").setValue(profileField.getName());
+ configuration.getStringValue(fieldPrefix + "/Value").setValue(profileField.getValue());
+ }
+ configuration.getStringValue(sonePrefix + "/Profile/Fields/" + fieldCounter + "/Name").setValue(null);
+
+ /* save posts. */
+ int postCounter = 0;
+ for (Post post : sone.getPosts()) {
+ String postPrefix = sonePrefix + "/Posts/" + postCounter++;
+ configuration.getStringValue(postPrefix + "/ID").setValue(post.getId());
+ configuration.getStringValue(postPrefix + "/Recipient").setValue(post.getRecipientId().orNull());
+ configuration.getLongValue(postPrefix + "/Time").setValue(post.getTime());
+ configuration.getStringValue(postPrefix + "/Text").setValue(post.getText());
+ }
+ configuration.getStringValue(sonePrefix + "/Posts/" + postCounter + "/ID").setValue(null);
+
+ /* save replies. */
+ int replyCounter = 0;
+ for (PostReply reply : sone.getReplies()) {
+ String replyPrefix = sonePrefix + "/Replies/" + replyCounter++;
+ configuration.getStringValue(replyPrefix + "/ID").setValue(reply.getId());
+ configuration.getStringValue(replyPrefix + "/Post/ID").setValue(reply.getPostId());
+ configuration.getLongValue(replyPrefix + "/Time").setValue(reply.getTime());
+ configuration.getStringValue(replyPrefix + "/Text").setValue(reply.getText());
+ }
+ configuration.getStringValue(sonePrefix + "/Replies/" + replyCounter + "/ID").setValue(null);
+
+ /* save post likes. */
+ int postLikeCounter = 0;
+ for (String postId : sone.getLikedPostIds()) {
+ configuration.getStringValue(sonePrefix + "/Likes/Post/" + postLikeCounter++ + "/ID").setValue(postId);
+ }
+ configuration.getStringValue(sonePrefix + "/Likes/Post/" + postLikeCounter + "/ID").setValue(null);
+
+ /* save reply likes. */
+ int replyLikeCounter = 0;
+ for (String replyId : sone.getLikedReplyIds()) {
+ configuration.getStringValue(sonePrefix + "/Likes/Reply/" + replyLikeCounter++ + "/ID").setValue(replyId);
+ }
+ configuration.getStringValue(sonePrefix + "/Likes/Reply/" + replyLikeCounter + "/ID").setValue(null);
+
+ /* save friends. */
+ int friendCounter = 0;
+ for (String friendId : sone.getFriends()) {
+ configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter++ + "/ID").setValue(friendId);
+ }
+ configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(null);
+
+ /* save albums. first, collect in a flat structure, top-level first. */
+ List albums = FluentIterable.from(sone.getRootAlbum().getAlbums()).transformAndConcat(Album.FLATTENER).toList();
+
+ int albumCounter = 0;
+ for (Album album : albums) {
+ String albumPrefix = sonePrefix + "/Albums/" + albumCounter++;
+ configuration.getStringValue(albumPrefix + "/ID").setValue(album.getId());
+ configuration.getStringValue(albumPrefix + "/Title").setValue(album.getTitle());
+ configuration.getStringValue(albumPrefix + "/Description").setValue(album.getDescription());
+ configuration.getStringValue(albumPrefix + "/Parent").setValue(album.getParent().equals(sone.getRootAlbum()) ? null : album.getParent().getId());
+ configuration.getStringValue(albumPrefix + "/AlbumImage").setValue(album.getAlbumImage() == null ? null : album.getAlbumImage().getId());
+ }
+ configuration.getStringValue(sonePrefix + "/Albums/" + albumCounter + "/ID").setValue(null);
+
+ /* save images. */
+ int imageCounter = 0;
+ for (Album album : albums) {
+ for (Image image : album.getImages()) {
+ if (!image.isInserted()) {
+ continue;
+ }
+ String imagePrefix = sonePrefix + "/Images/" + imageCounter++;
+ configuration.getStringValue(imagePrefix + "/ID").setValue(image.getId());
+ configuration.getStringValue(imagePrefix + "/Album").setValue(album.getId());
+ configuration.getStringValue(imagePrefix + "/Key").setValue(image.getKey());
+ configuration.getStringValue(imagePrefix + "/Title").setValue(image.getTitle());
+ configuration.getStringValue(imagePrefix + "/Description").setValue(image.getDescription());
+ configuration.getLongValue(imagePrefix + "/CreationTime").setValue(image.getCreationTime());
+ configuration.getIntValue(imagePrefix + "/Width").setValue(image.getWidth());
+ configuration.getIntValue(imagePrefix + "/Height").setValue(image.getHeight());
+ }
+ }
+ configuration.getStringValue(sonePrefix + "/Images/" + imageCounter + "/ID").setValue(null);
+
+ /* save options. */
+ configuration.getBooleanValue(sonePrefix + "/Options/AutoFollow").setValue(sone.getOptions().isAutoFollow());
+ configuration.getBooleanValue(sonePrefix + "/Options/EnableSoneInsertNotifications").setValue(sone.getOptions().isSoneInsertNotificationEnabled());
+ configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewSones").setValue(sone.getOptions().isShowNewSoneNotifications());
+ configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewPosts").setValue(sone.getOptions().isShowNewPostNotifications());
+ configuration.getBooleanValue(sonePrefix + "/Options/ShowNotification/NewReplies").setValue(sone.getOptions().isShowNewReplyNotifications());
+ configuration.getStringValue(sonePrefix + "/Options/ShowCustomAvatars").setValue(sone.getOptions().getShowCustomAvatars().name());
+
+ configuration.save();
+
+ webOfTrustUpdater.setProperty((OwnIdentity) sone.getIdentity(), "Sone.LatestEdition", String.valueOf(sone.getLatestEdition()));
+
+ logger.log(Level.INFO, String.format("Sone %s saved.", sone));
+ } catch (ConfigurationException ce1) {
+ logger.log(Level.WARNING, String.format("Could not save Sone: %s", sone), ce1);
+ }
}
/**
* Saves the current options.
*/
- public void saveConfiguration() {
+ private void saveConfiguration() {
synchronized (configuration) {
if (storingConfiguration) {
logger.log(Level.FINE, "Already storing configurationâ¦");
@@ -1757,39 +1887,39 @@ public class Core implements IdentityListener, UpdateListener {
try {
configuration.getIntValue("Option/ConfigurationVersion").setValue(0);
configuration.getIntValue("Option/InsertionDelay").setValue(options.getIntegerOption("InsertionDelay").getReal());
+ configuration.getIntValue("Option/PostsPerPage").setValue(options.getIntegerOption("PostsPerPage").getReal());
+ configuration.getIntValue("Option/ImagesPerPage").setValue(options.getIntegerOption("ImagesPerPage").getReal());
+ configuration.getIntValue("Option/CharactersPerPost").setValue(options.getIntegerOption("CharactersPerPost").getReal());
+ configuration.getIntValue("Option/PostCutOffLength").setValue(options.getIntegerOption("PostCutOffLength").getReal());
+ configuration.getBooleanValue("Option/RequireFullAccess").setValue(options.getBooleanOption("RequireFullAccess").getReal());
configuration.getIntValue("Option/PositiveTrust").setValue(options.getIntegerOption("PositiveTrust").getReal());
configuration.getIntValue("Option/NegativeTrust").setValue(options.getIntegerOption("NegativeTrust").getReal());
configuration.getStringValue("Option/TrustComment").setValue(options.getStringOption("TrustComment").getReal());
- configuration.getBooleanValue("Option/SoneRescueMode").setValue(options.getBooleanOption("SoneRescueMode").getReal());
- configuration.getBooleanValue("Option/ClearOnNextRestart").setValue(options.getBooleanOption("ClearOnNextRestart").getReal());
- configuration.getBooleanValue("Option/ReallyClearOnNextRestart").setValue(options.getBooleanOption("ReallyClearOnNextRestart").getReal());
+ configuration.getBooleanValue("Option/ActivateFcpInterface").setValue(options.getBooleanOption("ActivateFcpInterface").getReal());
+ configuration.getIntValue("Option/FcpFullAccessRequired").setValue(options.getIntegerOption("FcpFullAccessRequired").getReal());
/* save known Sones. */
int soneCounter = 0;
- synchronized (newSones) {
+ synchronized (knownSones) {
for (String knownSoneId : knownSones) {
configuration.getStringValue("KnownSone/" + soneCounter++ + "/ID").setValue(knownSoneId);
}
configuration.getStringValue("KnownSone/" + soneCounter + "/ID").setValue(null);
}
- /* save known posts. */
- int postCounter = 0;
- synchronized (newPosts) {
- for (String knownPostId : knownPosts) {
- configuration.getStringValue("KnownPosts/" + postCounter++ + "/ID").setValue(knownPostId);
+ /* save Sone following times. */
+ soneCounter = 0;
+ synchronized (soneFollowingTimes) {
+ for (Entry soneFollowingTime : soneFollowingTimes.entrySet()) {
+ configuration.getStringValue("SoneFollowingTimes/" + soneCounter + "/Sone").setValue(soneFollowingTime.getKey());
+ configuration.getLongValue("SoneFollowingTimes/" + soneCounter + "/Time").setValue(soneFollowingTime.getValue());
+ ++soneCounter;
}
- configuration.getStringValue("KnownPosts/" + postCounter + "/ID").setValue(null);
+ configuration.getStringValue("SoneFollowingTimes/" + soneCounter + "/Sone").setValue(null);
}
- /* save known replies. */
- int replyCounter = 0;
- synchronized (newReplies) {
- for (String knownReplyId : knownReplies) {
- configuration.getStringValue("KnownReplies/" + replyCounter++ + "/ID").setValue(knownReplyId);
- }
- configuration.getStringValue("KnownReplies/" + replyCounter + "/ID").setValue(null);
- }
+ /* save known posts. */
+ database.save();
/* save bookmarked posts. */
int bookmarkedPostCounter = 0;
@@ -1805,6 +1935,8 @@ public class Core implements IdentityListener, UpdateListener {
} catch (ConfigurationException ce1) {
logger.log(Level.SEVERE, "Could not store configuration!", ce1);
+ } catch (DatabaseException de1) {
+ logger.log(Level.SEVERE, "Could not save database!", de1);
} finally {
synchronized (configuration) {
storingConfiguration = false;
@@ -1812,47 +1944,34 @@ public class Core implements IdentityListener, UpdateListener {
}
}
- //
- // PRIVATE METHODS
- //
-
/**
* Loads the configuration.
*/
- @SuppressWarnings("unchecked")
private void loadConfiguration() {
/* create options. */
- options.addIntegerOption("InsertionDelay", new DefaultOption(60, new OptionWatcher() {
-
- @Override
- public void optionChanged(Option option, Integer oldValue, Integer newValue) {
- SoneInserter.setInsertionDelay(newValue);
- }
-
- }));
- options.addIntegerOption("PositiveTrust", new DefaultOption(75));
- options.addIntegerOption("NegativeTrust", new DefaultOption(-100));
+ options.addIntegerOption("InsertionDelay", new DefaultOption(60, new IntegerRangePredicate(0, Integer.MAX_VALUE), new SetInsertionDelay()));
+ options.addIntegerOption("PostsPerPage", new DefaultOption(10, new IntegerRangePredicate(1, Integer.MAX_VALUE)));
+ options.addIntegerOption("ImagesPerPage", new DefaultOption(9, new IntegerRangePredicate(1, Integer.MAX_VALUE)));
+ options.addIntegerOption("CharactersPerPost", new DefaultOption(400, Predicates. or(new IntegerRangePredicate(50, Integer.MAX_VALUE), Predicates.equalTo(-1))));
+ options.addIntegerOption("PostCutOffLength", new DefaultOption(200, Predicates. or(new IntegerRangePredicate(50, Integer.MAX_VALUE), Predicates.equalTo(-1))));
+ options.addBooleanOption("RequireFullAccess", new DefaultOption(false));
+ options.addIntegerOption("PositiveTrust", new DefaultOption(75, new IntegerRangePredicate(0, 100)));
+ options.addIntegerOption("NegativeTrust", new DefaultOption(-25, new IntegerRangePredicate(-100, 100)));
options.addStringOption("TrustComment", new DefaultOption("Set from Sone Web Interface"));
- options.addBooleanOption("SoneRescueMode", new DefaultOption(false));
- options.addBooleanOption("ClearOnNextRestart", new DefaultOption(false));
- options.addBooleanOption("ReallyClearOnNextRestart", new DefaultOption(false));
-
- /* read options from configuration. */
- options.getBooleanOption("ClearOnNextRestart").set(configuration.getBooleanValue("Option/ClearOnNextRestart").getValue(null));
- options.getBooleanOption("ReallyClearOnNextRestart").set(configuration.getBooleanValue("Option/ReallyClearOnNextRestart").getValue(null));
- boolean clearConfiguration = options.getBooleanOption("ClearOnNextRestart").get() && options.getBooleanOption("ReallyClearOnNextRestart").get();
- options.getBooleanOption("ClearOnNextRestart").set(null);
- options.getBooleanOption("ReallyClearOnNextRestart").set(null);
- if (clearConfiguration) {
- /* stop loading the configuration. */
- return;
- }
-
- options.getIntegerOption("InsertionDelay").set(configuration.getIntValue("Option/InsertionDelay").getValue(null));
- options.getIntegerOption("PositiveTrust").set(configuration.getIntValue("Option/PositiveTrust").getValue(null));
- options.getIntegerOption("NegativeTrust").set(configuration.getIntValue("Option/NegativeTrust").getValue(null));
+ options.addBooleanOption("ActivateFcpInterface", new DefaultOption(false, fcpInterface.new SetActive()));
+ options.addIntegerOption("FcpFullAccessRequired", new DefaultOption(2, fcpInterface.new SetFullAccessRequired()));
+
+ loadConfigurationValue("InsertionDelay");
+ loadConfigurationValue("PostsPerPage");
+ loadConfigurationValue("ImagesPerPage");
+ loadConfigurationValue("CharactersPerPost");
+ loadConfigurationValue("PostCutOffLength");
+ options.getBooleanOption("RequireFullAccess").set(configuration.getBooleanValue("Option/RequireFullAccess").getValue(null));
+ loadConfigurationValue("PositiveTrust");
+ loadConfigurationValue("NegativeTrust");
options.getStringOption("TrustComment").set(configuration.getStringValue("Option/TrustComment").getValue(null));
- options.getBooleanOption("SoneRescueMode").set(configuration.getBooleanValue("Option/SoneRescueMode").getValue(null));
+ options.getBooleanOption("ActivateFcpInterface").set(configuration.getBooleanValue("Option/ActivateFcpInterface").getValue(null));
+ options.getIntegerOption("FcpFullAccessRequired").set(configuration.getIntValue("Option/FcpFullAccessRequired").getValue(null));
/* load known Sones. */
int soneCounter = 0;
@@ -1861,33 +1980,23 @@ public class Core implements IdentityListener, UpdateListener {
if (knownSoneId == null) {
break;
}
- synchronized (newSones) {
+ synchronized (knownSones) {
knownSones.add(knownSoneId);
}
}
- /* load known posts. */
- int postCounter = 0;
- while (true) {
- String knownPostId = configuration.getStringValue("KnownPosts/" + postCounter++ + "/ID").getValue(null);
- if (knownPostId == null) {
- break;
- }
- synchronized (newPosts) {
- knownPosts.add(knownPostId);
- }
- }
-
- /* load known replies. */
- int replyCounter = 0;
+ /* load Sone following times. */
+ soneCounter = 0;
while (true) {
- String knownReplyId = configuration.getStringValue("KnownReplies/" + replyCounter++ + "/ID").getValue(null);
- if (knownReplyId == null) {
+ String soneId = configuration.getStringValue("SoneFollowingTimes/" + soneCounter + "/Sone").getValue(null);
+ if (soneId == null) {
break;
}
- synchronized (newReplies) {
- knownReplies.add(knownReplyId);
+ long time = configuration.getLongValue("SoneFollowingTimes/" + soneCounter + "/Time").getValue(Long.MAX_VALUE);
+ synchronized (soneFollowingTimes) {
+ soneFollowingTimes.put(soneId, time);
}
+ ++soneCounter;
}
/* load bookmarked posts. */
@@ -1905,278 +2014,166 @@ public class Core implements IdentityListener, UpdateListener {
}
/**
- * Generate a Sone URI from the given URI and latest edition.
+ * Loads an {@link Integer} configuration value for the option with the
+ * given name, logging validation failures.
*
- * @param uriString
- * The URI to derive the Sone URI from
- * @return The derived URI
+ * @param optionName
+ * The name of the option to load
*/
- private FreenetURI getSoneUri(String uriString) {
+ private void loadConfigurationValue(String optionName) {
try {
- FreenetURI uri = new FreenetURI(uriString).setDocName("Sone").setMetaString(new String[0]);
- return uri;
- } catch (MalformedURLException mue1) {
- logger.log(Level.WARNING, "Could not create Sone URI from URI: " + uriString, mue1);
- return null;
+ options.getIntegerOption(optionName).set(configuration.getIntValue("Option/" + optionName).getValue(null));
+ } catch (IllegalArgumentException iae1) {
+ logger.log(Level.WARNING, String.format("Invalid value for %s in configuration, using default.", optionName));
}
}
- //
- // INTERFACE IdentityListener
- //
-
/**
- * {@inheritDoc}
+ * Notifies the core that a new {@link OwnIdentity} was added.
+ *
+ * @param ownIdentityAddedEvent
+ * The event
*/
- @Override
- public void ownIdentityAdded(OwnIdentity ownIdentity) {
- logger.log(Level.FINEST, "Adding OwnIdentity: " + ownIdentity);
+ @Subscribe
+ public void ownIdentityAdded(OwnIdentityAddedEvent ownIdentityAddedEvent) {
+ OwnIdentity ownIdentity = ownIdentityAddedEvent.ownIdentity();
+ logger.log(Level.FINEST, String.format("Adding OwnIdentity: %s", ownIdentity));
if (ownIdentity.hasContext("Sone")) {
- trustedIdentities.put(ownIdentity, Collections.synchronizedSet(new HashSet()));
addLocalSone(ownIdentity);
}
}
/**
- * {@inheritDoc}
+ * Notifies the core that an {@link OwnIdentity} was removed.
+ *
+ * @param ownIdentityRemovedEvent
+ * The event
*/
- @Override
- public void ownIdentityRemoved(OwnIdentity ownIdentity) {
- logger.log(Level.FINEST, "Removing OwnIdentity: " + ownIdentity);
- trustedIdentities.remove(ownIdentity);
+ @Subscribe
+ public void ownIdentityRemoved(OwnIdentityRemovedEvent ownIdentityRemovedEvent) {
+ OwnIdentity ownIdentity = ownIdentityRemovedEvent.ownIdentity();
+ logger.log(Level.FINEST, String.format("Removing OwnIdentity: %s", ownIdentity));
+ trustedIdentities.removeAll(ownIdentity);
}
/**
- * {@inheritDoc}
+ * Notifies the core that a new {@link Identity} was added.
+ *
+ * @param identityAddedEvent
+ * The event
*/
- @Override
- public void identityAdded(OwnIdentity ownIdentity, Identity identity) {
- logger.log(Level.FINEST, "Adding Identity: " + identity);
- trustedIdentities.get(ownIdentity).add(identity);
+ @Subscribe
+ public void identityAdded(IdentityAddedEvent identityAddedEvent) {
+ Identity identity = identityAddedEvent.identity();
+ logger.log(Level.FINEST, String.format("Adding Identity: %s", identity));
+ trustedIdentities.put(identityAddedEvent.ownIdentity(), identity);
addRemoteSone(identity);
}
/**
- * {@inheritDoc}
+ * Notifies the core that an {@link Identity} was updated.
+ *
+ * @param identityUpdatedEvent
+ * The event
*/
- @Override
- public void identityUpdated(OwnIdentity ownIdentity, final Identity identity) {
- new Thread(new Runnable() {
+ @Subscribe
+ public void identityUpdated(IdentityUpdatedEvent identityUpdatedEvent) {
+ Identity identity = identityUpdatedEvent.identity();
+ final Sone sone = getRemoteSone(identity.getId(), false);
+ if (sone.isLocal()) {
+ return;
+ }
+ sone.setIdentity(identity);
+ sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), sone.getLatestEdition()));
+ soneDownloader.addSone(sone);
+ soneDownloaders.execute(soneDownloader.fetchSoneAction(sone));
+ }
- @Override
- @SuppressWarnings("synthetic-access")
- public void run() {
- Sone sone = getRemoteSone(identity.getId());
- sone.setIdentity(identity);
- soneDownloader.addSone(sone);
- soneDownloader.fetchSone(sone);
+ /**
+ * Notifies the core that an {@link Identity} was removed.
+ *
+ * @param identityRemovedEvent
+ * The event
+ */
+ @Subscribe
+ public void identityRemoved(IdentityRemovedEvent identityRemovedEvent) {
+ OwnIdentity ownIdentity = identityRemovedEvent.ownIdentity();
+ Identity identity = identityRemovedEvent.identity();
+ trustedIdentities.remove(ownIdentity, identity);
+ boolean foundIdentity = false;
+ for (Entry> trustedIdentity : trustedIdentities.asMap().entrySet()) {
+ if (trustedIdentity.getKey().equals(ownIdentity)) {
+ continue;
+ }
+ if (trustedIdentity.getValue().contains(identity)) {
+ foundIdentity = true;
}
- }).start();
+ }
+ if (foundIdentity) {
+ /* some local identity still trusts this identity, donât remove. */
+ return;
+ }
+ Optional sone = getSone(identity.getId());
+ if (!sone.isPresent()) {
+ /* TODO - we donât have the Sone anymore. should this happen? */
+ return;
+ }
+ database.removePosts(sone.get());
+ for (Post post : sone.get().getPosts()) {
+ eventBus.post(new PostRemovedEvent(post));
+ }
+ database.removePostReplies(sone.get());
+ for (PostReply reply : sone.get().getReplies()) {
+ eventBus.post(new PostReplyRemovedEvent(reply));
+ }
+ synchronized (sones) {
+ sones.remove(identity.getId());
+ }
+ eventBus.post(new SoneRemovedEvent(sone.get()));
}
/**
- * {@inheritDoc}
+ * Deletes the temporary image.
+ *
+ * @param imageInsertFinishedEvent
+ * The event
*/
- @Override
- public void identityRemoved(OwnIdentity ownIdentity, Identity identity) {
- trustedIdentities.get(ownIdentity).remove(identity);
+ @Subscribe
+ public void imageInsertFinished(ImageInsertFinishedEvent imageInsertFinishedEvent) {
+ logger.log(Level.WARNING, String.format("Image insert finished for %s: %s", imageInsertFinishedEvent.image(), imageInsertFinishedEvent.resultingUri()));
+ imageInsertFinishedEvent.image().modify().setKey(imageInsertFinishedEvent.resultingUri().toString()).update();
+ deleteTemporaryImage(imageInsertFinishedEvent.image().getId());
+ touchConfiguration();
}
- //
- // INTERFACE UpdateListener
- //
+ @VisibleForTesting
+ class MarkPostKnown implements Runnable {
- /**
- * {@inheritDoc}
- */
- @Override
- public void updateFound(Version version, long releaseTime, long latestEdition) {
- coreListenerManager.fireUpdateFound(version, releaseTime, latestEdition);
- }
-
- /**
- * Convenience interface for external classes that want to access the coreâs
- * configuration.
- *
- * @author David âBombeâ Roden
- */
- public static class Preferences {
-
- /** The wrapped options. */
- private final Options options;
-
- /**
- * Creates a new preferences object wrapped around the given options.
- *
- * @param options
- * The options to wrap
- */
- public Preferences(Options options) {
- this.options = options;
- }
-
- /**
- * Returns the insertion delay.
- *
- * @return The insertion delay
- */
- public int getInsertionDelay() {
- return options.getIntegerOption("InsertionDelay").get();
- }
-
- /**
- * Sets the insertion delay
- *
- * @param insertionDelay
- * The new insertion delay, or {@code null} to restore it to
- * the default value
- * @return This preferences
- */
- public Preferences setInsertionDelay(Integer insertionDelay) {
- options.getIntegerOption("InsertionDelay").set(insertionDelay);
- return this;
- }
-
- /**
- * Returns the positive trust.
- *
- * @return The positive trust
- */
- public int getPositiveTrust() {
- return options.getIntegerOption("PositiveTrust").get();
- }
-
- /**
- * Sets the positive trust.
- *
- * @param positiveTrust
- * The new positive trust, or {@code null} to restore it to
- * the default vlaue
- * @return This preferences
- */
- public Preferences setPositiveTrust(Integer positiveTrust) {
- options.getIntegerOption("PositiveTrust").set(positiveTrust);
- return this;
- }
-
- /**
- * Returns the negative trust.
- *
- * @return The negative trust
- */
- public int getNegativeTrust() {
- return options.getIntegerOption("NegativeTrust").get();
- }
-
- /**
- * Sets the negative trust.
- *
- * @param negativeTrust
- * The negative trust, or {@code null} to restore it to the
- * default value
- * @return The preferences
- */
- public Preferences setNegativeTrust(Integer negativeTrust) {
- options.getIntegerOption("NegativeTrust").set(negativeTrust);
- return this;
- }
-
- /**
- * Returns the trust comment. This is the comment that is set in the web
- * of trust when a trust value is assigned to an identity.
- *
- * @return The trust comment
- */
- public String getTrustComment() {
- return options.getStringOption("TrustComment").get();
- }
-
- /**
- * Sets the trust comment.
- *
- * @param trustComment
- * The trust comment, or {@code null} to restore it to the
- * default value
- * @return This preferences
- */
- public Preferences setTrustComment(String trustComment) {
- options.getStringOption("TrustComment").set(trustComment);
- return this;
- }
-
- /**
- * Returns whether the rescue mode is active.
- *
- * @return {@code true} if the rescue mode is active, {@code false}
- * otherwise
- */
- public boolean isSoneRescueMode() {
- return options.getBooleanOption("SoneRescueMode").get();
- }
-
- /**
- * Sets whether the rescue mode is active.
- *
- * @param soneRescueMode
- * {@code true} if the rescue mode is active, {@code false}
- * otherwise
- * @return This preferences
- */
- public Preferences setSoneRescueMode(Boolean soneRescueMode) {
- options.getBooleanOption("SoneRescueMode").set(soneRescueMode);
- return this;
- }
-
- /**
- * Returns whether Sone should clear its settings on the next restart.
- * In order to be effective, {@link #isReallyClearOnNextRestart()} needs
- * to return {@code true} as well!
- *
- * @return {@code true} if Sone should clear its settings on the next
- * restart, {@code false} otherwise
- */
- public boolean isClearOnNextRestart() {
- return options.getBooleanOption("ClearOnNextRestart").get();
- }
-
- /**
- * Sets whether Sone will clear its settings on the next restart.
- *
- * @param clearOnNextRestart
- * {@code true} if Sone should clear its settings on the next
- * restart, {@code false} otherwise
- * @return This preferences
- */
- public Preferences setClearOnNextRestart(Boolean clearOnNextRestart) {
- options.getBooleanOption("ClearOnNextRestart").set(clearOnNextRestart);
- return this;
- }
-
- /**
- * Returns whether Sone should really clear its settings on next
- * restart. This is a confirmation option that needs to be set in
- * addition to {@link #isClearOnNextRestart()} in order to clear Soneâs
- * settings on the next restart.
- *
- * @return {@code true} if Sone should really clear its settings on the
- * next restart, {@code false} otherwise
- */
- public boolean isReallyClearOnNextRestart() {
- return options.getBooleanOption("ReallyClearOnNextRestart").get();
- }
-
- /**
- * Sets whether Sone should really clear its settings on the next
- * restart.
- *
- * @param reallyClearOnNextRestart
- * {@code true} if Sone should really clear its settings on
- * the next restart, {@code false} otherwise
- * @return This preferences
- */
- public Preferences setReallyClearOnNextRestart(Boolean reallyClearOnNextRestart) {
- options.getBooleanOption("ReallyClearOnNextRestart").set(reallyClearOnNextRestart);
- return this;
+ private final Post post;
+
+ public MarkPostKnown(Post post) {
+ this.post = post;
+ }
+
+ @Override
+ public void run() {
+ markPostKnown(post);
+ }
+
+ }
+
+ @VisibleForTesting
+ class MarkReplyKnown implements Runnable {
+
+ private final PostReply postReply;
+
+ public MarkReplyKnown(PostReply postReply) {
+ this.postReply = postReply;
+ }
+
+ @Override
+ public void run() {
+ markReplyKnown(postReply);
}
}