X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=6525ac30124091fd58b346b35c2380900aa4d9cb;hb=f4f21f18add10c6a1c95f70faf851f06920dc77b;hp=99527bccf106212a0b6e4dceb3b21df1495189ad;hpb=fb02c1039ac55c9bcf82507016e3938dc2426a21;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 99527bc..6525ac3 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -44,24 +44,13 @@ import java.util.logging.Logger;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import com.codahale.metrics.*;
 import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidAlbumFound;
 import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidImageFound;
 import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidParentAlbumFound;
 import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidPostFound;
 import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidPostReplyFound;
-import net.pterodactylus.sone.core.event.ImageInsertFinishedEvent;
-import net.pterodactylus.sone.core.event.InsertionDelayChangedEvent;
-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.core.event.*;
 import net.pterodactylus.sone.data.Album;
 import net.pterodactylus.sone.data.Client;
 import net.pterodactylus.sone.data.Image;
@@ -186,6 +175,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	/** The time the configuration was last touched. */
 	private volatile long lastConfigurationUpdate;
 
+	private final MetricRegistry metricRegistry;
+
 	/**
 	 * Creates a new core.
 	 *
@@ -203,7 +194,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 *            The database
 	 */
 	@Inject
-	public Core(Configuration configuration, FreenetInterface freenetInterface, IdentityManager identityManager, SoneDownloader soneDownloader, ImageInserter imageInserter, UpdateChecker updateChecker, WebOfTrustUpdater webOfTrustUpdater, EventBus eventBus, Database database) {
+	public Core(Configuration configuration, FreenetInterface freenetInterface, IdentityManager identityManager, SoneDownloader soneDownloader, ImageInserter imageInserter, UpdateChecker updateChecker, WebOfTrustUpdater webOfTrustUpdater, EventBus eventBus, Database database, MetricRegistry metricRegistry) {
 		super("Sone Core");
 		this.configuration = configuration;
 		this.freenetInterface = freenetInterface;
@@ -214,6 +205,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		this.webOfTrustUpdater = webOfTrustUpdater;
 		this.eventBus = eventBus;
 		this.database = database;
+		this.metricRegistry = metricRegistry;
 		preferences = new Preferences(eventBus);
 	}
 
@@ -237,6 +229,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 
 	public void setDebug() {
 		debug.set(true);
+		eventBus.post(new DebugActivatedEvent());
 	}
 
 	/**
@@ -629,7 +622,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		sone.setLatestEdition(fromNullable(tryParse(property)).or(0L));
 		sone.setClient(new Client("Sone", SonePlugin.getPluginVersion()));
 		sone.setKnown(true);
-		SoneInserter soneInserter = new SoneInserter(this, eventBus, freenetInterface, ownIdentity.getId());
+		SoneInserter soneInserter = new SoneInserter(this, eventBus, freenetInterface, metricRegistry, ownIdentity.getId());
 		soneInserter.insertionDelayChanged(new InsertionDelayChangedEvent(preferences.getInsertionDelay()));
 		eventBus.register(soneInserter);
 		synchronized (soneInserters) {
@@ -638,6 +631,10 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		loadSone(sone);
 		database.storeSone(sone);
 		sone.setStatus(SoneStatus.idle);
+		if (sone.getPosts().isEmpty() && sone.getReplies().isEmpty()) {
+			// dirty hack
+			lockSone(sone);
+		}
 		soneInserter.start();
 		return sone;
 	}
@@ -1589,7 +1586,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 */
 	@Subscribe
 	public void ownIdentityAdded(OwnIdentityAddedEvent ownIdentityAddedEvent) {
-		OwnIdentity ownIdentity = ownIdentityAddedEvent.ownIdentity();
+		OwnIdentity ownIdentity = ownIdentityAddedEvent.getOwnIdentity();
 		logger.log(Level.FINEST, String.format("Adding OwnIdentity: %s", ownIdentity));
 		if (ownIdentity.hasContext("Sone")) {
 			addLocalSone(ownIdentity);
@@ -1604,7 +1601,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 */
 	@Subscribe
 	public void ownIdentityRemoved(OwnIdentityRemovedEvent ownIdentityRemovedEvent) {
-		OwnIdentity ownIdentity = ownIdentityRemovedEvent.ownIdentity();
+		OwnIdentity ownIdentity = ownIdentityRemovedEvent.getOwnIdentity();
 		logger.log(Level.FINEST, String.format("Removing OwnIdentity: %s", ownIdentity));
 		trustedIdentities.removeAll(ownIdentity);
 	}
@@ -1617,9 +1614,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 */
 	@Subscribe
 	public void identityAdded(IdentityAddedEvent identityAddedEvent) {
-		Identity identity = identityAddedEvent.identity();
+		Identity identity = identityAddedEvent.getIdentity();
 		logger.log(Level.FINEST, String.format("Adding Identity: %s", identity));
-		trustedIdentities.put(identityAddedEvent.ownIdentity(), identity);
+		trustedIdentities.put(identityAddedEvent.getOwnIdentity(), identity);
 		addRemoteSone(identity);
 	}
 
@@ -1631,7 +1628,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 */
 	@Subscribe
 	public void identityUpdated(IdentityUpdatedEvent identityUpdatedEvent) {
-		Identity identity = identityUpdatedEvent.identity();
+		Identity identity = identityUpdatedEvent.getIdentity();
 		final Sone sone = getRemoteSone(identity.getId());
 		if (sone.isLocal()) {
 			return;
@@ -1655,8 +1652,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 */
 	@Subscribe
 	public void identityRemoved(IdentityRemovedEvent identityRemovedEvent) {
-		OwnIdentity ownIdentity = identityRemovedEvent.ownIdentity();
-		Identity identity = identityRemovedEvent.identity();
+		OwnIdentity ownIdentity = identityRemovedEvent.getOwnIdentity();
+		Identity identity = identityRemovedEvent.getIdentity();
 		trustedIdentities.remove(ownIdentity, identity);
 		for (Entry<OwnIdentity, Collection<Identity>> trustedIdentity : trustedIdentities.asMap().entrySet()) {
 			if (trustedIdentity.getKey().equals(ownIdentity)) {