X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FSone.java;h=3aa604e24160a3ff04863f4247f5b440169b7878;hb=67ebd4f4ece65f6e3c32ceaed755fe79323b8be9;hp=b14c28f3620a6ecc002a9c31b8717002df31191e;hpb=6f1e7806171eb6af95c8669f2ac0801e34b9246a;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 b14c28f..3aa604e 100644
--- a/src/main/java/net/pterodactylus/sone/data/Sone.java
+++ b/src/main/java/net/pterodactylus/sone/data/Sone.java
@@ -27,9 +27,12 @@ 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 net.pterodactylus.util.validation.Validation;
 import freenet.keys.FreenetURI;
 
 /**
@@ -40,7 +43,7 @@ import freenet.keys.FreenetURI;
  *
  * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
  */
-public class Sone {
+public class Sone implements Fingerprintable, Comparable<Sone> {
 
 	/** comparator that sorts Sones by their nice name. */
 	public static final Comparator<Sone> NICE_NAME_COMPARATOR = new Comparator<Sone>() {
@@ -56,6 +59,15 @@ public class Sone {
 
 	};
 
+	/** Filter to remove Sones that have not been downloaded. */
+	public static final Filter<Sone> EMPTY_SONE_FILTER = new Filter<Sone>() {
+
+		@Override
+		public boolean filterObject(Sone sone) {
+			return sone.getTime() != 0;
+		}
+	};
+
 	/** The logger. */
 	private static final Logger logger = Logging.getLogger(Sone.class);
 
@@ -79,7 +91,10 @@ 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<String> friendSones = Collections.synchronizedSet(new HashSet<String>());
@@ -96,8 +111,11 @@ public class Sone {
 	/** The IDs of all liked replies. */
 	private final Set<String> likedReplyIds = Collections.synchronizedSet(new HashSet<String>());
 
-	/** Modification count. */
-	private volatile long modificationCounter = 0;
+	/** The albums of this Sone. */
+	private final List<Album> albums = Collections.synchronizedList(new ArrayList<Album>());
+
+	/** Sone-specific options. */
+	private final Options options = new Options();
 
 	/**
 	 * Creates a new Sone.
@@ -176,7 +194,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 +222,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)) {
@@ -233,7 +251,7 @@ public class Sone {
 	 */
 	public void setLatestEdition(long latestEdition) {
 		if (!(latestEdition > this.latestEdition)) {
-			logger.log(Level.INFO, "New latest edition %d is not greater than current latest edition %d!", new Object[] { latestEdition, this.latestEdition });
+			logger.log(Level.FINE, "New latest edition %d is not greater than current latest edition %d!", new Object[] { latestEdition, this.latestEdition });
 			return;
 		}
 		this.latestEdition = latestEdition;
@@ -267,7 +285,7 @@ public class Sone {
 	 *
 	 * @return A copy of the profile
 	 */
-	public Profile getProfile() {
+	public synchronized Profile getProfile() {
 		return new Profile(profile);
 	}
 
@@ -281,7 +299,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;
 	}
 
 	/**
@@ -367,9 +405,10 @@ public class Sone {
 	 * @return This Sone (for method chaining)
 	 */
 	public synchronized Sone setPosts(Collection<Post> posts) {
-		this.posts.clear();
-		this.posts.addAll(posts);
-		modificationCounter++;
+		synchronized (this) {
+			this.posts.clear();
+			this.posts.addAll(posts);
+		}
 		return this;
 	}
 
@@ -383,7 +422,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++;
 		}
 	}
 
@@ -394,8 +432,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);
 		}
 	}
 
@@ -418,7 +456,6 @@ public class Sone {
 	public synchronized Sone setReplies(Collection<Reply> replies) {
 		this.replies.clear();
 		this.replies.addAll(replies);
-		modificationCounter++;
 		return this;
 	}
 
@@ -430,8 +467,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);
 		}
 	}
 
@@ -442,8 +479,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);
 		}
 	}
 
@@ -466,7 +503,6 @@ public class Sone {
 	public synchronized Sone setLikePostIds(Set<String> likedPostIds) {
 		this.likedPostIds.clear();
 		this.likedPostIds.addAll(likedPostIds);
-		modificationCounter++;
 		return this;
 	}
 
@@ -490,9 +526,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;
 	}
 
@@ -504,9 +538,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;
 	}
 
@@ -529,7 +561,6 @@ public class Sone {
 	public synchronized Sone setLikeReplyIds(Set<String> likedReplyIds) {
 		this.likedReplyIds.clear();
 		this.likedReplyIds.addAll(likedReplyIds);
-		modificationCounter++;
 		return this;
 	}
 
@@ -553,9 +584,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;
 	}
 
@@ -567,29 +596,152 @@ 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 the albums of this Sone.
+	 *
+	 * @return The albums of this Sone
+	 */
+	public List<Album> getAlbums() {
+		return Collections.unmodifiableList(albums);
+	}
+
+	/**
+	 * Adds an album to this Sone.
+	 *
+	 * @param album
+	 *            The album to add
+	 */
+	public synchronized void addAlbum(Album album) {
+		Validation.begin().isNotNull("Album", album).check().isEqual("Album Owner", album.getSone(), this).check();
+		albums.add(album);
+	}
+
+	/**
+	 * Sets the albums of this Sone.
+	 *
+	 * @param albums
+	 *            The albums of this Sone
+	 */
+	public synchronized void setAlbums(Collection<? extends Album> albums) {
+		Validation.begin().isNotNull("Albums", albums).check();
+		this.albums.clear();
+		for (Album album : albums) {
+			addAlbum(album);
+		}
+	}
+
+	/**
+	 * Removes an album from this Sone.
+	 *
+	 * @param album
+	 *            The album to remove
+	 */
+	public synchronized void removeAlbum(Album album) {
+		Validation.begin().isNotNull("Album", album).check().isEqual("Album Owner", album.getSone(), this).check();
+		albums.remove(album);
+	}
+
+	/**
+	 * Returns Sone-specific options.
 	 *
-	 * @return The modification counter
+	 * @return The options of this Sone
+	 */
+	public Options getOptions() {
+		return options;
+	}
+
+	//
+	// FINGERPRINTABLE METHODS
+	//
+
+	/**
+	 * {@inheritDoc}
 	 */
-	public synchronized long getModificationCounter() {
-		return 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<Reply> replies = new ArrayList<Reply>(getReplies());
+		Collections.sort(replies, Reply.TIME_COMPARATOR);
+		fingerprint.append("Replies(");
+		for (Reply reply : replies) {
+			fingerprint.append("Reply(").append(reply.getId()).append(')');
+		}
+		fingerprint.append(')');
+
+		List<String> likedPostIds = new ArrayList<String>(getLikedPostIds());
+		Collections.sort(likedPostIds);
+		fingerprint.append("LikedPosts(");
+		for (String likedPostId : likedPostIds) {
+			fingerprint.append("Post(").append(likedPostId).append(')');
+		}
+		fingerprint.append(')');
+
+		List<String> likedReplyIds = new ArrayList<String>(getLikedReplyIds());
+		Collections.sort(likedReplyIds);
+		fingerprint.append("LikedReplies(");
+		for (String likedReplyId : likedReplyIds) {
+			fingerprint.append("Reply(").append(likedReplyId).append(')');
+		}
+		fingerprint.append(')');
+
+		fingerprint.append("Albums(");
+		for (Album album : albums) {
+			fingerprint.append(album.getFingerprint());
+		}
+		fingerprint.append(')');
+
+		return fingerprint.toString();
 	}
 
+	//
+	// STATIC METHODS
+	//
+
 	/**
-	 * Sets the modification counter.
+	 * Flattens the given top-level albums so that the resulting list contains
+	 * parent albums before child albums and the resulting list can be parsed in
+	 * a single pass.
 	 *
-	 * @param modificationCounter
-	 *            The new modification counter
+	 * @param albums
+	 *            The albums to flatten
+	 * @return The flattened albums
+	 */
+	public static List<Album> flattenAlbums(Collection<? extends Album> albums) {
+		List<Album> flatAlbums = new ArrayList<Album>();
+		flatAlbums.addAll(albums);
+		int lastAlbumIndex = 0;
+		while (lastAlbumIndex < flatAlbums.size()) {
+			int previousAlbumCount = flatAlbums.size();
+			for (Album album : new ArrayList<Album>(flatAlbums.subList(lastAlbumIndex, flatAlbums.size()))) {
+				flatAlbums.addAll(album.getAlbums());
+			}
+			lastAlbumIndex = previousAlbumCount;
+		}
+		return flatAlbums;
+	}
+
+	//
+	// INTERFACE Comparable<Sone>
+	//
+
+	/**
+	 * {@inheritDoc}
 	 */
-	public synchronized void setModificationCounter(long modificationCounter) {
-		this.modificationCounter = modificationCounter;
+	@Override
+	public int compareTo(Sone sone) {
+		return NICE_NAME_COMPARATOR.compare(this, sone);
 	}
 
 	//