X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=34be38968430486471c0fc666346b7a8f65353c2;hb=b80d07048956c0df95eb0c90cb330925a265607f;hp=ea76a7293f17a4583e5ce9da5014f0a561f3a20e;hpb=57a3d27b6434ca1c426284358d1f69f5687802be;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 ea76a72..34be389 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -106,6 +106,9 @@ public class Core implements IdentityListener {
 	/* synchronize access on this on itself. */
 	private Map<String, Sone> remoteSones = new HashMap<String, Sone>();
 
+	/** All new Sones. */
+	private Set<Sone> newSones = new HashSet<Sone>();
+
 	/** All posts. */
 	private Map<String, Post> posts = new HashMap<String, Post>();
 
@@ -306,6 +309,35 @@ public class Core implements IdentityListener {
 	}
 
 	/**
+	 * Returns whether the Sone with the given ID is a remote Sone.
+	 *
+	 * @param id
+	 *            The ID of the Sone to check
+	 * @return {@code true} if the Sone with the given ID is a remote Sone,
+	 *         {@code false} otherwise
+	 */
+	public boolean isRemoteSone(String id) {
+		synchronized (remoteSones) {
+			return remoteSones.containsKey(id);
+		}
+	}
+
+	/**
+	 * 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}.
+	 *
+	 * @param sone
+	 *            The sone to check for
+	 * @return {@code true} if the given Sone is new, false otherwise
+	 */
+	public boolean isNewSone(Sone sone) {
+		synchronized (newSones) {
+			return newSones.remove(sone);
+		}
+	}
+
+	/**
 	 * Returns the post with the given ID.
 	 *
 	 * @param postId
@@ -451,6 +483,15 @@ public class Core implements IdentityListener {
 			soneInserter.start();
 			setSoneStatus(sone, SoneStatus.idle);
 			loadSone(sone);
+			new Thread(new Runnable() {
+
+				@Override
+				@SuppressWarnings("synthetic-access")
+				public void run() {
+					soneDownloader.fetchSone(sone);
+				}
+
+			}, "Sone Downloader").start();
 			return sone;
 		}
 	}
@@ -485,10 +526,19 @@ public class Core implements IdentityListener {
 			return null;
 		}
 		synchronized (remoteSones) {
+			boolean newSone = !isRemoteSone(identity.getId());
 			final Sone sone = getRemoteSone(identity.getId()).setIdentity(identity);
-			sone.setRequestUri(getSoneUri(identity.getRequestUri(), identity.getProperty("Sone.LatestEdition")));
+			newSone &= sone.getRequestUri() == null;
+			sone.setRequestUri(getSoneUri(identity.getRequestUri()));
+			sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0));
+			if (newSone) {
+				synchronized (newSones) {
+					newSones.add(sone);
+				}
+			}
 			remoteSones.put(identity.getId(), sone);
 			soneDownloader.addSone(sone);
+			setSoneStatus(sone, SoneStatus.unknown);
 			new Thread(new Runnable() {
 
 				@Override
@@ -498,7 +548,6 @@ public class Core implements IdentityListener {
 				}
 
 			}, "Sone Downloader").start();
-			setSoneStatus(sone, SoneStatus.idle);
 			return sone;
 		}
 	}
@@ -540,8 +589,8 @@ public class Core implements IdentityListener {
 				storedSone.setLikePostIds(sone.getLikedPostIds());
 				storedSone.setLikeReplyIds(sone.getLikedReplyIds());
 				storedSone.setLatestEdition(sone.getRequestUri().getEdition());
+				storedSone.setModificationCounter(0);
 			}
-			saveSone(storedSone);
 		}
 	}
 
@@ -568,6 +617,11 @@ public class Core implements IdentityListener {
 		}
 		identityManager.removeContext((OwnIdentity) sone.getIdentity(), "Sone");
 		identityManager.removeProperty((OwnIdentity) sone.getIdentity(), "Sone.LatestEdition");
+		try {
+			configuration.getLongValue("Sone/" + sone.getId() + "/Time").setValue(null);
+		} catch (ConfigurationException ce1) {
+			logger.log(Level.WARNING, "Could not remove Sone from configuration!", ce1);
+		}
 	}
 
 	/**
@@ -585,7 +639,11 @@ public class Core implements IdentityListener {
 
 		/* load Sone. */
 		String sonePrefix = "Sone/" + sone.getId();
-		long soneTime = configuration.getLongValue(sonePrefix + "/Time").getValue((long) 0);
+		Long soneTime = configuration.getLongValue(sonePrefix + "/Time").getValue(null);
+		if (soneTime == null) {
+			logger.log(Level.INFO, "Could not load Sone because no Sone has been saved.");
+			return;
+		}
 		long soneModificationCounter = configuration.getLongValue(sonePrefix + "/ModificationCounter").getValue((long) 0);
 
 		/* load profile. */
@@ -948,13 +1006,11 @@ public class Core implements IdentityListener {
 	 *
 	 * @param uriString
 	 *            The URI to derive the Sone URI from
-	 * @param latestEditionString
-	 *            The latest edition as a {@link String}, or {@code null}
 	 * @return The derived URI
 	 */
-	private FreenetURI getSoneUri(String uriString, String latestEditionString) {
+	private FreenetURI getSoneUri(String uriString) {
 		try {
-			FreenetURI uri = new FreenetURI(uriString).setDocName("Sone").setMetaString(new String[0]).setSuggestedEdition(Numbers.safeParseLong(latestEditionString, (long) 0));
+			FreenetURI uri = new FreenetURI(uriString).setDocName("Sone").setMetaString(new String[0]);
 			return uri;
 		} catch (MalformedURLException mue1) {
 			logger.log(Level.WARNING, "Could not create Sone URI from URI: " + uriString, mue1);
@@ -982,7 +1038,7 @@ public class Core implements IdentityListener {
 	 */
 	@Override
 	public void ownIdentityRemoved(OwnIdentity ownIdentity) {
-		/* TODO */
+		logger.log(Level.FINEST, "Removing OwnIdentity: " + ownIdentity);
 	}
 
 	/**
@@ -998,8 +1054,16 @@ public class Core implements IdentityListener {
 	 * {@inheritDoc}
 	 */
 	@Override
-	public void identityUpdated(Identity identity) {
-		/* TODO */
+	public void identityUpdated(final Identity identity) {
+		new Thread(new Runnable() {
+
+			@Override
+			@SuppressWarnings("synthetic-access")
+			public void run() {
+				Sone sone = getRemoteSone(identity.getId());
+				soneDownloader.fetchSone(sone);
+			}
+		}).start();
 	}
 
 	/**