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.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.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;
*
* @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
*/
-public class Core extends AbstractService implements IdentityListener, UpdateListener, SoneProvider, PostProvider, SoneInsertListener, ImageInsertListener {
+public class Core extends AbstractService implements IdentityListener, SoneProvider, PostProvider {
/** The logger. */
private static final Logger logger = Logging.getLogger(Core.class);
/** 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;
this.freenetInterface = freenetInterface;
this.identityManager = identityManager;
this.soneDownloader = new SoneDownloader(this, freenetInterface);
- this.imageInserter = new ImageInserter(this, freenetInterface);
- this.updateChecker = new UpdateChecker(freenetInterface);
+ this.imageInserter = new ImageInserter(freenetInterface);
+ this.updateChecker = new UpdateChecker(eventBus, freenetInterface);
this.webOfTrustUpdater = webOfTrustUpdater;
this.eventBus = eventBus;
}
//
- // 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);
- }
-
- //
// ACCESSORS
//
@Override
public Sone getSone(String id, boolean create) {
synchronized (sones) {
- if (!sones.containsKey(id)) {
+ if (!sones.containsKey(id) && create) {
Sone sone = new Sone(id, false);
sones.put(id, sone);
}
public void lockSone(Sone sone) {
synchronized (lockedSones) {
if (lockedSones.add(sone)) {
- coreListenerManager.fireSoneLocked(sone);
+ eventBus.post(new SoneLockedEvent(sone));
}
}
}
public void unlockSone(Sone sone) {
synchronized (lockedSones) {
if (lockedSones.remove(sone)) {
- coreListenerManager.fireSoneUnlocked(sone);
+ eventBus.post(new SoneUnlockedEvent(sone));
}
}
}
sone.setKnown(true);
/* TODO - load posts ’n stuff */
sones.put(ownIdentity.getId(), sone);
- final SoneInserter soneInserter = new SoneInserter(this, freenetInterface, sone);
- soneInserter.addSoneInsertListener(this);
+ final SoneInserter soneInserter = new SoneInserter(this, eventBus, freenetInterface, sone);
soneInserters.put(sone, soneInserter);
sone.setStatus(SoneStatus.idle);
loadSone(sone);
}
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);
for (Post post : storedSone.getPosts()) {
posts.remove(post.getId());
if (!sone.getPosts().contains(post)) {
- coreListenerManager.firePostRemoved(post);
+ eventBus.post(new PostRemovedEvent(post));
}
}
}
knownPosts.add(post.getId());
post.setKnown(true);
} else if (!knownPosts.contains(post.getId())) {
- coreListenerManager.fireNewPostFound(post);
+ eventBus.post(new NewPostFoundEvent(post));
}
}
posts.put(post.getId(), post);
for (PostReply reply : storedSone.getReplies()) {
replies.remove(reply.getId());
if (!sone.getReplies().contains(reply)) {
- coreListenerManager.fireReplyRemoved(reply);
+ eventBus.post(new PostReplyRemovedEvent(reply));
}
}
}
knownReplies.add(reply.getId());
reply.setKnown(true);
} else if (!knownReplies.contains(reply.getId())) {
- coreListenerManager.fireNewReplyFound(reply);
+ eventBus.post(new NewPostReplyFoundEvent(reply));
}
}
replies.put(reply.getId(), reply);
}
sones.remove(sone.getId());
SoneInserter soneInserter = soneInserters.remove(sone);
- soneInserter.removeSoneInsertListener(this);
soneInserter.stop();
}
webOfTrustUpdater.removeContext((OwnIdentity) sone.getIdentity(), "Sone");
/**
* 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
synchronized (knownSones) {
knownSones.add(sone.getId());
}
- coreListenerManager.fireMarkSoneKnown(sone);
+ eventBus.post(new MarkSoneKnownEvent(sone));
touchConfiguration();
}
}
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() {
synchronized (posts) {
posts.remove(post.getId());
}
- coreListenerManager.firePostRemoved(post);
+ eventBus.post(new PostRemovedEvent(post));
markPostKnown(post);
touchConfiguration();
}
public void markPostKnown(Post post) {
post.setKnown(true);
synchronized (knownPosts) {
- coreListenerManager.fireMarkPostKnown(post);
+ eventBus.post(new MarkPostKnownEvent(post));
if (knownPosts.add(post.getId())) {
touchConfiguration();
}
replies.put(reply.getId(), reply);
}
synchronized (knownReplies) {
- coreListenerManager.fireNewReplyFound(reply);
+ eventBus.post(new NewPostReplyFoundEvent(reply));
}
sone.addReply(reply);
touchConfiguration();
public void markReplyKnown(PostReply reply) {
reply.setKnown(true);
synchronized (knownReplies) {
- coreListenerManager.fireMarkReplyKnown(reply);
+ eventBus.post(new MarkPostReplyKnownEvent(reply));
if (knownReplies.add(reply.getId())) {
touchConfiguration();
}
@Override
public void serviceStart() {
loadConfiguration();
- updateChecker.addUpdateListener(this);
updateChecker.start();
identityManager.addIdentityListener(this);
identityManager.start();
public void serviceStop() {
synchronized (sones) {
for (Entry<Sone, SoneInserter> soneInserter : soneInserters.entrySet()) {
- soneInserter.getValue().removeSoneInsertListener(this);
soneInserter.getValue().stop();
saveSone(soneInserter.getKey());
}
saveConfiguration();
webOfTrustUpdater.stop();
updateChecker.stop();
- updateChecker.removeUpdateListener(this);
soneDownloader.stop();
identityManager.removeIdentityListener(this);
identityManager.stop();
synchronized (knownPosts) {
for (Post post : sone.getPosts()) {
posts.remove(post.getId());
- coreListenerManager.firePostRemoved(post);
+ eventBus.post(new PostRemovedEvent(post));
}
}
}
synchronized (knownReplies) {
for (PostReply reply : sone.getReplies()) {
replies.remove(reply.getId());
- coreListenerManager.fireReplyRemoved(reply);
+ eventBus.post(new PostReplyRemovedEvent(reply));
}
}
}
synchronized (sones) {
sones.remove(identity.getId());
}
- coreListenerManager.fireSoneRemoved(sone);
+ eventBus.post(new SoneRemovedEvent(sone));
}
- //
- // INTERFACE UpdateListener
- //
-
/**
- * {@inheritDoc}
- */
- @Override
- public void updateFound(Version version, long releaseTime, long latestEdition) {
- coreListenerManager.fireUpdateFound(version, releaseTime, latestEdition);
- }
-
- //
- // INTERFACE ImageInsertListener
- //
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void insertStarted(Sone sone) {
- coreListenerManager.fireSoneInserting(sone);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void insertFinished(Sone sone, long insertDuration) {
- coreListenerManager.fireSoneInserted(sone, insertDuration);
- }
-
- /**
- * {@inheritDoc}
- */
- @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);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void imageInsertAborted(Image image) {
- logger.log(Level.WARNING, String.format("Image insert aborted for %s.", image));
- coreListenerManager.fireImageInsertAborted(image);
- }
-
- /**
- * {@inheritDoc}
+ * Deletes the temporary image.
+ *
+ * @param imageInsertFinishedEvent
+ * The event
*/
- @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());
+ @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();
- coreListenerManager.fireImageInsertFinished(image);
- }
-
- /**
- * {@inheritDoc}
- */
- @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);
}
/**
projects / Sone.git / blobdiff