From: David ‘Bombe’ Roden Date: Fri, 29 Oct 2010 04:47:52 +0000 (+0200) Subject: Merge branch 'master' into next X-Git-Tag: 0.2-RC1~98 X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=commitdiff_plain;h=b29cf0908e6dfd2b55220a3a7e44200f2fe5b19e;hp=5441ddb67671b8708417d91804f01bde85fbde2c Merge branch 'master' into next --- diff --git a/pom.xml b/pom.xml index 4d37027..18b5594 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 net.pterodactylus sone - 0.1-RC1 + 0.1-RC2 net.pterodactylus diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java index accfa1e..99ebc6d 100644 --- a/src/main/java/net/pterodactylus/sone/core/Core.java +++ b/src/main/java/net/pterodactylus/sone/core/Core.java @@ -56,6 +56,16 @@ import freenet.keys.FreenetURI; */ public class Core extends AbstractService { + /** The default Sones. */ + private static final Set defaultSones = new HashSet(); + + static { + /* Sone of Sone. */ + defaultSones.add("USK@eRHt0ceFsHjRZ11j6dd68RSdIvfd8f9YjJLZ9lnhEyo,iJWjIWh6TkMZm1NY8qBranKTIuwsCPkVPG6T6c6ft-I,AQACAAE/Sone/3"); + /* Sone of Bombe. */ + defaultSones.add("USK@RuW~uAO35Ipne896-1OmaVJNPuYE4ZIB5oZ5ziaU57A,7rV3uiyztXBDt03DCoRiNwiGjgFCJuznM9Okc1opURU,AQACAAE/Sone/24"); + } + /** * Enumeration for the possible states of a {@link Sone}. * @@ -92,13 +102,13 @@ public class Core extends AbstractService { private SoneDownloader soneDownloader; /** The Sone blacklist. */ - private final Set blacklistedSones = new HashSet(); + private final Set blacklistedSones = Collections.synchronizedSet(new HashSet()); /** The local Sones. */ - private final Set localSones = new HashSet(); + private final Set localSones = Collections.synchronizedSet(new HashSet()); /** Sone inserters. */ - private final Map soneInserters = new HashMap(); + private final Map soneInserters = Collections.synchronizedMap(new HashMap()); /** The Sones’ statuses. */ private final Map soneStatuses = Collections.synchronizedMap(new HashMap()); @@ -106,13 +116,13 @@ public class Core extends AbstractService { /* various caches follow here. */ /** Cache for all known Sones. */ - private final Map soneCache = new HashMap(); + private final Map soneCache = Collections.synchronizedMap(new HashMap()); /** Cache for all known posts. */ - private final Map postCache = new HashMap(); + private final Map postCache = Collections.synchronizedMap(new HashMap()); /** Cache for all known replies. */ - private final Map replyCache = new HashMap(); + private final Map replyCache = Collections.synchronizedMap(new HashMap()); /** * Creates a new core. @@ -715,10 +725,9 @@ public class Core extends AbstractService { * Adds some default Sones. */ private void addDefaultSones() { - /* Sone’s Sone. */ - loadSone("USK@eRHt0ceFsHjRZ11j6dd68RSdIvfd8f9YjJLZ9lnhEyo,iJWjIWh6TkMZm1NY8qBranKTIuwsCPkVPG6T6c6ft-I,AQACAAE/Sone/0"); - /* Bombe’s Sone. */ - loadSone("USK@RuW~uAO35Ipne896-1OmaVJNPuYE4ZIB5oZ5ziaU57A,7rV3uiyztXBDt03DCoRiNwiGjgFCJuznM9Okc1opURU,AQACAAE/Sone/15"); + for (String soneUri : defaultSones) { + loadSone(soneUri); + } } /** diff --git a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java index 901019c..30ba69a 100644 --- a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java +++ b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java @@ -151,7 +151,7 @@ public class FreenetInterface { public void onFoundEdition(long edition, USK key, ObjectContainer objectContainer, ClientContext clientContext, boolean metadata, short codec, byte[] data, boolean newKnownGood, boolean newSlotToo) { logger.log(Level.FINE, "Found USK update for Sone “%s” at %s, new known good: %s, new slot too: %s.", new Object[] { sone, key, newKnownGood, newSlotToo }); if (newKnownGood) { - sone.updateUris(key.getURI()); + sone.updateUris(key.suggestedEdition); soneDownloader.fetchSone(sone); } } diff --git a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java index 94001a7..94f2b63 100644 --- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java +++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java @@ -257,9 +257,10 @@ public class SoneDownloader extends AbstractService { } String soneInsertUri = soneXml.getValue("insert-uri", null); - if (soneInsertUri != null) { + if ((soneInsertUri != null) && (sone.getInsertUri() == null)) { try { sone.setInsertUri(new FreenetURI(soneInsertUri)); + sone.updateUris(Math.max(sone.getRequestUri().getSuggestedEdition(), sone.getInsertUri().getSuggestedEdition())); } catch (MalformedURLException mue1) { /* TODO - mark Sone as bad. */ logger.log(Level.WARNING, "Downloaded Sone " + sone + " has invalid insert URI: " + soneInsertUri, mue1); diff --git a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java index 89f1b5e..05e3600 100644 --- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java +++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java @@ -147,7 +147,7 @@ public class SoneInserter extends AbstractService { try { core.setSoneStatus(sone, SoneStatus.inserting); FreenetURI finalUri = freenetInterface.insertDirectory(insertInformation.getInsertUri().setKeyType("USK").setSuggestedEdition(0), insertInformation.generateManifestEntries(), "index.html"); - sone.updateUris(finalUri); + sone.updateUris(finalUri.getEdition()); success = true; logger.log(Level.INFO, "Inserted Sone “%s” at %s.", new Object[] { sone.getName(), finalUri }); } catch (SoneException se1) { diff --git a/src/main/java/net/pterodactylus/sone/data/Post.java b/src/main/java/net/pterodactylus/sone/data/Post.java index d0938c9..c30665a 100644 --- a/src/main/java/net/pterodactylus/sone/data/Post.java +++ b/src/main/java/net/pterodactylus/sone/data/Post.java @@ -31,13 +31,13 @@ public class Post { private final UUID id; /** The Sone this post belongs to. */ - private Sone sone; + private volatile Sone sone; /** The time of the post (in milliseconds since Jan 1, 1970 UTC). */ - private long time; + private volatile long time; /** The text of the post. */ - private String text; + private volatile String text; /** * Creates a new post. diff --git a/src/main/java/net/pterodactylus/sone/data/Profile.java b/src/main/java/net/pterodactylus/sone/data/Profile.java index 72901b3..7c29430 100644 --- a/src/main/java/net/pterodactylus/sone/data/Profile.java +++ b/src/main/java/net/pterodactylus/sone/data/Profile.java @@ -26,25 +26,25 @@ package net.pterodactylus.sone.data; public class Profile { /** Whether the profile was modified. */ - private boolean modified; + private volatile boolean modified; /** The first name. */ - private String firstName; + private volatile String firstName; /** The middle name(s). */ - private String middleName; + private volatile String middleName; /** The last name. */ - private String lastName; + private volatile String lastName; /** The day of the birth date. */ - private Integer birthDay; + private volatile Integer birthDay; /** The month of the birth date. */ - private Integer birthMonth; + private volatile Integer birthMonth; /** The year of the birth date. */ - private Integer birthYear; + private volatile Integer birthYear; /** * Creates a new empty profile. diff --git a/src/main/java/net/pterodactylus/sone/data/Reply.java b/src/main/java/net/pterodactylus/sone/data/Reply.java index 4429abf..05d8049 100644 --- a/src/main/java/net/pterodactylus/sone/data/Reply.java +++ b/src/main/java/net/pterodactylus/sone/data/Reply.java @@ -31,16 +31,16 @@ public class Reply { private final UUID id; /** The Sone that posted this reply. */ - private Sone sone; + private volatile Sone sone; /** The Post this reply refers to. */ - private Post post; + private volatile Post post; /** The time of the reply. */ - private long time; + private volatile long time; /** The text of the reply. */ - private String text; + private volatile String text; /** * Creates a new reply. diff --git a/src/main/java/net/pterodactylus/sone/data/Sone.java b/src/main/java/net/pterodactylus/sone/data/Sone.java index dd31c03..129293c 100644 --- a/src/main/java/net/pterodactylus/sone/data/Sone.java +++ b/src/main/java/net/pterodactylus/sone/data/Sone.java @@ -49,38 +49,38 @@ public class Sone { private final UUID id; /** The name of this Sone. */ - private String name; + private volatile String name; /** The URI under which the Sone is stored in Freenet. */ - private FreenetURI requestUri; + private volatile FreenetURI requestUri; /** The URI used to insert a new version of this Sone. */ /* This will be null for remote Sones! */ - private FreenetURI insertUri; + private volatile FreenetURI insertUri; /** The time of the last inserted update. */ - private long time; + private volatile long time; /** The profile of this Sone. */ - private Profile profile; + private volatile Profile profile; /** All friend Sones. */ - private final Set friendSones = new HashSet(); + private final Set friendSones = Collections.synchronizedSet(new HashSet()); /** All posts. */ - private final Set posts = new HashSet(); + private final Set posts = Collections.synchronizedSet(new HashSet()); /** All replies. */ - private final Set replies = new HashSet(); + private final Set replies = Collections.synchronizedSet(new HashSet()); /** The IDs of all blocked Sones. */ - private final Set blockedSoneIds = new HashSet(); + private final Set blockedSoneIds = Collections.synchronizedSet(new HashSet()); /** The IDs of all liked posts. */ - private final Set likedPostIds = new HashSet(); + private final Set likedPostIds = Collections.synchronizedSet(new HashSet()); /** The IDs of all liked replies. */ - private final Set likedReplyIds = new HashSet(); + private final Set likedReplyIds = Collections.synchronizedSet(new HashSet()); /** Modification count. */ private volatile long modificationCounter = 0; @@ -146,7 +146,19 @@ public class Sone { * @return This Sone (for method chaining) */ public Sone setRequestUri(FreenetURI requestUri) { - this.requestUri = requestUri; + if (this.requestUri == null) { + this.requestUri = requestUri; + updateEditions(); + return this; + } + if (!this.requestUri.equalsKeypair(requestUri)) { + logger.log(Level.WARNING, "Request URI %s tried to overwrite %s!", new Object[] { requestUri, this.requestUri }); + return this; + } + long latestEdition = requestUri.getEdition(); + if ((latestEdition > this.requestUri.getEdition()) || (latestEdition > this.requestUri.getSuggestedEdition())) { + this.requestUri.setSuggestedEdition(latestEdition); + } return this; } @@ -167,7 +179,19 @@ public class Sone { * @return This Sone (for method chaining) */ public Sone setInsertUri(FreenetURI insertUri) { - this.insertUri = insertUri; + if (this.insertUri == null) { + this.insertUri = insertUri; + updateEditions(); + return this; + } + if (!this.insertUri.equalsKeypair(insertUri)) { + logger.log(Level.WARNING, "Request URI %s tried to overwrite %s!", new Object[] { insertUri, this.insertUri }); + return this; + } + long latestEdition = insertUri.getEdition(); + if ((latestEdition > this.insertUri.getEdition()) || (latestEdition > this.insertUri.getSuggestedEdition())) { + this.insertUri.setSuggestedEdition(latestEdition); + } return this; } @@ -589,16 +613,36 @@ public class Sone { /** * Updates the suggested edition in both the request URI and the insert URI. * - * @param requestUri - * The request URI that resulted from an insert - */ - public void updateUris(FreenetURI requestUri) { - /* TODO - check for the correct URI. */ - long latestEdition = requestUri.getSuggestedEdition(); - this.requestUri = this.requestUri.setSuggestedEdition(latestEdition); - if (this.insertUri != null) { - this.insertUri = this.insertUri.setSuggestedEdition(latestEdition); + * @param latestEdition + * The latest edition to update the URIs to + */ + public void updateUris(long latestEdition) { + if ((requestUri != null) && (requestUri.getEdition() < latestEdition)) { + requestUri = requestUri.setSuggestedEdition(latestEdition); + } + if ((insertUri != null) && (insertUri.getEdition() < latestEdition)) { + insertUri = insertUri.setSuggestedEdition(latestEdition); + } + } + + // + // PRIVATE METHODS + // + + /** + * Updates the editions of the request URI and the insert URI (if latter is + * not {@code null}) with the greater edition of either one. + */ + private void updateEditions() { + long requestEdition = 0; + if (requestUri != null) { + requestEdition = requestUri.getEdition(); + } + long insertEdition = 0; + if (insertUri != null) { + insertEdition = insertUri.getEdition(); } + updateUris(Math.max(requestEdition, insertEdition)); } // diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java index 2215745..ecf7f5b 100644 --- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java +++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java @@ -79,7 +79,7 @@ public class SonePlugin implements FredPlugin, FredPluginL10n, FredPluginBaseL10 } /** The version. */ - public static final Version VERSION = new Version("RC1", 0, 1); + public static final Version VERSION = new Version("RC2", 0, 1); /** The logger. */ private static final Logger logger = Logging.getLogger(SonePlugin.class);