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=f183b390636c8c4984e59a3c5d37ac2b4412aabb;hpb=07ca98b45465f7a442e695fbfb6f59100260f39b;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 f183b39..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 implements Fingerprintable {
+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 implements Fingerprintable {
 
 	};
 
+	/** 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);
 
@@ -99,6 +111,12 @@ public class Sone implements Fingerprintable {
 	/** The IDs of all liked replies. */
 	private final Set<String> likedReplyIds = Collections.synchronizedSet(new HashSet<String>());
 
+	/** 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.
 	 *
@@ -233,7 +251,7 @@ public class Sone implements Fingerprintable {
 	 */
 	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;
@@ -387,8 +405,10 @@ public class Sone implements Fingerprintable {
 	 * @return This Sone (for method chaining)
 	 */
 	public synchronized Sone setPosts(Collection<Post> posts) {
-		this.posts.clear();
-		this.posts.addAll(posts);
+		synchronized (this) {
+			this.posts.clear();
+			this.posts.addAll(posts);
+		}
 		return this;
 	}
 
@@ -580,6 +600,60 @@ public class Sone implements Fingerprintable {
 		return this;
 	}
 
+	/**
+	 * 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 options of this Sone
+	 */
+	public Options getOptions() {
+		return options;
+	}
+
 	//
 	// FINGERPRINTABLE METHODS
 	//
@@ -622,10 +696,55 @@ public class Sone implements Fingerprintable {
 		}
 		fingerprint.append(')');
 
+		fingerprint.append("Albums(");
+		for (Album album : albums) {
+			fingerprint.append(album.getFingerprint());
+		}
+		fingerprint.append(')');
+
 		return fingerprint.toString();
 	}
 
 	//
+	// STATIC METHODS
+	//
+
+	/**
+	 * 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 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}
+	 */
+	@Override
+	public int compareTo(Sone sone) {
+		return NICE_NAME_COMPARATOR.compare(this, sone);
+	}
+
+	//
 	// OBJECT METHODS
 	//