X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=2dd4bc14c8b3b70ca3f027c72323db8402fef00b;hb=58eeba9b521b0a0094ac90a37fd88811c6a27376;hp=4195484225b2719e08d32a209f5fe27ff7297a8e;hpb=5295218397ae3b97662bb49b9b9613b1ad3a4199;p=Sone.git
diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java
index 4195484..2dd4bc1 100644
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -27,8 +27,10 @@ import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
+import net.pterodactylus.sone.core.Options;
import net.pterodactylus.sone.freenet.wot.Identity;
import net.pterodactylus.sone.template.SoneAccessor;
+import net.pterodactylus.util.filter.Filter;
import net.pterodactylus.util.logging.Logging;
import freenet.keys.FreenetURI;
@@ -40,7 +42,7 @@ import freenet.keys.FreenetURI;
*
* @author David âBombeâ Roden
*/
-public class Sone {
+public class Sone implements Fingerprintable, Comparable {
/** comparator that sorts Sones by their nice name. */
public static final Comparator NICE_NAME_COMPARATOR = new Comparator() {
@@ -56,6 +58,15 @@ public class Sone {
};
+ /** Filter to remove Sones that have not been downloaded. */
+ public static final Filter EMPTY_SONE_FILTER = new Filter() {
+
+ @Override
+ public boolean filterObject(Sone sone) {
+ return sone.getTime() != 0;
+ }
+ };
+
/** The logger. */
private static final Logger logger = Logging.getLogger(Sone.class);
@@ -79,10 +90,13 @@ public class Sone {
private volatile long time;
/** The profile of this Sone. */
- private volatile Profile profile;
+ private volatile Profile profile = new Profile();
+
+ /** The client used by the Sone. */
+ private volatile Client client;
/** All friend Sones. */
- private final Set friendSones = Collections.synchronizedSet(new HashSet());
+ private final Set friendSones = Collections.synchronizedSet(new HashSet());
/** All posts. */
private final Set posts = Collections.synchronizedSet(new HashSet());
@@ -96,8 +110,8 @@ public class Sone {
/** The IDs of all liked replies. */
private final Set likedReplyIds = Collections.synchronizedSet(new HashSet());
- /** Modification count. */
- private volatile long modificationCounter = 0;
+ /** Sone-specific options. */
+ private final Options options = new Options();
/**
* Creates a new Sone.
@@ -164,7 +178,7 @@ public class Sone {
* @return The request URI of this Sone
*/
public FreenetURI getRequestUri() {
- return requestUri.setSuggestedEdition(latestEdition);
+ return (requestUri != null) ? requestUri.setSuggestedEdition(latestEdition) : null;
}
/**
@@ -176,7 +190,7 @@ public class Sone {
*/
public Sone setRequestUri(FreenetURI requestUri) {
if (this.requestUri == null) {
- this.requestUri = requestUri.setDocName("Sone").setMetaString(new String[0]);
+ this.requestUri = requestUri.setKeyType("USK").setDocName("Sone").setMetaString(new String[0]);
return this;
}
if (!this.requestUri.equalsKeypair(requestUri)) {
@@ -204,7 +218,7 @@ public class Sone {
*/
public Sone setInsertUri(FreenetURI insertUri) {
if (this.insertUri == null) {
- this.insertUri = insertUri.setDocName("Sone").setMetaString(new String[0]);
+ this.insertUri = insertUri.setKeyType("USK").setDocName("Sone").setMetaString(new String[0]);
return this;
}
if (!this.insertUri.equalsKeypair(insertUri)) {
@@ -267,7 +281,7 @@ public class Sone {
*
* @return A copy of the profile
*/
- public Profile getProfile() {
+ public synchronized Profile getProfile() {
return new Profile(profile);
}
@@ -281,7 +295,27 @@ public class Sone {
*/
public synchronized void setProfile(Profile profile) {
this.profile = new Profile(profile);
- modificationCounter++;
+ }
+
+ /**
+ * Returns the client used by this Sone.
+ *
+ * @return The client used by this Sone, or {@code null}
+ */
+ public Client getClient() {
+ return client;
+ }
+
+ /**
+ * Sets the client used by this Sone.
+ *
+ * @param client
+ * The client used by this Sone, or {@code null}
+ * @return This Sone (for method chaining)
+ */
+ public Sone setClient(Client client) {
+ this.client = client;
+ return this;
}
/**
@@ -289,9 +323,8 @@ public class Sone {
*
* @return The friend Sones of this Sone
*/
- public List getFriends() {
- List friends = new ArrayList(friendSones);
- Collections.sort(friends, NICE_NAME_COMPARATOR);
+ public List getFriends() {
+ List friends = new ArrayList(friendSones);
return friends;
}
@@ -302,7 +335,7 @@ public class Sone {
* The new (and only) friends of this Sone
* @return This Sone (for method chaining)
*/
- public Sone setFriends(Collection friends) {
+ public Sone setFriends(Collection friends) {
friendSones.clear();
friendSones.addAll(friends);
return this;
@@ -311,13 +344,13 @@ public class Sone {
/**
* Returns whether this Sone has the given Sone as a friend Sone.
*
- * @param friendSone
- * The friend Sone to check for
+ * @param friendSoneId
+ * The ID of the Sone to check for
* @return {@code true} if this Sone has the given Sone as a friend,
* {@code false} otherwise
*/
- public boolean hasFriend(Sone friendSone) {
- return friendSones.contains(friendSone);
+ public boolean hasFriend(String friendSoneId) {
+ return friendSones.contains(friendSoneId);
}
/**
@@ -327,8 +360,8 @@ public class Sone {
* The friend Sone to add
* @return This Sone (for method chaining)
*/
- public Sone addFriend(Sone friendSone) {
- if (!friendSone.equals(this)) {
+ public Sone addFriend(String friendSone) {
+ if (!friendSone.equals(id)) {
friendSones.add(friendSone);
}
return this;
@@ -337,12 +370,12 @@ public class Sone {
/**
* Removes the given Sone as a friend Sone.
*
- * @param friendSone
- * The friend Sone to remove
+ * @param friendSoneId
+ * The ID of the friend Sone to remove
* @return This Sone (for method chaining)
*/
- public Sone removeFriend(Sone friendSone) {
- friendSones.remove(friendSone);
+ public Sone removeFriend(String friendSoneId) {
+ friendSones.remove(friendSoneId);
return this;
}
@@ -368,9 +401,10 @@ public class Sone {
* @return This Sone (for method chaining)
*/
public synchronized Sone setPosts(Collection posts) {
- this.posts.clear();
- this.posts.addAll(posts);
- modificationCounter++;
+ synchronized (this) {
+ this.posts.clear();
+ this.posts.addAll(posts);
+ }
return this;
}
@@ -384,7 +418,6 @@ public class Sone {
public synchronized void addPost(Post post) {
if (post.getSone().equals(this) && posts.add(post)) {
logger.log(Level.FINEST, "Adding %s to â%sâ.", new Object[] { post, getName() });
- modificationCounter++;
}
}
@@ -395,8 +428,8 @@ public class Sone {
* The post to remove
*/
public synchronized void removePost(Post post) {
- if (post.getSone().equals(this) && posts.remove(post)) {
- modificationCounter++;
+ if (post.getSone().equals(this)) {
+ posts.remove(post);
}
}
@@ -419,7 +452,6 @@ public class Sone {
public synchronized Sone setReplies(Collection replies) {
this.replies.clear();
this.replies.addAll(replies);
- modificationCounter++;
return this;
}
@@ -431,8 +463,8 @@ public class Sone {
* The reply to add
*/
public synchronized void addReply(Reply reply) {
- if (reply.getSone().equals(this) && replies.add(reply)) {
- modificationCounter++;
+ if (reply.getSone().equals(this)) {
+ replies.add(reply);
}
}
@@ -443,8 +475,8 @@ public class Sone {
* The reply to remove
*/
public synchronized void removeReply(Reply reply) {
- if (reply.getSone().equals(this) && replies.remove(reply)) {
- modificationCounter++;
+ if (reply.getSone().equals(this)) {
+ replies.remove(reply);
}
}
@@ -467,7 +499,6 @@ public class Sone {
public synchronized Sone setLikePostIds(Set likedPostIds) {
this.likedPostIds.clear();
this.likedPostIds.addAll(likedPostIds);
- modificationCounter++;
return this;
}
@@ -491,9 +522,7 @@ public class Sone {
* @return This Sone (for method chaining)
*/
public synchronized Sone addLikedPostId(String postId) {
- if (likedPostIds.add(postId)) {
- modificationCounter++;
- }
+ likedPostIds.add(postId);
return this;
}
@@ -505,9 +534,7 @@ public class Sone {
* @return This Sone (for method chaining)
*/
public synchronized Sone removeLikedPostId(String postId) {
- if (likedPostIds.remove(postId)) {
- modificationCounter++;
- }
+ likedPostIds.remove(postId);
return this;
}
@@ -530,7 +557,6 @@ public class Sone {
public synchronized Sone setLikeReplyIds(Set likedReplyIds) {
this.likedReplyIds.clear();
this.likedReplyIds.addAll(likedReplyIds);
- modificationCounter++;
return this;
}
@@ -554,9 +580,7 @@ public class Sone {
* @return This Sone (for method chaining)
*/
public synchronized Sone addLikedReplyId(String replyId) {
- if (likedReplyIds.add(replyId)) {
- modificationCounter++;
- }
+ likedReplyIds.add(replyId);
return this;
}
@@ -568,29 +592,74 @@ public class Sone {
* @return This Sone (for method chaining)
*/
public synchronized Sone removeLikedReplyId(String replyId) {
- if (likedReplyIds.remove(replyId)) {
- modificationCounter++;
- }
+ likedReplyIds.remove(replyId);
return this;
}
/**
- * Returns the modification counter.
+ * Returns Sone-specific options.
*
- * @return The modification counter
+ * @return The options of this Sone
*/
- public synchronized long getModificationCounter() {
- return modificationCounter;
+ public Options getOptions() {
+ return options;
}
+ //
+ // FINGERPRINTABLE METHODS
+ //
+
/**
- * Sets the modification counter.
- *
- * @param modificationCounter
- * The new modification counter
+ * {@inheritDoc}
*/
- public synchronized void setModificationCounter(long modificationCounter) {
- this.modificationCounter = modificationCounter;
+ @Override
+ public synchronized String getFingerprint() {
+ StringBuilder fingerprint = new StringBuilder();
+ fingerprint.append(profile.getFingerprint());
+
+ fingerprint.append("Posts(");
+ for (Post post : getPosts()) {
+ fingerprint.append("Post(").append(post.getId()).append(')');
+ }
+ fingerprint.append(")");
+
+ List replies = new ArrayList(getReplies());
+ Collections.sort(replies, Reply.TIME_COMPARATOR);
+ fingerprint.append("Replies(");
+ for (Reply reply : replies) {
+ fingerprint.append("Reply(").append(reply.getId()).append(')');
+ }
+ fingerprint.append(')');
+
+ List likedPostIds = new ArrayList(getLikedPostIds());
+ Collections.sort(likedPostIds);
+ fingerprint.append("LikedPosts(");
+ for (String likedPostId : likedPostIds) {
+ fingerprint.append("Post(").append(likedPostId).append(')');
+ }
+ fingerprint.append(')');
+
+ List likedReplyIds = new ArrayList(getLikedReplyIds());
+ Collections.sort(likedReplyIds);
+ fingerprint.append("LikedReplies(");
+ for (String likedReplyId : likedReplyIds) {
+ fingerprint.append("Reply(").append(likedReplyId).append(')');
+ }
+ fingerprint.append(')');
+
+ return fingerprint.toString();
+ }
+
+ //
+ // INTERFACE Comparable
+ //
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public int compareTo(Sone sone) {
+ return NICE_NAME_COMPARATOR.compare(this, sone);
}
//
@@ -621,7 +690,7 @@ public class Sone {
*/
@Override
public String toString() {
- return getClass().getName() + "[identity=" + identity + ",requestUri=" + requestUri + ",insertUri=" + insertUri + ",friends(" + friendSones.size() + "),posts(" + posts.size() + "),replies(" + replies.size() + ")]";
+ return getClass().getName() + "[identity=" + identity + ",requestUri=" + requestUri + ",insertUri(" + String.valueOf(insertUri).length() + "),friends(" + friendSones.size() + "),posts(" + posts.size() + "),replies(" + replies.size() + ")]";
}
}