X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=18588a180fc5924acb1586229a93a4bce2a8c7a0;hp=6525ac30124091fd58b346b35c2380900aa4d9cb;hb=faf66247a34f64946990a985d2ea3003465969cb;hpb=f4f21f18add10c6a1c95f70faf851f06920dc77b

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 6525ac3..18588a1 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–2019 David Roden
+ * Sone - Core.java - Copyright © 2010–2020 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
@@ -24,6 +24,7 @@ import static com.google.common.primitives.Longs.tryParse;
 import static java.lang.String.format;
 import static java.util.logging.Level.WARNING;
 import static java.util.logging.Logger.getLogger;
+import static net.pterodactylus.sone.data.AlbumsKt.getAllImages;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -88,6 +89,7 @@ import net.pterodactylus.util.service.AbstractService;
 import net.pterodactylus.util.thread.NamedThreadFactory;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Stopwatch;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
@@ -176,6 +178,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	private volatile long lastConfigurationUpdate;
 
 	private final MetricRegistry metricRegistry;
+	private final Histogram configurationSaveTimeHistogram;
 
 	/**
 	 * Creates a new core.
@@ -207,6 +210,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		this.database = database;
 		this.metricRegistry = metricRegistry;
 		preferences = new Preferences(eventBus);
+		this.configurationSaveTimeHistogram = metricRegistry.histogram("configuration.save.duration", () -> new Histogram(new ExponentiallyDecayingReservoir(3000, 0)));
 	}
 
 	//
@@ -631,9 +635,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()) {
+		if (sone.getPosts().isEmpty() && sone.getReplies().isEmpty() && getAllImages(sone.getRootAlbum()).isEmpty()) {
 			// dirty hack
 			lockSone(sone);
+			eventBus.post(new SoneLockedOnStartup(sone));
 		}
 		soneInserter.start();
 		return sone;
@@ -746,75 +751,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	}
 
 	/**
-	 * Sets the trust value of the given origin Sone for the target Sone.
-	 *
-	 * @param origin
-	 *            The origin Sone
-	 * @param target
-	 *            The target Sone
-	 * @param trustValue
-	 *            The trust value (from {@code -100} to {@code 100})
-	 */
-	public void setTrust(Sone origin, Sone target, int trustValue) {
-		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());
-	}
-
-	/**
-	 * Removes any trust assignment for the given target Sone.
-	 *
-	 * @param origin
-	 *            The trust origin
-	 * @param target
-	 *            The trust target
-	 */
-	public void removeTrust(Sone origin, Sone target) {
-		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);
-	}
-
-	/**
-	 * Assigns the configured positive trust value for the given target.
-	 *
-	 * @param origin
-	 *            The trust origin
-	 * @param target
-	 *            The trust target
-	 */
-	public void trustSone(Sone origin, Sone target) {
-		setTrust(origin, target, preferences.getPositiveTrust());
-	}
-
-	/**
-	 * Assigns the configured negative trust value for the given target.
-	 *
-	 * @param origin
-	 *            The trust origin
-	 * @param target
-	 *            The trust target
-	 */
-	public void distrustSone(Sone origin, Sone target) {
-		setTrust(origin, target, preferences.getNegativeTrust());
-	}
-
-	/**
-	 * Removes the trust assignment for the given target.
-	 *
-	 * @param origin
-	 *            The trust origin
-	 * @param target
-	 *            The trust target
-	 */
-	public void untrustSone(Sone origin, Sone target) {
-		removeTrust(origin, target);
-	}
-
-	/**
 	 * Updates the stored Sone with the given Sone.
 	 *
 	 * @param sone
@@ -1367,7 +1303,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		synchronized (soneInserters) {
 			for (Entry<Sone, SoneInserter> soneInserter : soneInserters.entrySet()) {
 				soneInserter.getValue().stop();
-				saveSone(soneInserter.getKey());
+				Sone latestSone = getLocalSone(soneInserter.getKey().getId());
+				saveSone(latestSone);
 			}
 		}
 		synchronized (soneRescuers) {
@@ -1546,7 +1483,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			database.save();
 
 			/* now save it. */
+			Stopwatch stopwatch = Stopwatch.createStarted();
 			configuration.save();
+			configurationSaveTimeHistogram.update(stopwatch.elapsed(TimeUnit.MICROSECONDS));
 
 		} catch (ConfigurationException ce1) {
 			logger.log(Level.SEVERE, "Could not store configuration!", ce1);