X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=e278629302ef5229b6c5639afa7d7e64e099960a;hb=9f3bbe5bb4450085d23bfa39c95da13267104916;hp=9a40e5c4242ab5e57a69caa58570b0c5fa9bbf18;hpb=efb1006429e52a74f41fb6e1d7736736156bb13a;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 9a40e5c..e278629 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -19,6 +19,7 @@ package net.pterodactylus.sone.core;
import java.net.MalformedURLException;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -34,6 +35,22 @@ 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.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.SoneInsertAbortedEvent;
+import net.pterodactylus.sone.core.event.SoneInsertedEvent;
+import net.pterodactylus.sone.core.event.SoneInsertingEvent;
+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.core.event.UpdateFoundEvent;
import net.pterodactylus.sone.data.Album;
import net.pterodactylus.sone.data.Client;
import net.pterodactylus.sone.data.Image;
@@ -53,20 +70,26 @@ 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.main.SonePlugin;
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.service.AbstractService;
+import net.pterodactylus.util.thread.NamedThreadFactory;
import net.pterodactylus.util.thread.Ticker;
import net.pterodactylus.util.validation.EqualityValidator;
import net.pterodactylus.util.validation.IntegerRangeValidator;
import net.pterodactylus.util.validation.OrValidator;
import net.pterodactylus.util.validation.Validation;
import net.pterodactylus.util.version.Version;
+
+import com.google.common.base.Predicate;
+import com.google.common.collect.Collections2;
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
+import com.google.inject.Inject;
+
import freenet.keys.FreenetURI;
/**
@@ -74,19 +97,22 @@ import freenet.keys.FreenetURI;
*
* @author David âBombeâ Roden
*/
-public class Core extends AbstractService implements IdentityListener, UpdateListener, SoneProvider, PostProvider, SoneInsertListener, ImageInsertListener {
+public class Core extends AbstractService implements IdentityListener, UpdateListener, SoneProvider, PostProvider, SoneInsertListener {
/** 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;
@@ -107,13 +133,13 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
private final ImageInserter imageInserter;
/** Sone downloader thread-pool. */
- private final ExecutorService soneDownloaders = Executors.newFixedThreadPool(10);
+ private final ExecutorService soneDownloaders = Executors.newFixedThreadPool(10, new NamedThreadFactory("Sone Downloader %2$d"));
/** The update checker. */
private final UpdateChecker updateChecker;
/** The trust updater. */
- private final TrustUpdater trustUpdater;
+ private final WebOfTrustUpdater webOfTrustUpdater;
/** The FCP interface. */
private volatile FcpInterface fcpInterface;
@@ -126,20 +152,16 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
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();
/** Sone rescuers. */
- /* synchronize access on this on localSones. */
+ /* synchronize access on this on sones. */
private final Map soneRescuers = new HashMap();
- /** All local Sones. */
+ /** All Sones. */
/* synchronize access on this on itself. */
- private final Map localSones = new HashMap();
-
- /** All remote Sones. */
- /* synchronize access on this on itself. */
- private final Map remoteSones = new HashMap();
+ private final Map sones = new HashMap();
/** All known Sones. */
private final Set knownSones = new HashSet();
@@ -187,46 +209,37 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The freenet interface
* @param identityManager
* The identity manager
+ * @param webOfTrustUpdater
+ * The WebOfTrust updater
+ * @param eventBus
+ * The event bus
*/
- public Core(Configuration configuration, FreenetInterface freenetInterface, IdentityManager identityManager, TrustUpdater trustUpdater) {
+ @Inject
+ public Core(Configuration configuration, FreenetInterface freenetInterface, IdentityManager identityManager, WebOfTrustUpdater webOfTrustUpdater, EventBus eventBus) {
super("Sone Core");
this.configuration = configuration;
this.freenetInterface = freenetInterface;
this.identityManager = identityManager;
this.soneDownloader = new SoneDownloader(this, freenetInterface);
- this.imageInserter = new ImageInserter(this, freenetInterface);
+ this.imageInserter = new ImageInserter(freenetInterface);
this.updateChecker = new UpdateChecker(freenetInterface);
- this.trustUpdater = trustUpdater;
+ this.webOfTrustUpdater = webOfTrustUpdater;
+ this.eventBus = eventBus;
}
//
- // LISTENER MANAGEMENT
+ // ACCESSORS
//
/**
- * Adds a new core listener.
- *
- * @param coreListener
- * The listener to add
- */
- public void addCoreListener(CoreListener coreListener) {
- coreListenerManager.addListener(coreListener);
- }
-
- /**
- * Removes a core listener.
+ * Returns the time Sone was started.
*
- * @param coreListener
- * The listener to remove
+ * @return The startup time (in milliseconds since Jan 1, 1970 UTC)
*/
- public void removeCoreListener(CoreListener coreListener) {
- coreListenerManager.removeListener(coreListener);
+ public long getStartupTime() {
+ return startupTime;
}
- //
- // ACCESSORS
- //
-
/**
* Sets the configuration to use. This will automatically save the current
* configuration to the given configuration.
@@ -284,8 +297,8 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* @return The Sone rescuer for the given Sone
*/
public SoneRescuer getSoneRescuer(Sone sone) {
- Validation.begin().isNotNull("Sone", sone).check().is("Local Sone", isLocalSone(sone)).check();
- synchronized (localSones) {
+ Validation.begin().isNotNull("Sone", sone).check().is("Local Sone", sone.isLocal()).check();
+ synchronized (sones) {
SoneRescuer soneRescuer = soneRescuers.get(sone);
if (soneRescuer == null) {
soneRescuer = new SoneRescuer(this, soneDownloader, sone);
@@ -315,10 +328,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* @return All Sones
*/
public Set getSones() {
- Set allSones = new HashSet();
- allSones.addAll(getLocalSones());
- allSones.addAll(getRemoteSones());
- return allSones;
+ return new HashSet(sones.values());
}
/**
@@ -349,10 +359,13 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
@Override
public Sone getSone(String id, boolean create) {
- if (isLocalSone(id)) {
- return getLocalSone(id);
+ synchronized (sones) {
+ if (!sones.containsKey(id) && create) {
+ Sone sone = new Sone(id, false);
+ sones.put(id, sone);
+ }
+ return sones.get(id);
}
- return getRemoteSone(id, create);
}
/**
@@ -364,33 +377,8 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* 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);
+ synchronized (sones) {
+ return sones.containsKey(id);
}
}
@@ -399,21 +387,16 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*
* @return All local Sones
*/
- public Set getLocalSones() {
- synchronized (localSones) {
- return new HashSet(localSones.values());
- }
- }
+ public Collection getLocalSones() {
+ synchronized (sones) {
+ return Collections2.filter(sones.values(), new Predicate() {
- /**
- * 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);
+ @Override
+ public boolean apply(Sone sone) {
+ return sone.isLocal();
+ }
+ });
+ }
}
/**
@@ -427,11 +410,15 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* @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);
+ sone = new Sone(id, true);
+ sones.put(id, sone);
+ }
+ if ((sone != null) && !sone.isLocal()) {
+ sone = new Sone(id, true);
+ sones.put(id, sone);
}
return sone;
}
@@ -442,9 +429,15 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*
* @return All remote Sones
*/
- public Set getRemoteSones() {
- synchronized (remoteSones) {
- return new HashSet(remoteSones.values());
+ public Collection getRemoteSones() {
+ synchronized (sones) {
+ return Collections2.filter(sones.values(), new Predicate() {
+
+ @Override
+ public boolean apply(Sone sone) {
+ return !sone.isLocal();
+ }
+ });
}
}
@@ -459,45 +452,17 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* @return The Sone with the given ID
*/
public Sone getRemoteSone(String id, boolean create) {
- synchronized (remoteSones) {
- Sone sone = remoteSones.get(id);
+ synchronized (sones) {
+ Sone sone = sones.get(id);
if ((sone == null) && create && (id != null) && (id.length() == 43)) {
- sone = new Sone(id);
- remoteSones.put(id, sone);
+ sone = new Sone(id, false);
+ sones.put(id, sone);
}
return sone;
}
}
/**
- * Returns whether the given Sone is a remote Sone.
- *
- * @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,
- * {@code false} otherwise
- */
- public boolean isRemoteSone(String id) {
- synchronized (remoteSones) {
- return remoteSones.containsKey(id);
- }
- }
-
- /**
* Returns whether the given Sone has been modified.
*
* @param sone
@@ -596,18 +561,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
/**
* 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
- */
- public PostReply getReply(String replyId) {
- return getReply(replyId, true);
- }
-
- /**
- * 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.
*
@@ -618,7 +571,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* to return {@code null} if no reply can be found
* @return The reply, or {@code null} if there is no such reply
*/
- public PostReply getReply(String replyId, boolean create) {
+ public PostReply getPostReply(String replyId, boolean create) {
synchronized (replies) {
PostReply reply = replies.get(replyId);
if (create && (reply == null)) {
@@ -826,7 +779,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
public void lockSone(Sone sone) {
synchronized (lockedSones) {
if (lockedSones.add(sone)) {
- coreListenerManager.fireSoneLocked(sone);
+ eventBus.post(new SoneLockedEvent(sone));
}
}
}
@@ -841,7 +794,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
public void unlockSone(Sone sone) {
synchronized (lockedSones) {
if (lockedSones.remove(sone)) {
- coreListenerManager.fireSoneUnlocked(sone);
+ eventBus.post(new SoneUnlockedEvent(sone));
}
}
}
@@ -858,10 +811,10 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
logger.log(Level.WARNING, "Given OwnIdentity is null!");
return null;
}
- synchronized (localSones) {
+ 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, String.format("Could not convert the Identityâs URIs to Freenet URIs: %s, %s", ownIdentity.getInsertUri(), ownIdentity.getRequestUri()), mue1);
return null;
@@ -870,7 +823,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
sone.setClient(new Client("Sone", SonePlugin.VERSION.toString()));
sone.setKnown(true);
/* TODO - load posts ân stuff */
- localSones.put(ownIdentity.getId(), sone);
+ sones.put(ownIdentity.getId(), sone);
final SoneInserter soneInserter = new SoneInserter(this, freenetInterface, sone);
soneInserter.addSoneInsertListener(this);
soneInserters.put(sone, soneInserter);
@@ -889,10 +842,8 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* @return The created Sone
*/
public Sone createSone(OwnIdentity ownIdentity) {
- try {
- ownIdentity.addContext("Sone");
- } catch (WebOfTrustException wote1) {
- logger.log(Level.SEVERE, String.format("Could not add âSoneâ context to own identity: %s", 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);
@@ -920,7 +871,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
logger.log(Level.WARNING, "Given Identity is null!");
return null;
}
- synchronized (remoteSones) {
+ synchronized (sones) {
final Sone sone = getRemoteSone(identity.getId(), true).setIdentity(identity);
boolean newSone = sone.getRequestUri() == null;
sone.setRequestUri(getSoneUri(identity.getRequestUri()));
@@ -931,7 +882,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
}
sone.setKnown(!newSone);
if (newSone) {
- coreListenerManager.fireNewSoneFound(sone);
+ eventBus.post(new NewSoneFoundEvent(sone));
for (Sone localSone : getLocalSones()) {
if (localSone.getOptions().getBooleanOption("AutoFollow").get()) {
followSone(localSone, sone);
@@ -1043,26 +994,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
}
/**
- * Retrieves the trust relationship from the origin to the target. If the
- * trust relationship can not be retrieved, {@code null} is returned.
- *
- * @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, String.format("Tried to get trust from remote Sone: %s", origin));
- return null;
- }
- trustUpdater.getTrust((OwnIdentity) origin.getIdentity(), target.getIdentity());
- return target.getIdentity().getTrust((OwnIdentity) origin.getIdentity());
- }
-
- /**
* Sets the trust value of the given origin Sone for the target Sone.
*
* @param origin
@@ -1074,7 +1005,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
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();
- trustUpdater.setTrust((OwnIdentity) origin.getIdentity(), target.getIdentity(), trustValue, preferences.getTrustComment());
+ webOfTrustUpdater.setTrust((OwnIdentity) origin.getIdentity(), target.getIdentity(), trustValue, preferences.getTrustComment());
}
/**
@@ -1087,7 +1018,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
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();
- trustUpdater.setTrust((OwnIdentity) origin.getIdentity(), target.getIdentity(), null, null);
+ webOfTrustUpdater.setTrust((OwnIdentity) origin.getIdentity(), target.getIdentity(), null, null);
}
/**
@@ -1159,7 +1090,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
for (Post post : storedSone.getPosts()) {
posts.remove(post.getId());
if (!sone.getPosts().contains(post)) {
- coreListenerManager.firePostRemoved(post);
+ eventBus.post(new PostRemovedEvent(post));
}
}
}
@@ -1170,9 +1101,9 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
if (!storedPosts.contains(post)) {
if (post.getTime() < getSoneFollowingTime(sone)) {
knownPosts.add(post.getId());
+ post.setKnown(true);
} else if (!knownPosts.contains(post.getId())) {
- sone.setKnown(false);
- coreListenerManager.fireNewPostFound(post);
+ eventBus.post(new NewPostFoundEvent(post));
}
}
posts.put(post.getId(), post);
@@ -1184,7 +1115,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
for (PostReply reply : storedSone.getReplies()) {
replies.remove(reply.getId());
if (!sone.getReplies().contains(reply)) {
- coreListenerManager.fireReplyRemoved(reply);
+ eventBus.post(new PostReplyRemovedEvent(reply));
}
}
}
@@ -1195,9 +1126,9 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
if (!storedReplies.contains(reply)) {
if (reply.getTime() < getSoneFollowingTime(sone)) {
knownReplies.add(reply.getId());
+ reply.setKnown(true);
} else if (!knownReplies.contains(reply.getId())) {
- reply.setKnown(false);
- coreListenerManager.fireNewReplyFound(reply);
+ eventBus.post(new NewPostReplyFoundEvent(reply));
}
}
replies.put(reply.getId(), reply);
@@ -1256,8 +1187,8 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
/**
* 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
@@ -1267,22 +1198,18 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
logger.log(Level.WARNING, String.format("Tried to delete Sone of non-own identity: %s", sone));
return;
}
- synchronized (localSones) {
- if (!localSones.containsKey(sone.getId())) {
+ 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());
+ sones.remove(sone.getId());
SoneInserter soneInserter = soneInserters.remove(sone);
soneInserter.removeSoneInsertListener(this);
soneInserter.stop();
}
- try {
- ((OwnIdentity) sone.getIdentity()).removeContext("Sone");
- ((OwnIdentity) sone.getIdentity()).removeProperty("Sone.LatestEdition");
- } catch (WebOfTrustException wote1) {
- logger.log(Level.WARNING, String.format("Could not remove context and properties from Sone: %s", sone), wote1);
- }
+ 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) {
@@ -1292,7 +1219,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
/**
* Marks the given Sone as known. If the Sone was not {@link Post#isKnown()
- * known} before, a {@link CoreListener#markSoneKnown(Sone)} event is fired.
+ * known} before, a {@link MarkSoneKnownEvent} is fired.
*
* @param sone
* The Sone to mark as known
@@ -1303,7 +1230,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
synchronized (knownSones) {
knownSones.add(sone.getId());
}
- coreListenerManager.fireMarkSoneKnown(sone);
+ eventBus.post(new MarkSoneKnownEvent(sone));
touchConfiguration();
}
}
@@ -1316,7 +1243,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The Sone to load and update
*/
public void loadSone(Sone sone) {
- if (!isLocalSone(sone)) {
+ if (!sone.isLocal()) {
logger.log(Level.FINE, String.format("Tried to load non-local Sone: %s", sone));
return;
}
@@ -1395,7 +1322,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
logger.log(Level.WARNING, "Invalid reply found, aborting load!");
return;
}
- replies.add(getReply(replyId).setSone(sone).setPost(getPost(postId)).setTime(replyTime).setText(replyText));
+ replies.add(getPostReply(replyId, true).setSone(sone).setPost(getPost(postId)).setTime(replyTime).setText(replyText));
}
/* load post likes. */
@@ -1593,7 +1520,8 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* @return The created post
*/
public Post createPost(Sone sone, Sone recipient, long time, String text) {
- if (!isLocalSone(sone)) {
+ Validation.begin().isNotNull("Text", text).check().isGreater("Text Length", text.length(), 0).check();
+ if (!sone.isLocal()) {
logger.log(Level.FINE, String.format("Tried to create post for non-local Sone: %s", sone));
return null;
}
@@ -1604,7 +1532,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
synchronized (posts) {
posts.put(post.getId(), post);
}
- coreListenerManager.fireNewPostFound(post);
+ eventBus.post(new NewPostFoundEvent(post));
sone.addPost(post);
touchConfiguration();
localElementTicker.registerEvent(System.currentTimeMillis() + 10 * 1000, new Runnable() {
@@ -1627,7 +1555,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The post to delete
*/
public void deletePost(Post post) {
- if (!isLocalSone(post.getSone())) {
+ if (!post.getSone().isLocal()) {
logger.log(Level.WARNING, String.format("Tried to delete post of non-local Sone: %s", post.getSone()));
return;
}
@@ -1635,7 +1563,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
synchronized (posts) {
posts.remove(post.getId());
}
- coreListenerManager.firePostRemoved(post);
+ eventBus.post(new PostRemovedEvent(post));
markPostKnown(post);
touchConfiguration();
}
@@ -1650,7 +1578,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
public void markPostKnown(Post post) {
post.setKnown(true);
synchronized (knownPosts) {
- coreListenerManager.fireMarkPostKnown(post);
+ eventBus.post(new MarkPostKnownEvent(post));
if (knownPosts.add(post.getId())) {
touchConfiguration();
}
@@ -1733,7 +1661,8 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* @return The created reply
*/
public PostReply createReply(Sone sone, Post post, long time, String text) {
- if (!isLocalSone(sone)) {
+ Validation.begin().isNotNull("Text", text).check().isGreater("Text Length", text.trim().length(), 0).check();
+ if (!sone.isLocal()) {
logger.log(Level.FINE, String.format("Tried to create reply for non-local Sone: %s", sone));
return null;
}
@@ -1742,7 +1671,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
replies.put(reply.getId(), reply);
}
synchronized (knownReplies) {
- coreListenerManager.fireNewReplyFound(reply);
+ eventBus.post(new NewPostReplyFoundEvent(reply));
}
sone.addReply(reply);
touchConfiguration();
@@ -1767,7 +1696,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
public void deleteReply(PostReply reply) {
Sone sone = reply.getSone();
- if (!isLocalSone(sone)) {
+ if (!sone.isLocal()) {
logger.log(Level.FINE, String.format("Tried to delete non-local reply: %s", reply));
return;
}
@@ -1792,7 +1721,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
public void markReplyKnown(PostReply reply) {
reply.setKnown(true);
synchronized (knownReplies) {
- coreListenerManager.fireMarkReplyKnown(reply);
+ eventBus.post(new MarkPostReplyKnownEvent(reply));
if (knownReplies.add(reply.getId())) {
touchConfiguration();
}
@@ -1842,7 +1771,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The album to remove
*/
public void deleteAlbum(Album album) {
- Validation.begin().isNotNull("Album", album).check().is("Local Sone", isLocalSone(album.getSone())).check();
+ Validation.begin().isNotNull("Album", album).check().is("Local Sone", album.getSone().isLocal()).check();
if (!album.isEmpty()) {
return;
}
@@ -1854,7 +1783,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
synchronized (albums) {
albums.remove(album.getId());
}
- saveSone(album.getSone());
+ touchConfiguration();
}
/**
@@ -1869,7 +1798,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* @return The newly created image
*/
public Image createImage(Sone sone, Album album, TemporaryImage temporaryImage) {
- Validation.begin().isNotNull("Sone", sone).isNotNull("Album", album).isNotNull("Temporary Image", temporaryImage).check().is("Local Sone", isLocalSone(sone)).check().isEqual("Owner and Album Owner", sone, album.getSone()).check();
+ Validation.begin().isNotNull("Sone", sone).isNotNull("Album", album).isNotNull("Temporary Image", temporaryImage).check().is("Local Sone", sone.isLocal()).check().isEqual("Owner and Album Owner", sone, album.getSone()).check();
Image image = new Image(temporaryImage.getId()).setSone(sone).setCreationTime(System.currentTimeMillis());
album.addImage(image);
synchronized (images) {
@@ -1888,13 +1817,13 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The image to delete
*/
public void deleteImage(Image image) {
- Validation.begin().isNotNull("Image", image).check().is("Local Sone", isLocalSone(image.getSone())).check();
+ Validation.begin().isNotNull("Image", image).check().is("Local Sone", image.getSone().isLocal()).check();
deleteTemporaryImage(image.getId());
image.getAlbum().removeImage(image);
synchronized (images) {
images.remove(image.getId());
}
- saveSone(image.getSone());
+ touchConfiguration();
}
/**
@@ -1964,7 +1893,10 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
loadConfiguration();
updateChecker.addUpdateListener(this);
updateChecker.start();
- trustUpdater.start();
+ identityManager.addIdentityListener(this);
+ identityManager.start();
+ webOfTrustUpdater.init();
+ webOfTrustUpdater.start();
}
/**
@@ -1991,16 +1923,20 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
@Override
public void serviceStop() {
- synchronized (localSones) {
- for (SoneInserter soneInserter : soneInserters.values()) {
- soneInserter.removeSoneInsertListener(this);
- soneInserter.stop();
+ synchronized (sones) {
+ for (Entry soneInserter : soneInserters.entrySet()) {
+ soneInserter.getValue().removeSoneInsertListener(this);
+ soneInserter.getValue().stop();
+ saveSone(soneInserter.getKey());
}
}
- trustUpdater.stop();
+ saveConfiguration();
+ webOfTrustUpdater.stop();
updateChecker.stop();
updateChecker.removeUpdateListener(this);
soneDownloader.stop();
+ identityManager.removeIdentityListener(this);
+ identityManager.stop();
}
//
@@ -2015,7 +1951,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The Sone to save
*/
private synchronized void saveSone(Sone sone) {
- if (!isLocalSone(sone)) {
+ if (!sone.isLocal()) {
logger.log(Level.FINE, String.format("Tried to save non-local Sone: %s", sone));
return;
}
@@ -2137,13 +2073,11 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
configuration.save();
- ((OwnIdentity) sone.getIdentity()).setProperty("Sone.LatestEdition", String.valueOf(sone.getLatestEdition()));
+ 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);
- } catch (WebOfTrustException wote1) {
- logger.log(Level.WARNING, String.format("Could not set WoT property for Sone: %s", sone), wote1);
}
}
@@ -2376,12 +2310,12 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
* The URI to derive the Sone URI from
* @return The derived URI
*/
- private FreenetURI getSoneUri(String uriString) {
+ private static FreenetURI getSoneUri(String uriString) {
try {
FreenetURI uri = new FreenetURI(uriString).setDocName("Sone").setMetaString(new String[0]);
return uri;
} catch (MalformedURLException mue1) {
- logger.log(Level.WARNING, String.format("Could not create Sone URI from URI: %s", uriString, mue1));
+ logger.log(Level.WARNING, String.format("Could not create Sone URI from URI: %s", uriString), mue1);
return null;
}
}
@@ -2426,7 +2360,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
@Override
public void identityUpdated(OwnIdentity ownIdentity, final Identity identity) {
- new Thread(new Runnable() {
+ soneDownloaders.execute(new Runnable() {
@Override
@SuppressWarnings("synthetic-access")
@@ -2437,7 +2371,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
soneDownloader.addSone(sone);
soneDownloader.fetchSone(sone);
}
- }).start();
+ });
}
/**
@@ -2468,7 +2402,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
synchronized (knownPosts) {
for (Post post : sone.getPosts()) {
posts.remove(post.getId());
- coreListenerManager.firePostRemoved(post);
+ eventBus.post(new PostRemovedEvent(post));
}
}
}
@@ -2476,14 +2410,14 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
synchronized (knownReplies) {
for (PostReply reply : sone.getReplies()) {
replies.remove(reply.getId());
- coreListenerManager.fireReplyRemoved(reply);
+ eventBus.post(new PostReplyRemovedEvent(reply));
}
}
}
- synchronized (remoteSones) {
- remoteSones.remove(identity.getId());
+ synchronized (sones) {
+ sones.remove(identity.getId());
}
- coreListenerManager.fireSoneRemoved(sone);
+ eventBus.post(new SoneRemovedEvent(sone));
}
//
@@ -2495,7 +2429,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
@Override
public void updateFound(Version version, long releaseTime, long latestEdition) {
- coreListenerManager.fireUpdateFound(version, releaseTime, latestEdition);
+ eventBus.post(new UpdateFoundEvent(version, releaseTime, latestEdition));
}
//
@@ -2507,7 +2441,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
@Override
public void insertStarted(Sone sone) {
- coreListenerManager.fireSoneInserting(sone);
+ eventBus.post(new SoneInsertingEvent(sone));
}
/**
@@ -2515,7 +2449,7 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
@Override
public void insertFinished(Sone sone, long insertDuration) {
- coreListenerManager.fireSoneInserted(sone, insertDuration);
+ eventBus.post(new SoneInsertedEvent(sone, insertDuration));
}
/**
@@ -2523,50 +2457,21 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
*/
@Override
public void insertAborted(Sone sone, Throwable cause) {
- coreListenerManager.fireSoneInsertAborted(sone, cause);
- }
-
- //
- // SONEINSERTLISTENER METHODS
- //
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void imageInsertStarted(Image image) {
- logger.log(Level.WARNING, String.format("Image insert started for %s...", image));
- coreListenerManager.fireImageInsertStarted(image);
+ eventBus.post(new SoneInsertAbortedEvent(sone, cause));
}
/**
- * {@inheritDoc}
- */
- @Override
- public void imageInsertAborted(Image image) {
- logger.log(Level.WARNING, String.format("Image insert aborted for %s.", image));
- coreListenerManager.fireImageInsertAborted(image);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void imageInsertFinished(Image image, FreenetURI key) {
- logger.log(Level.WARNING, String.format("Image insert finished for %s: %s", image, key));
- image.setKey(key.toString());
- deleteTemporaryImage(image.getId());
- saveSone(image.getSone());
- coreListenerManager.fireImageInsertFinished(image);
- }
-
- /**
- * {@inheritDoc}
+ * Deletes the temporary image.
+ *
+ * @param imageInsertFinishedEvent
+ * The event
*/
- @Override
- public void imageInsertFailed(Image image, Throwable cause) {
- logger.log(Level.WARNING, String.format("Image insert failed for %s." + image), cause);
- coreListenerManager.fireImageInsertFailed(image, cause);
+ @Subscribe
+ public void imageInsertFinished(ImageInsertFinishedEvent imageInsertFinishedEvent) {
+ logger.log(Level.WARNING, String.format("Image insert finished for %s: %s", imageInsertFinishedEvent.image(), imageInsertFinishedEvent.resultingUri()));
+ imageInsertFinishedEvent.image().setKey(imageInsertFinishedEvent.resultingUri().toString());
+ deleteTemporaryImage(imageInsertFinishedEvent.image().getId());
+ touchConfiguration();
}
/**