X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=c8d500ecdddec30863fe4c07ad3fa02dac7c9742;hb=977406b376374680eb2dae63dc17d8aea1a780dd;hp=895f45e743607c968fa632779049acd03959d243;hpb=19ff2e20cd414bfa9e600ff01500c8aed44f8519;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 895f45e..c8d500e 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -31,18 +31,25 @@ 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.data.Client;
import net.pterodactylus.sone.data.Post;
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.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.validation.Validation;
+import net.pterodactylus.util.version.Version;
import freenet.keys.FreenetURI;
/**
@@ -50,7 +57,7 @@ import freenet.keys.FreenetURI;
*
* @author David âBombeâ Roden
*/
-public class Core implements IdentityListener {
+public class Core implements IdentityListener, UpdateListener {
/**
* Enumeration for the possible states of a {@link Sone}.
@@ -78,8 +85,14 @@ public class Core implements IdentityListener {
/** The options. */
private final Options options = new Options();
+ /** The core listener manager. */
+ private final CoreListenerManager coreListenerManager = new CoreListenerManager(this);
+
/** The configuration. */
- private final Configuration configuration;
+ private Configuration configuration;
+
+ /** Whether weâre currently saving the configuration. */
+ private boolean storingConfiguration = false;
/** The identity manager. */
private final IdentityManager identityManager;
@@ -90,10 +103,20 @@ public class Core implements IdentityListener {
/** The Sone downloader. */
private final SoneDownloader soneDownloader;
+ /** The update checker. */
+ private final UpdateChecker updateChecker;
+
+ /** Whether the core has been stopped. */
+ private volatile boolean stopped;
+
/** The Sonesâ statuses. */
/* synchronize access on itself. */
private final Map soneStatuses = new HashMap();
+ /** Locked local Sones. */
+ /* synchronize on itself. */
+ private final Set lockedSones = new HashSet();
+
/** Sone inserters. */
/* synchronize access on this on localSones. */
private final Map soneInserters = new HashMap();
@@ -132,6 +155,9 @@ public class Core implements IdentityListener {
/** All known replies. */
private Set knownReplies = new HashSet();
+ /** Trusted identities, sorted by own identities. */
+ private Map> trustedIdentities = Collections.synchronizedMap(new HashMap>());
+
/**
* Creates a new core.
*
@@ -147,6 +173,31 @@ public class Core implements IdentityListener {
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);
}
//
@@ -154,6 +205,18 @@ public class Core implements IdentityListener {
//
/**
+ * Sets the configuration to use. This will automatically save the current
+ * configuration to the given configuration.
+ *
+ * @param configuration
+ * The new configuration to use
+ */
+ public void setConfiguration(Configuration configuration) {
+ this.configuration = configuration;
+ saveConfiguration();
+ }
+
+ /**
* Returns the options used by the core.
*
* @return The options of the core
@@ -163,6 +226,16 @@ public class Core implements IdentityListener {
}
/**
+ * Returns whether the âSone rescue modeâ is currently activated.
+ *
+ * @return {@code true} if the âSone rescue modeâ is currently activated,
+ * {@code false} if it is not
+ */
+ public boolean isSoneRescueMode() {
+ return options.getBooleanOption("SoneRescueMode").get();
+ }
+
+ /**
* Returns the identity manager used by the core.
*
* @return The identity manager
@@ -172,6 +245,15 @@ public class Core implements IdentityListener {
}
/**
+ * Returns the update checker.
+ *
+ * @return The update checker
+ */
+ public UpdateChecker getUpdateChecker() {
+ return updateChecker;
+ }
+
+ /**
* Returns the status of the given Sone.
*
* @param sone
@@ -199,6 +281,19 @@ public class Core implements IdentityListener {
}
/**
+ * Returns whether the given Sone is currently locked.
+ *
+ * @param sone
+ * The sone to check
+ * @return {@code true} if the Sone is locked, {@code false} if it is not
+ */
+ public boolean isLocked(Sone sone) {
+ synchronized (lockedSones) {
+ return lockedSones.contains(sone);
+ }
+ }
+
+ /**
* Returns all Sones, remote and local.
*
* @return All Sones
@@ -301,11 +396,26 @@ public class Core implements IdentityListener {
* @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
+ * The ID of the Sone
+ * @param create
+ * {@code true} to create a new Sone if none exists,
+ * {@code false} to return null if none exists
+ * @return The Sone with the given ID, or {@code null}
+ */
+ public Sone getLocalSone(String id, boolean create) {
synchronized (localSones) {
Sone sone = localSones.get(id);
- if (sone == null) {
+ if ((sone == null) && create) {
sone = new Sone(id);
localSones.put(id, sone);
+ setSoneStatus(sone, SoneStatus.unknown);
}
return sone;
}
@@ -349,6 +459,7 @@ public class Core implements IdentityListener {
if ((sone == null) && create) {
sone = new Sone(id);
remoteSones.put(id, sone);
+ setSoneStatus(sone, SoneStatus.unknown);
}
return sone;
}
@@ -383,23 +494,69 @@ public class Core implements IdentityListener {
}
/**
- * Returns whether the given Sone is a new Sone. After this check, the Sone
- * is marked as known, i.e. a second call with the same parameters will
- * always yield {@code false}.
+ * Returns whether the Sone with the given ID is a new Sone. After this
+ * check, the Sone is marked as known, i.e. a second call with the same
+ * parameters will always yield {@code false}.
*
- * @param sone
- * The sone to check for
+ * @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) {
+ return isNewSone(soneId, true);
+ }
+
+ /**
+ * Returns whether the Sone with the given ID is a new Sone. The Sone will
+ * be marked as known if {@code markAsKnown} is {@code true}, otherwise the
+ * Sone will keep its current ânewâ state.
+ *
+ * @param soneId
+ * The ID of the sone to check for
+ * @param markAsKnown
+ * {@code true} to mark the Sone as known in any case,
+ * {@code false} to not mark it as known
* @return {@code true} if the given Sone is new, false otherwise
*/
- public boolean isNewSone(Sone sone) {
+ public boolean isNewSone(String soneId, boolean markAsKnown) {
synchronized (newSones) {
- boolean isNew = !knownSones.contains(sone.getId()) && newSones.remove(sone.getId());
- knownSones.add(sone.getId());
+ boolean isNew = !knownSones.contains(soneId) && newSones.contains(soneId);
+ if (markAsKnown) {
+ Sone sone = getSone(soneId, false);
+ if (sone != null) {
+ markSoneKnown(sone);
+ }
+ }
return isNew;
}
}
/**
+ * Returns whether the given Sone has been modified.
+ *
+ * @param sone
+ * The Sone to check for modifications
+ * @return {@code true} if a modification has been detected in the Sone,
+ * {@code false} otherwise
+ */
+ public boolean isModifiedSone(Sone sone) {
+ return (soneInserters.containsKey(sone)) ? soneInserters.get(sone).isModified() : false;
+ }
+
+ /**
+ * Returns whether the target Sone is trusted by the origin Sone.
+ *
+ * @param origin
+ * The origin Sone
+ * @param target
+ * The target Sone
+ * @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);
+ }
+
+ /**
* Returns the post with the given ID.
*
* @param postId
@@ -407,9 +564,23 @@ public class Core implements IdentityListener {
* @return The post, or {@code null} if there is no such post
*/
public Post getPost(String postId) {
+ return getPost(postId, true);
+ }
+
+ /**
+ * 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
+ */
+ public Post getPost(String postId, boolean create) {
synchronized (posts) {
Post post = posts.get(postId);
- if (post == null) {
+ if ((post == null) && create) {
post = new Post(postId);
posts.put(postId, post);
}
@@ -427,24 +598,63 @@ public class Core implements IdentityListener {
* otherwise
*/
public boolean isNewPost(String postId) {
+ return isNewPost(postId, true);
+ }
+
+ /**
+ * Returns whether the given post ID is new. If {@code markAsKnown} is
+ * {@code true} then after this method returns the post ID is marked a known
+ * post ID.
+ *
+ * @param postId
+ * The post ID
+ * @param markAsKnown
+ * {@code true} to mark the post ID as known, {@code false} to
+ * not to mark it as known
+ * @return {@code true} if the post is considered to be new, {@code false}
+ * otherwise
+ */
+ public boolean isNewPost(String postId, boolean markAsKnown) {
synchronized (newPosts) {
- boolean isNew = !knownPosts.contains(postId) && newPosts.remove(postId);
- knownPosts.add(postId);
+ boolean isNew = !knownPosts.contains(postId) && newPosts.contains(postId);
+ if (markAsKnown) {
+ Post post = getPost(postId, false);
+ if (post != null) {
+ markPostKnown(post);
+ }
+ }
return isNew;
}
}
/**
- * Returns the reply with the given ID.
+ * 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, or {@code null} if there is no such reply
+ * @return The reply
*/
public Reply 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.
+ *
+ * @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
+ */
+ public Reply getReply(String replyId, boolean create) {
synchronized (replies) {
Reply reply = replies.get(replyId);
- if (reply == null) {
+ if (create && (reply == null)) {
reply = new Reply(replyId);
replies.put(replyId, reply);
}
@@ -482,9 +692,29 @@ public class Core implements IdentityListener {
* otherwise
*/
public boolean isNewReply(String replyId) {
+ return isNewReply(replyId, true);
+ }
+
+ /**
+ * Returns whether the reply with the given ID is new.
+ *
+ * @param replyId
+ * The ID of the reply to check
+ * @param markAsKnown
+ * {@code true} to mark the reply as known, {@code false} to not
+ * to mark it as known
+ * @return {@code true} if the reply is considered to be new, {@code false}
+ * otherwise
+ */
+ public boolean isNewReply(String replyId, boolean markAsKnown) {
synchronized (newReplies) {
- boolean isNew = !knownReplies.contains(replyId) && newReplies.remove(replyId);
- knownReplies.add(replyId);
+ boolean isNew = !knownReplies.contains(replyId) && newReplies.contains(replyId);
+ if (markAsKnown) {
+ Reply reply = getReply(replyId, false);
+ if (reply != null) {
+ markReplyKnown(reply);
+ }
+ }
return isNew;
}
}
@@ -528,6 +758,37 @@ public class Core implements IdentityListener {
//
/**
+ * Locks the given Sone. A locked Sone will not be inserted by
+ * {@link SoneInserter} until it is {@link #unlockSone(Sone) unlocked}
+ * again.
+ *
+ * @param sone
+ * The sone to lock
+ */
+ public void lockSone(Sone sone) {
+ synchronized (lockedSones) {
+ if (lockedSones.add(sone)) {
+ coreListenerManager.fireSoneLocked(sone);
+ }
+ }
+ }
+
+ /**
+ * Unlocks the given Sone.
+ *
+ * @see #lockSone(Sone)
+ * @param sone
+ * The sone to unlock
+ */
+ 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.
*
@@ -566,24 +827,43 @@ public class Core implements IdentityListener {
final Sone sone;
try {
sone = getLocalSone(ownIdentity.getId()).setIdentity(ownIdentity).setInsertUri(new FreenetURI(ownIdentity.getInsertUri())).setRequestUri(new FreenetURI(ownIdentity.getRequestUri()));
- sone.setLatestEdition(Numbers.safeParseLong(ownIdentity.getProperty("Sone.LatestEdition"), (long) 0));
} catch (MalformedURLException mue1) {
logger.log(Level.SEVERE, "Could not convert the Identityâs URIs to Freenet URIs: " + 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()));
/* TODO - load posts ân stuff */
localSones.put(ownIdentity.getId(), sone);
- SoneInserter soneInserter = new SoneInserter(this, freenetInterface, sone);
+ final SoneInserter soneInserter = new SoneInserter(this, freenetInterface, sone);
soneInserters.put(sone, soneInserter);
- soneInserter.start();
setSoneStatus(sone, SoneStatus.idle);
loadSone(sone);
+ if (!isSoneRescueMode()) {
+ soneInserter.start();
+ }
new Thread(new Runnable() {
@Override
@SuppressWarnings("synthetic-access")
public void run() {
- soneDownloader.fetchSone(sone);
+ if (!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) && 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();
@@ -599,12 +879,13 @@ public class Core implements IdentityListener {
* @return The created Sone
*/
public Sone createSone(OwnIdentity ownIdentity) {
- identityManager.addContext(ownIdentity, "Sone");
- Sone sone = addLocalSone(ownIdentity);
- synchronized (sone) {
- /* mark as modified so that it gets inserted immediately. */
- sone.setModificationCounter(sone.getModificationCounter() + 1);
+ try {
+ ownIdentity.addContext("Sone");
+ } catch (WebOfTrustException wote1) {
+ logger.log(Level.SEVERE, "Could not add âSoneâ context to own identity: " + ownIdentity, wote1);
+ return null;
}
+ Sone sone = addLocalSone(ownIdentity);
return sone;
}
@@ -627,7 +908,13 @@ public class Core implements IdentityListener {
sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0));
if (newSone) {
synchronized (newSones) {
- newSones.add(sone.getId());
+ newSone = !knownSones.contains(sone.getId());
+ if (newSone) {
+ newSones.add(sone.getId());
+ }
+ }
+ if (newSone) {
+ coreListenerManager.fireNewSoneFound(sone);
}
}
remoteSones.put(identity.getId(), sone);
@@ -647,6 +934,97 @@ public class Core implements IdentityListener {
}
/**
+ * 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, "Tried to get trust from remote Sone: %s", origin);
+ return null;
+ }
+ return target.getIdentity().getTrust((OwnIdentity) origin.getIdentity());
+ }
+
+ /**
+ * 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) {
+ 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, options.getStringOption("TrustComment").get());
+ } catch (WebOfTrustException wote1) {
+ logger.log(Level.WARNING, "Could not set trust for Sone: " + target, wote1);
+ }
+ }
+
+ /**
+ * 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) {
+ 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);
+ }
+ }
+
+ /**
+ * 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, options.getIntegerOption("PositiveTrust").get());
+ }
+
+ /**
+ * 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, options.getIntegerOption("NegativeTrust").get());
+ }
+
+ /**
+ * 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 stores Sone with the given Sone.
*
* @param sone
@@ -654,46 +1032,78 @@ public class Core implements IdentityListener {
*/
public void updateSone(Sone sone) {
if (hasSone(sone.getId())) {
+ boolean soneRescueMode = isLocalSone(sone) && isSoneRescueMode();
Sone storedSone = getSone(sone.getId());
- if (!(sone.getTime() > storedSone.getTime())) {
+ if (!soneRescueMode && !(sone.getTime() > storedSone.getTime())) {
logger.log(Level.FINE, "Downloaded Sone %s is not newer than stored Sone %s.", new Object[] { sone, storedSone });
return;
}
synchronized (posts) {
- for (Post post : storedSone.getPosts()) {
- posts.remove(post.getId());
+ if (!soneRescueMode) {
+ for (Post post : storedSone.getPosts()) {
+ posts.remove(post.getId());
+ if (!sone.getPosts().contains(post)) {
+ coreListenerManager.firePostRemoved(post);
+ }
+ }
}
synchronized (newPosts) {
for (Post post : sone.getPosts()) {
- if (!storedSone.getPosts().contains(post) && !knownSones.contains(post.getId())) {
+ post.setSone(getSone(post.getSone().getId()));
+ if (!storedSone.getPosts().contains(post) && !knownPosts.contains(post.getId())) {
newPosts.add(post.getId());
+ coreListenerManager.fireNewPostFound(post);
}
posts.put(post.getId(), post);
}
}
}
synchronized (replies) {
- for (Reply reply : storedSone.getReplies()) {
- replies.remove(reply.getId());
+ if (!soneRescueMode) {
+ for (Reply reply : storedSone.getReplies()) {
+ replies.remove(reply.getId());
+ if (!sone.getReplies().contains(reply)) {
+ coreListenerManager.fireReplyRemoved(reply);
+ }
+ }
}
synchronized (newReplies) {
for (Reply reply : sone.getReplies()) {
- if (!storedSone.getReplies().contains(reply) && !knownSones.contains(reply.getId())) {
+ reply.setSone(getSone(reply.getSone().getId()));
+ if (!storedSone.getReplies().contains(reply) && !knownReplies.contains(reply.getId())) {
newReplies.add(reply.getId());
+ coreListenerManager.fireNewReplyFound(reply);
}
replies.put(reply.getId(), reply);
}
}
}
synchronized (storedSone) {
- storedSone.setTime(sone.getTime());
+ if (!soneRescueMode || (sone.getTime() > storedSone.getTime())) {
+ storedSone.setTime(sone.getTime());
+ }
+ storedSone.setClient(sone.getClient());
storedSone.setProfile(sone.getProfile());
- storedSone.setPosts(sone.getPosts());
- storedSone.setReplies(sone.getReplies());
- storedSone.setLikePostIds(sone.getLikedPostIds());
- storedSone.setLikeReplyIds(sone.getLikedReplyIds());
- storedSone.setLatestEdition(sone.getRequestUri().getEdition());
- storedSone.setModificationCounter(0);
+ 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());
+ }
+ storedSone.setLatestEdition(sone.getLatestEdition());
}
}
}
@@ -719,8 +1129,12 @@ public class Core implements IdentityListener {
localSones.remove(sone.getId());
soneInserters.remove(sone).stop();
}
- identityManager.removeContext((OwnIdentity) sone.getIdentity(), "Sone");
- identityManager.removeProperty((OwnIdentity) sone.getIdentity(), "Sone.LatestEdition");
+ 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);
+ }
try {
configuration.getLongValue("Sone/" + sone.getId() + "/Time").setValue(null);
} catch (ConfigurationException ce1) {
@@ -729,6 +1143,23 @@ public class Core implements IdentityListener {
}
/**
+ * Marks the given Sone as known. If the Sone was {@link #isNewPost(String)
+ * new} before, a {@link CoreListener#markSoneKnown(Sone)} event is fired.
+ *
+ * @param sone
+ * The Sone to mark as known
+ */
+ public void markSoneKnown(Sone sone) {
+ synchronized (newSones) {
+ if (newSones.remove(sone.getId())) {
+ knownSones.add(sone.getId());
+ coreListenerManager.fireMarkSoneKnown(sone);
+ saveConfiguration();
+ }
+ }
+ }
+
+ /**
* Loads and updates the given Sone from the configuration. If any error is
* encountered, loading is aborted and the given Sone is not changed.
*
@@ -748,7 +1179,7 @@ public class Core implements IdentityListener {
logger.log(Level.INFO, "Could not load Sone because no Sone has been saved.");
return;
}
- long soneModificationCounter = configuration.getLongValue(sonePrefix + "/ModificationCounter").getValue((long) 0);
+ String lastInsertFingerprint = configuration.getStringValue(sonePrefix + "/LastInsertFingerprint").getValue("");
/* load profile. */
Profile profile = new Profile();
@@ -759,6 +1190,17 @@ public class Core implements IdentityListener {
profile.setBirthMonth(configuration.getIntValue(sonePrefix + "/Profile/BirthMonth").getValue(null));
profile.setBirthYear(configuration.getIntValue(sonePrefix + "/Profile/BirthYear").getValue(null));
+ /* load profile fields. */
+ while (true) {
+ String fieldPrefix = sonePrefix + "/Profile/Fields/" + profile.getFields().size();
+ String fieldName = configuration.getStringValue(fieldPrefix + "/Name").getValue(null);
+ if (fieldName == null) {
+ break;
+ }
+ String fieldValue = configuration.getStringValue(fieldPrefix + "/Value").getValue("");
+ profile.addField(fieldName).setValue(fieldValue);
+ }
+
/* load posts. */
Set posts = new HashSet();
while (true) {
@@ -767,13 +1209,18 @@ public class Core implements IdentityListener {
if (postId == null) {
break;
}
+ String postRecipientId = configuration.getStringValue(postPrefix + "/Recipient").getValue(null);
long postTime = configuration.getLongValue(postPrefix + "/Time").getValue((long) 0);
String postText = configuration.getStringValue(postPrefix + "/Text").getValue(null);
if ((postTime == 0) || (postText == null)) {
logger.log(Level.WARNING, "Invalid post found, aborting load!");
return;
}
- posts.add(getPost(postId).setSone(sone).setTime(postTime).setText(postText));
+ Post post = getPost(postId).setSone(sone).setTime(postTime).setText(postText);
+ if ((postRecipientId != null) && (postRecipientId.length() == 43)) {
+ post.setRecipient(getSone(postRecipientId));
+ }
+ posts.add(post);
}
/* load replies. */
@@ -833,7 +1280,7 @@ public class Core implements IdentityListener {
sone.setLikePostIds(likedPostIds);
sone.setLikeReplyIds(likedReplyIds);
sone.setFriends(friends);
- sone.setModificationCounter(soneModificationCounter);
+ soneInserters.get(sone).setLastInsertFingerprint(lastInsertFingerprint);
}
synchronized (newSones) {
for (String friend : friends) {
@@ -859,7 +1306,7 @@ public class Core implements IdentityListener {
* @param sone
* The Sone to save
*/
- public void saveSone(Sone sone) {
+ public synchronized void saveSone(Sone sone) {
if (!isLocalSone(sone)) {
logger.log(Level.FINE, "Tried to save non-local Sone: %s", sone);
return;
@@ -870,12 +1317,13 @@ public class Core implements IdentityListener {
}
logger.log(Level.INFO, "Saving Sone: %s", sone);
- identityManager.setProperty((OwnIdentity) sone.getIdentity(), "Sone.LatestEdition", String.valueOf(sone.getLatestEdition()));
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.getLongValue(sonePrefix + "/ModificationCounter").setValue(sone.getModificationCounter());
+ configuration.getStringValue(sonePrefix + "/LastInsertFingerprint").setValue(soneInserters.get(sone).getLastInsertFingerprint());
/* save profile. */
Profile profile = sone.getProfile();
@@ -886,11 +1334,21 @@ public class Core implements IdentityListener {
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());
}
@@ -928,9 +1386,12 @@ public class Core implements IdentityListener {
}
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);
}
}
@@ -941,9 +1402,10 @@ public class Core implements IdentityListener {
* The Sone that creates the post
* @param text
* The text of the post
+ * @return The created post
*/
- public void createPost(Sone sone, String text) {
- createPost(sone, System.currentTimeMillis(), text);
+ public Post createPost(Sone sone, String text) {
+ return createPost(sone, System.currentTimeMillis(), text);
}
/**
@@ -955,13 +1417,51 @@ public class Core implements IdentityListener {
* The time of the post
* @param text
* The text of the post
+ * @return The created post
*/
- public void createPost(Sone sone, long time, String text) {
+ public Post createPost(Sone sone, long time, String text) {
+ return createPost(sone, null, time, text);
+ }
+
+ /**
+ * Creates a new post.
+ *
+ * @param sone
+ * The Sone that creates the post
+ * @param recipient
+ * The recipient Sone, or {@code null} if this post does not have
+ * a recipient
+ * @param text
+ * The text of the post
+ * @return The created post
+ */
+ public Post createPost(Sone sone, Sone recipient, String text) {
+ return createPost(sone, recipient, System.currentTimeMillis(), text);
+ }
+
+ /**
+ * Creates a new post.
+ *
+ * @param sone
+ * The Sone that creates the post
+ * @param recipient
+ * The recipient Sone, or {@code null} if this post does not have
+ * a recipient
+ * @param time
+ * The time of the post
+ * @param text
+ * 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);
- return;
+ return null;
}
Post post = new Post(sone, time, text);
+ if (recipient != null) {
+ post.setRecipient(recipient);
+ }
synchronized (posts) {
posts.put(post.getId(), post);
}
@@ -970,6 +1470,7 @@ public class Core implements IdentityListener {
}
sone.addPost(post);
saveSone(sone);
+ return post;
}
/**
@@ -991,6 +1492,23 @@ public class Core implements IdentityListener {
}
/**
+ * Marks the given post as known, if it is currently a new post (according
+ * to {@link #isNewPost(String)}).
+ *
+ * @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();
+ }
+ }
+ }
+
+ /**
* Creates a new reply.
*
* @param sone
@@ -999,9 +1517,10 @@ public class Core implements IdentityListener {
* The post that this reply refers to
* @param text
* The text of the reply
+ * @return The created reply
*/
- public void createReply(Sone sone, Post post, String text) {
- createReply(sone, post, System.currentTimeMillis(), text);
+ public Reply createReply(Sone sone, Post post, String text) {
+ return createReply(sone, post, System.currentTimeMillis(), text);
}
/**
@@ -1015,11 +1534,12 @@ public class Core implements IdentityListener {
* The time of the reply
* @param text
* The text of the reply
+ * @return The created reply
*/
- public void createReply(Sone sone, Post post, long time, String text) {
+ 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);
- return;
+ return null;
}
Reply reply = new Reply(sone, post, System.currentTimeMillis(), text);
synchronized (replies) {
@@ -1030,6 +1550,7 @@ public class Core implements IdentityListener {
}
sone.addReply(reply);
saveSone(sone);
+ return reply;
}
/**
@@ -1052,10 +1573,29 @@ public class Core implements IdentityListener {
}
/**
+ * Marks the given reply as known, if it is currently a new reply (according
+ * to {@link #isNewReply(String)}).
+ *
+ * @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();
+ }
+ }
+ }
+
+ /**
* Starts the core.
*/
public void start() {
loadConfiguration();
+ updateChecker.addUpdateListener(this);
+ updateChecker.start();
}
/**
@@ -1067,7 +1607,73 @@ public class Core implements IdentityListener {
soneInserter.stop();
}
}
+ updateChecker.stop();
+ updateChecker.removeUpdateListener(this);
+ soneDownloader.stop();
saveConfiguration();
+ stopped = true;
+ }
+
+ /**
+ * Saves the current options.
+ */
+ public void saveConfiguration() {
+ synchronized (configuration) {
+ if (storingConfiguration) {
+ logger.log(Level.FINE, "Already storing configurationâ¦");
+ return;
+ }
+ storingConfiguration = true;
+ }
+
+ /* store the options first. */
+ try {
+ configuration.getIntValue("Option/ConfigurationVersion").setValue(0);
+ configuration.getIntValue("Option/InsertionDelay").setValue(options.getIntegerOption("InsertionDelay").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());
+
+ /* save known Sones. */
+ int soneCounter = 0;
+ synchronized (newSones) {
+ 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);
+ }
+ configuration.getStringValue("KnownPosts/" + postCounter + "/ID").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);
+ }
+
+ /* now save it. */
+ configuration.save();
+
+ } catch (ConfigurationException ce1) {
+ logger.log(Level.SEVERE, "Could not store configuration!", ce1);
+ } finally {
+ synchronized (configuration) {
+ storingConfiguration = false;
+ }
+ }
}
//
@@ -1088,6 +1694,10 @@ public class Core implements IdentityListener {
}
}));
+ options.addIntegerOption("PositiveTrust", new DefaultOption(75));
+ options.addIntegerOption("NegativeTrust", new DefaultOption(-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));
@@ -1103,6 +1713,10 @@ public class Core implements IdentityListener {
}
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.getStringOption("TrustComment").set(configuration.getStringValue("Option/TrustComment").getValue(null));
+ options.getBooleanOption("SoneRescueMode").set(configuration.getBooleanValue("Option/SoneRescueMode").getValue(null));
/* load known Sones. */
int soneCounter = 0;
@@ -1143,48 +1757,6 @@ public class Core implements IdentityListener {
}
/**
- * Saves the current options.
- */
- private void saveConfiguration() {
- /* store the options first. */
- try {
- configuration.getIntValue("Option/InsertionDelay").setValue(options.getIntegerOption("InsertionDelay").getReal());
- configuration.getBooleanValue("Option/ClearOnNextRestart").setValue(options.getBooleanOption("ClearOnNextRestart").getReal());
- configuration.getBooleanValue("Option/ReallyClearOnNextRestart").setValue(options.getBooleanOption("ReallyClearOnNextRestart").getReal());
-
- /* save known Sones. */
- int soneCounter = 0;
- synchronized (newSones) {
- 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);
- }
- configuration.getStringValue("KnownPosts/" + postCounter + "/ID").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);
- }
-
- } catch (ConfigurationException ce1) {
- logger.log(Level.SEVERE, "Could not store configuration!", ce1);
- }
- }
-
- /**
* Generate a Sone URI from the given URI and latest edition.
*
* @param uriString
@@ -1212,6 +1784,7 @@ public class Core implements IdentityListener {
public void ownIdentityAdded(OwnIdentity ownIdentity) {
logger.log(Level.FINEST, "Adding OwnIdentity: " + ownIdentity);
if (ownIdentity.hasContext("Sone")) {
+ trustedIdentities.put(ownIdentity, Collections.synchronizedSet(new HashSet()));
addLocalSone(ownIdentity);
}
}
@@ -1222,14 +1795,16 @@ public class Core implements IdentityListener {
@Override
public void ownIdentityRemoved(OwnIdentity ownIdentity) {
logger.log(Level.FINEST, "Removing OwnIdentity: " + ownIdentity);
+ trustedIdentities.remove(ownIdentity);
}
/**
* {@inheritDoc}
*/
@Override
- public void identityAdded(Identity identity) {
+ public void identityAdded(OwnIdentity ownIdentity, Identity identity) {
logger.log(Level.FINEST, "Adding Identity: " + identity);
+ trustedIdentities.get(ownIdentity).add(identity);
addRemoteSone(identity);
}
@@ -1237,13 +1812,14 @@ public class Core implements IdentityListener {
* {@inheritDoc}
*/
@Override
- public void identityUpdated(final Identity identity) {
+ public void identityUpdated(OwnIdentity ownIdentity, final Identity identity) {
new Thread(new Runnable() {
@Override
@SuppressWarnings("synthetic-access")
public void run() {
Sone sone = getRemoteSone(identity.getId());
+ sone.setIdentity(identity);
soneDownloader.fetchSone(sone);
}
}).start();
@@ -1253,8 +1829,20 @@ public class Core implements IdentityListener {
* {@inheritDoc}
*/
@Override
- public void identityRemoved(Identity identity) {
- /* TODO */
+ public void identityRemoved(OwnIdentity ownIdentity, Identity identity) {
+ trustedIdentities.get(ownIdentity).remove(identity);
+ }
+
+ //
+ // INTERFACE UpdateListener
+ //
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void updateFound(Version version, long releaseTime) {
+ coreListenerManager.fireUpdateFound(version, releaseTime);
}
}