X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=343fe69b5f8a9f6b5ae143a339f07f67f139115d;hb=a6ed1f08b0331a283674795a09f3f6c7377322c7;hp=8a6236a1713a39f3d767a26387e6c4600bb43f1e;hpb=41ad88e59a3249031c6b546c8189204d99596e26;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 8a6236a..343fe69 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -60,7 +60,7 @@ import freenet.keys.FreenetURI;
*
* @author David âBombeâ Roden
*/
-public class Core implements IdentityListener, UpdateListener {
+public class Core implements IdentityListener, UpdateListener, ImageInsertListener {
/**
* Enumeration for the possible states of a {@link Sone}.
@@ -109,6 +109,9 @@ public class Core implements IdentityListener, UpdateListener {
/** The Sone downloader. */
private final SoneDownloader soneDownloader;
+ /** The image inserter. */
+ private final ImageInserter imageInserter;
+
/** The update checker. */
private final UpdateChecker updateChecker;
@@ -192,6 +195,7 @@ public class Core implements IdentityListener, UpdateListener {
this.freenetInterface = freenetInterface;
this.identityManager = identityManager;
this.soneDownloader = new SoneDownloader(this, freenetInterface);
+ this.imageInserter = new ImageInserter(this, freenetInterface);
this.updateChecker = new UpdateChecker(freenetInterface);
}
@@ -537,7 +541,8 @@ public class Core implements IdentityListener, UpdateListener {
* @return {@code true} if the target Sone is trusted by the origin Sone
*/
public boolean isSoneTrusted(Sone origin, Sone target) {
- return trustedIdentities.containsKey(origin) && trustedIdentities.get(origin.getIdentity()).contains(target);
+ Validation.begin().isNotNull("Origin", origin).isNotNull("Target", target).check().isInstanceOf("Originâs OwnIdentity", origin.getIdentity(), OwnIdentity.class).check();
+ return trustedIdentities.containsKey(origin.getIdentity()) && trustedIdentities.get(origin.getIdentity()).contains(target.getIdentity());
}
/**
@@ -545,7 +550,7 @@ public class Core implements IdentityListener, UpdateListener {
*
* @param postId
* The ID of the post to get
- * @return The post, or {@code null} if there is no such post
+ * @return The post with the given ID, or a new post with the given ID
*/
public Post getPost(String postId) {
return getPost(postId, true);
@@ -587,6 +592,27 @@ public class Core implements IdentityListener, UpdateListener {
}
/**
+ * Returns all posts that have the given Sone as recipient.
+ *
+ * @see Post#getRecipient()
+ * @param recipient
+ * The recipient of the posts
+ * @return All posts that have the given Sone as recipient
+ */
+ public Set getDirectedPosts(Sone recipient) {
+ Validation.begin().isNotNull("Recipient", recipient).check();
+ Set directedPosts = new HashSet();
+ synchronized (posts) {
+ for (Post post : posts.values()) {
+ if (recipient.equals(post.getRecipient())) {
+ directedPosts.add(post);
+ }
+ }
+ }
+ return directedPosts;
+ }
+
+ /**
* Returns the reply with the given ID. If there is no reply with the given
* ID yet, a new one is created.
*
@@ -912,7 +938,6 @@ public class Core implements IdentityListener, UpdateListener {
@SuppressWarnings("synthetic-access")
public void run() {
if (!preferences.isSoneRescueMode()) {
- soneDownloader.fetchSone(sone);
return;
}
logger.log(Level.INFO, "Trying to restore Sone from Freenetâ¦");
@@ -950,6 +975,8 @@ public class Core implements IdentityListener, UpdateListener {
return null;
}
Sone sone = addLocalSone(ownIdentity);
+ sone.getOptions().addBooleanOption("AutoFollow", new DefaultOption(false));
+ saveSone(sone);
return sone;
}
@@ -979,6 +1006,11 @@ public class Core implements IdentityListener, UpdateListener {
}
if (newSone) {
coreListenerManager.fireNewSoneFound(sone);
+ for (Sone localSone : getLocalSones()) {
+ if (localSone.getOptions().getBooleanOption("AutoFollow").get()) {
+ localSone.addFriend(sone.getId());
+ }
+ }
}
}
remoteSones.put(identity.getId(), sone);
@@ -1168,6 +1200,7 @@ public class Core implements IdentityListener, UpdateListener {
storedSone.setReplies(sone.getReplies());
storedSone.setLikePostIds(sone.getLikedPostIds());
storedSone.setLikeReplyIds(sone.getLikedReplyIds());
+ storedSone.setAlbums(sone.getAlbums());
}
storedSone.setLatestEdition(sone.getLatestEdition());
}
@@ -1339,8 +1372,9 @@ public class Core implements IdentityListener, UpdateListener {
/* load albums. */
List topLevelAlbums = new ArrayList();
+ int albumCounter = 0;
while (true) {
- String albumPrefix = sonePrefix + "/Albums/" + albums.size();
+ String albumPrefix = sonePrefix + "/Albums/" + albumCounter++;
String albumId = configuration.getStringValue(albumPrefix + "/ID").getValue(null);
if (albumId == null) {
break;
@@ -1515,16 +1549,7 @@ public class Core implements IdentityListener, UpdateListener {
configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(null);
/* save albums. first, collect in a flat structure, top-level first. */
- List albums = new ArrayList();
- albums.addAll(sone.getAlbums());
- int lastAlbumIndex = 0;
- while (lastAlbumIndex < albums.size()) {
- int previousAlbumCount = albums.size();
- for (Album album : new ArrayList(albums.subList(lastAlbumIndex, albums.size()))) {
- albums.addAll(album.getAlbums());
- }
- lastAlbumIndex = previousAlbumCount;
- }
+ List albums = Sone.flattenAlbums(sone.getAlbums());
int albumCounter = 0;
for (Album album : albums) {
@@ -1639,7 +1664,8 @@ public class Core implements IdentityListener, UpdateListener {
posts.put(post.getId(), post);
}
synchronized (newPosts) {
- knownPosts.add(post.getId());
+ newPosts.add(post.getId());
+ coreListenerManager.fireNewPostFound(post);
}
sone.addPost(post);
saveSone(sone);
@@ -1661,6 +1687,10 @@ public class Core implements IdentityListener, UpdateListener {
synchronized (posts) {
posts.remove(post.getId());
}
+ synchronized (newPosts) {
+ markPostKnown(post);
+ knownPosts.remove(post.getId());
+ }
saveSone(post.getSone());
}
@@ -1763,7 +1793,8 @@ public class Core implements IdentityListener, UpdateListener {
replies.put(reply.getId(), reply);
}
synchronized (newReplies) {
- knownReplies.add(reply.getId());
+ newReplies.add(reply.getId());
+ coreListenerManager.fireNewReplyFound(reply);
}
sone.addReply(reply);
saveSone(sone);
@@ -1785,6 +1816,10 @@ public class Core implements IdentityListener, UpdateListener {
synchronized (replies) {
replies.remove(reply.getId());
}
+ synchronized (newReplies) {
+ markReplyKnown(reply);
+ knownReplies.remove(reply.getId());
+ }
sone.removeReply(reply);
saveSone(sone);
}
@@ -1842,6 +1877,29 @@ public class Core implements IdentityListener, UpdateListener {
}
/**
+ * Deletes the given album. The owner of the album has to be a local Sone,
+ * and the album has to be {@link Album#isEmpty() empty} to be deleted.
+ *
+ * @param album
+ * The album to remove
+ */
+ public void deleteAlbum(Album album) {
+ Validation.begin().isNotNull("Album", album).check().is("Local Sone", isLocalSone(album.getSone())).check();
+ if (!album.isEmpty()) {
+ return;
+ }
+ if (album.getParent() == null) {
+ album.getSone().removeAlbum(album);
+ } else {
+ album.getParent().removeAlbum(album);
+ }
+ synchronized (albums) {
+ albums.remove(album.getId());
+ }
+ saveSone(album.getSone());
+ }
+
+ /**
* Creates a new image.
*
* @param sone
@@ -1859,10 +1917,29 @@ public class Core implements IdentityListener, UpdateListener {
synchronized (images) {
images.put(image.getId(), image);
}
+ imageInserter.insertImage(temporaryImage, image);
return image;
}
/**
+ * Deletes the given image. This method will also delete a matching
+ * temporary image.
+ *
+ * @see #deleteTemporaryImage(TemporaryImage)
+ * @param image
+ * The image to delete
+ */
+ public void deleteImage(Image image) {
+ Validation.begin().isNotNull("Image", image).check().is("Local Sone", isLocalSone(image.getSone())).check();
+ deleteTemporaryImage(image.getId());
+ image.getAlbum().removeImage(image);
+ synchronized (images) {
+ images.remove(image.getId());
+ }
+ saveSone(image.getSone());
+ }
+
+ /**
* Creates a new temporary image.
*
* @param mimeType
@@ -1886,7 +1963,7 @@ public class Core implements IdentityListener, UpdateListener {
* @param temporaryImage
* The temporary image to delete
*/
- public void deteleTemporaryImage(TemporaryImage temporaryImage) {
+ public void deleteTemporaryImage(TemporaryImage temporaryImage) {
Validation.begin().isNotNull("Temporary Image", temporaryImage).check();
deleteTemporaryImage(temporaryImage.getId());
}
@@ -1902,6 +1979,10 @@ public class Core implements IdentityListener, UpdateListener {
synchronized (temporaryImages) {
temporaryImages.remove(imageId);
}
+ Image image = getImage(imageId, false);
+ if (image != null) {
+ imageInserter.cancelImageInsert(image);
+ }
}
/**
@@ -1945,6 +2026,7 @@ public class Core implements IdentityListener, UpdateListener {
try {
configuration.getIntValue("Option/ConfigurationVersion").setValue(0);
configuration.getIntValue("Option/InsertionDelay").setValue(options.getIntegerOption("InsertionDelay").getReal());
+ configuration.getIntValue("Option/PostsPerPage").setValue(options.getIntegerOption("PostsPerPage").getReal());
configuration.getIntValue("Option/PositiveTrust").setValue(options.getIntegerOption("PositiveTrust").getReal());
configuration.getIntValue("Option/NegativeTrust").setValue(options.getIntegerOption("NegativeTrust").getReal());
configuration.getStringValue("Option/TrustComment").setValue(options.getStringOption("TrustComment").getReal());
@@ -2018,8 +2100,9 @@ public class Core implements IdentityListener, UpdateListener {
}
}));
+ options.addIntegerOption("PostsPerPage", new DefaultOption(10));
options.addIntegerOption("PositiveTrust", new DefaultOption(75));
- options.addIntegerOption("NegativeTrust", new DefaultOption(-100));
+ options.addIntegerOption("NegativeTrust", new DefaultOption(-25));
options.addStringOption("TrustComment", new DefaultOption("Set from Sone Web Interface"));
options.addBooleanOption("SoneRescueMode", new DefaultOption(false));
options.addBooleanOption("ClearOnNextRestart", new DefaultOption(false));
@@ -2037,6 +2120,7 @@ public class Core implements IdentityListener, UpdateListener {
}
options.getIntegerOption("InsertionDelay").set(configuration.getIntValue("Option/InsertionDelay").getValue(null));
+ options.getIntegerOption("PostsPerPage").set(configuration.getIntValue("Option/PostsPerPage").getValue(null));
options.getIntegerOption("PositiveTrust").set(configuration.getIntValue("Option/PositiveTrust").getValue(null));
options.getIntegerOption("NegativeTrust").set(configuration.getIntValue("Option/NegativeTrust").getValue(null));
options.getStringOption("TrustComment").set(configuration.getStringValue("Option/TrustComment").getValue(null));
@@ -2182,6 +2266,49 @@ public class Core implements IdentityListener, UpdateListener {
coreListenerManager.fireUpdateFound(version, releaseTime, latestEdition);
}
+ //
+ // INTERFACE ImageInsertListener
+ //
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void imageInsertStarted(Image image) {
+ logger.log(Level.WARNING, "Image insert started for " + image);
+ coreListenerManager.fireImageInsertStarted(image);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void imageInsertAborted(Image image) {
+ logger.log(Level.WARNING, "Image insert aborted for " + image);
+ coreListenerManager.fireImageInsertAborted(image);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void imageInsertFinished(Image image, FreenetURI key) {
+ logger.log(Level.WARNING, "Image insert finished for " + image + ": " + key);
+ image.setKey(key.toString());
+ deleteTemporaryImage(image.getId());
+ saveSone(image.getSone());
+ coreListenerManager.fireImageInsertFinished(image);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public void imageInsertFailed(Image image, Throwable cause) {
+ logger.log(Level.WARNING, "Image insert failed for " + image, cause);
+ coreListenerManager.fireImageInsertFailed(image, cause);
+ }
+
/**
* Convenience interface for external classes that want to access the coreâs
* configuration.
@@ -2226,6 +2353,27 @@ public class Core implements IdentityListener, UpdateListener {
}
/**
+ * Returns the number of posts to show per page.
+ *
+ * @return The number of posts to show per page
+ */
+ public int getPostsPerPage() {
+ return options.getIntegerOption("PostsPerPage").get();
+ }
+
+ /**
+ * Sets the number of posts to show per page.
+ *
+ * @param postsPerPage
+ * The number of posts to show per page
+ * @return This preferences object
+ */
+ public Preferences setPostsPerPage(Integer postsPerPage) {
+ options.getIntegerOption("PostsPerPage").set(postsPerPage);
+ return this;
+ }
+
+ /**
* Returns the positive trust.
*
* @return The positive trust