import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.Map.Entry;
+import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.logging.Level;
import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.data.PostReply;
import net.pterodactylus.sone.data.Profile;
+import net.pterodactylus.sone.data.Profile.Field;
import net.pterodactylus.sone.data.Reply;
import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.data.TemporaryImage;
-import net.pterodactylus.sone.data.Profile.Field;
import net.pterodactylus.sone.data.Sone.ShowCustomAvatars;
import net.pterodactylus.sone.data.Sone.SoneStatus;
+import net.pterodactylus.sone.data.TemporaryImage;
import net.pterodactylus.sone.fcp.FcpInterface;
import net.pterodactylus.sone.fcp.FcpInterface.FullAccessRequired;
import net.pterodactylus.sone.freenet.wot.Identity;
try {
sone = getLocalSone(ownIdentity.getId()).setIdentity(ownIdentity).setInsertUri(new FreenetURI(ownIdentity.getInsertUri())).setRequestUri(new FreenetURI(ownIdentity.getRequestUri()));
} catch (MalformedURLException mue1) {
- logger.log(Level.SEVERE, "Could not convert the Identity’s URIs to Freenet URIs: " + ownIdentity.getInsertUri() + ", " + ownIdentity.getRequestUri(), mue1);
+ logger.log(Level.SEVERE, String.format("Could not convert the Identity’s URIs to Freenet URIs: %s, %s", ownIdentity.getInsertUri(), ownIdentity.getRequestUri()), mue1);
return null;
}
sone.setLatestEdition(Numbers.safeParseLong(ownIdentity.getProperty("Sone.LatestEdition"), (long) 0));
try {
ownIdentity.addContext("Sone");
} catch (WebOfTrustException wote1) {
- logger.log(Level.SEVERE, "Could not add “Sone” context to own identity: " + ownIdentity, wote1);
+ logger.log(Level.SEVERE, String.format("Could not add “Sone” context to own identity: %s", ownIdentity), wote1);
return null;
}
Sone sone = addLocalSone(ownIdentity);
*/
public Trust getTrust(Sone origin, Sone target) {
if (!isLocalSone(origin)) {
- logger.log(Level.WARNING, "Tried to get trust from remote Sone: %s", origin);
+ logger.log(Level.WARNING, String.format("Tried to get trust from remote Sone: %s", origin));
return null;
}
return target.getIdentity().getTrust((OwnIdentity) origin.getIdentity());
try {
((OwnIdentity) origin.getIdentity()).setTrust(target.getIdentity(), trustValue, preferences.getTrustComment());
} catch (WebOfTrustException wote1) {
- logger.log(Level.WARNING, "Could not set trust for Sone: " + target, wote1);
+ logger.log(Level.WARNING, String.format("Could not set trust for Sone: %s", target), wote1);
}
}
try {
((OwnIdentity) origin.getIdentity()).removeTrust(target.getIdentity());
} catch (WebOfTrustException wote1) {
- logger.log(Level.WARNING, "Could not remove trust for Sone: " + target, wote1);
+ logger.log(Level.WARNING, String.format("Could not remove trust for Sone: %s", target), wote1);
}
}
if (hasSone(sone.getId())) {
Sone storedSone = getSone(sone.getId());
if (!soneRescueMode && !(sone.getTime() > storedSone.getTime())) {
- logger.log(Level.FINE, "Downloaded Sone %s is not newer than stored Sone %s.", new Object[] { sone, storedSone });
+ logger.log(Level.FINE, String.format("Downloaded Sone %s is not newer than stored Sone %s.", sone, storedSone));
return;
}
synchronized (posts) {
List<Post> storedPosts = storedSone.getPosts();
synchronized (knownPosts) {
for (Post post : sone.getPosts()) {
- post.setSone(storedSone);
+ post.setSone(storedSone).setKnown(knownPosts.contains(post.getId()));
if (!storedPosts.contains(post)) {
if (post.getTime() < getSoneFollowingTime(sone)) {
- sone.setKnown(true);
knownPosts.add(post.getId());
} else if (!knownPosts.contains(post.getId())) {
+ sone.setKnown(false);
coreListenerManager.fireNewPostFound(post);
- } else {
- sone.setKnown(true);
}
}
posts.put(post.getId(), post);
Set<PostReply> storedReplies = storedSone.getReplies();
synchronized (knownReplies) {
for (PostReply reply : sone.getReplies()) {
- reply.setSone(storedSone);
+ reply.setSone(storedSone).setKnown(knownReplies.contains(reply.getId()));
if (!storedReplies.contains(reply)) {
if (reply.getTime() < getSoneFollowingTime(sone)) {
- reply.setKnown(true);
knownReplies.add(reply.getId());
} else if (!knownReplies.contains(reply.getId())) {
+ reply.setKnown(false);
coreListenerManager.fireNewReplyFound(reply);
- } else {
- reply.setKnown(true);
}
}
replies.put(reply.getId(), reply);
*/
public void deleteSone(Sone sone) {
if (!(sone.getIdentity() instanceof OwnIdentity)) {
- logger.log(Level.WARNING, "Tried to delete Sone of non-own identity: %s", sone);
+ logger.log(Level.WARNING, String.format("Tried to delete Sone of non-own identity: %s", sone));
return;
}
synchronized (localSones) {
if (!localSones.containsKey(sone.getId())) {
- logger.log(Level.WARNING, "Tried to delete non-local Sone: %s", sone);
+ logger.log(Level.WARNING, String.format("Tried to delete non-local Sone: %s", sone));
return;
}
localSones.remove(sone.getId());
((OwnIdentity) sone.getIdentity()).removeContext("Sone");
((OwnIdentity) sone.getIdentity()).removeProperty("Sone.LatestEdition");
} catch (WebOfTrustException wote1) {
- logger.log(Level.WARNING, "Could not remove context and properties from Sone: " + sone, wote1);
+ logger.log(Level.WARNING, String.format("Could not remove context and properties from Sone: %s", sone), wote1);
}
try {
configuration.getLongValue("Sone/" + sone.getId() + "/Time").setValue(null);
}
/**
- * Marks the given Sone as known. If the Sone was {@link #isNewPost(String)
- * new} before, a {@link CoreListener#markSoneKnown(Sone)} event is fired.
+ * Marks the given Sone as known. If the Sone was not {@link Post#isKnown()
+ * known} before, a {@link CoreListener#markSoneKnown(Sone)} event is fired.
*
* @param sone
* The Sone to mark as known
*/
public void loadSone(Sone sone) {
if (!isLocalSone(sone)) {
- logger.log(Level.FINE, "Tried to load non-local Sone: %s", sone);
+ logger.log(Level.FINE, String.format("Tried to load non-local Sone: %s", sone));
return;
}
if (albumParentId != null) {
Album parentAlbum = getAlbum(albumParentId, false);
if (parentAlbum == null) {
- logger.log(Level.WARNING, "Invalid parent album ID: " + albumParentId);
+ logger.log(Level.WARNING, String.format("Invalid parent album ID: %s", albumParentId));
return;
}
parentAlbum.addAlbum(album);
*/
public Post createPost(Sone sone, Sone recipient, long time, String text) {
if (!isLocalSone(sone)) {
- logger.log(Level.FINE, "Tried to create post for non-local Sone: %s", sone);
+ logger.log(Level.FINE, String.format("Tried to create post for non-local Sone: %s", sone));
return null;
}
final Post post = new Post(sone, time, text);
*/
public void deletePost(Post post) {
if (!isLocalSone(post.getSone())) {
- logger.log(Level.WARNING, "Tried to delete post of non-local Sone: %s", post.getSone());
+ logger.log(Level.WARNING, String.format("Tried to delete post of non-local Sone: %s", post.getSone()));
return;
}
post.getSone().removePost(post);
}
/**
- * Marks the given post as known, if it is currently a new post (according
- * to {@link #isNewPost(String)}).
+ * Marks the given post as known, if it is currently not a known post
+ * (according to {@link Post#isKnown()}).
*
* @param post
* The post to mark as known
public void markPostKnown(Post post) {
post.setKnown(true);
synchronized (knownPosts) {
+ coreListenerManager.fireMarkPostKnown(post);
if (knownPosts.add(post.getId())) {
- coreListenerManager.fireMarkPostKnown(post);
touchConfiguration();
}
}
+ for (PostReply reply : getReplies(post)) {
+ markReplyKnown(reply);
+ }
}
/**
*/
public PostReply createReply(Sone sone, Post post, long time, String text) {
if (!isLocalSone(sone)) {
- logger.log(Level.FINE, "Tried to create reply for non-local Sone: %s", sone);
+ logger.log(Level.FINE, String.format("Tried to create reply for non-local Sone: %s", sone));
return null;
}
final PostReply reply = new PostReply(sone, post, System.currentTimeMillis(), text);
public void deleteReply(PostReply reply) {
Sone sone = reply.getSone();
if (!isLocalSone(sone)) {
- logger.log(Level.FINE, "Tried to delete non-local reply: %s", reply);
+ logger.log(Level.FINE, String.format("Tried to delete non-local reply: %s", reply));
return;
}
synchronized (replies) {
}
/**
- * Marks the given reply as known, if it is currently a new reply (according
- * to {@link #isNewReply(String)}).
+ * Marks the given reply as known, if it is currently not a known reply
+ * (according to {@link Reply#isKnown()}).
*
* @param reply
* The reply to mark as known
public void markReplyKnown(PostReply reply) {
reply.setKnown(true);
synchronized (knownReplies) {
+ coreListenerManager.fireMarkReplyKnown(reply);
if (knownReplies.add(reply.getId())) {
- coreListenerManager.fireMarkReplyKnown(reply);
touchConfiguration();
}
}
*/
private synchronized void saveSone(Sone sone) {
if (!isLocalSone(sone)) {
- logger.log(Level.FINE, "Tried to save non-local Sone: %s", sone);
+ logger.log(Level.FINE, String.format("Tried to save non-local Sone: %s", sone));
return;
}
if (!(sone.getIdentity() instanceof OwnIdentity)) {
- logger.log(Level.WARNING, "Local Sone without OwnIdentity found, refusing to save: %s", sone);
+ logger.log(Level.WARNING, String.format("Local Sone without OwnIdentity found, refusing to save: %s", sone));
return;
}
- logger.log(Level.INFO, "Saving Sone: %s", sone);
+ logger.log(Level.INFO, String.format("Saving Sone: %s", sone));
try {
/* save Sone into configuration. */
String sonePrefix = "Sone/" + sone.getId();
((OwnIdentity) sone.getIdentity()).setProperty("Sone.LatestEdition", String.valueOf(sone.getLatestEdition()));
- logger.log(Level.INFO, "Sone %s saved.", sone);
+ logger.log(Level.INFO, String.format("Sone %s saved.", sone));
} catch (ConfigurationException ce1) {
- logger.log(Level.WARNING, "Could not save Sone: " + sone, ce1);
+ logger.log(Level.WARNING, String.format("Could not save Sone: %s", sone), ce1);
} catch (WebOfTrustException wote1) {
- logger.log(Level.WARNING, "Could not set WoT property for Sone: " + sone, wote1);
+ logger.log(Level.WARNING, String.format("Could not set WoT property for Sone: %s", sone), wote1);
}
}
try {
options.getIntegerOption(optionName).set(configuration.getIntValue("Option/" + optionName).getValue(null));
} catch (IllegalArgumentException iae1) {
- logger.log(Level.WARNING, "Invalid value for " + optionName + " in configuration, using default.");
+ logger.log(Level.WARNING, String.format("Invalid value for %s in configuration, using default.", optionName));
}
}
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);
+ logger.log(Level.WARNING, String.format("Could not create Sone URI from URI: %s", uriString, mue1));
return null;
}
}
*/
@Override
public void ownIdentityAdded(OwnIdentity ownIdentity) {
- logger.log(Level.FINEST, "Adding OwnIdentity: " + ownIdentity);
+ logger.log(Level.FINEST, String.format("Adding OwnIdentity: %s", ownIdentity));
if (ownIdentity.hasContext("Sone")) {
trustedIdentities.put(ownIdentity, Collections.synchronizedSet(new HashSet<Identity>()));
addLocalSone(ownIdentity);
*/
@Override
public void ownIdentityRemoved(OwnIdentity ownIdentity) {
- logger.log(Level.FINEST, "Removing OwnIdentity: " + ownIdentity);
+ logger.log(Level.FINEST, String.format("Removing OwnIdentity: %s", ownIdentity));
trustedIdentities.remove(ownIdentity);
}
*/
@Override
public void identityAdded(OwnIdentity ownIdentity, Identity identity) {
- logger.log(Level.FINEST, "Adding Identity: " + identity);
+ logger.log(Level.FINEST, String.format("Adding Identity: %s", identity));
trustedIdentities.get(ownIdentity).add(identity);
addRemoteSone(identity);
}
*/
@Override
public void imageInsertStarted(Image image) {
- logger.log(Level.WARNING, "Image insert started for " + image);
+ logger.log(Level.WARNING, String.format("Image insert started for %s...", image));
coreListenerManager.fireImageInsertStarted(image);
}
*/
@Override
public void imageInsertAborted(Image image) {
- logger.log(Level.WARNING, "Image insert aborted for " + image);
+ logger.log(Level.WARNING, String.format("Image insert aborted for %s.", image));
coreListenerManager.fireImageInsertAborted(image);
}
*/
@Override
public void imageInsertFinished(Image image, FreenetURI key) {
- logger.log(Level.WARNING, "Image insert finished for " + image + ": " + key);
+ logger.log(Level.WARNING, String.format("Image insert finished for %s: %s", image, key));
image.setKey(key.toString());
deleteTemporaryImage(image.getId());
saveSone(image.getSone());
*/
@Override
public void imageInsertFailed(Image image, Throwable cause) {
- logger.log(Level.WARNING, "Image insert failed for " + image, cause);
+ logger.log(Level.WARNING, String.format("Image insert failed for %s." + image), cause);
coreListenerManager.fireImageInsertFailed(image, cause);
}
projects / Sone.git / blobdiff