X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=450e996b383cd4e501021829cd9d08185581081f;hb=62ebf3da00001abb841c92128c4fdb57d0795ee2;hp=cc60b903872dd7a7a1f8f3159233bb1ce88eb853;hpb=3e042caab4607348df46e125f1cefa62d9da192b;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 cc60b90..450e996 100644 --- a/src/main/java/net/pterodactylus/sone/core/Core.java +++ b/src/main/java/net/pterodactylus/sone/core/Core.java @@ -106,6 +106,13 @@ public class Core implements IdentityListener { /* synchronize access on this on itself. */ private Map remoteSones = new HashMap(); + /** All new Sones. */ + private Set newSones = new HashSet(); + + /** All known Sones. */ + /* synchronize access on {@link #newSones}. */ + private Set knownSones = new HashSet(); + /** All posts. */ private Map posts = new HashMap(); @@ -200,12 +207,39 @@ public class Core implements IdentityListener { * Sone */ public Sone getSone(String id) { - Sone sone = getRemoteSone(id); - if (sone != null) { - return sone; + return getSone(id, true); + } + + /** + * Returns the Sone with the given ID, regardless whether it’s local or + * remote. + * + * @param id + * The ID of the Sone to get + * @param create + * {@code true} to create a new Sone if none exists, + * {@code false} to return {@code null} if a Sone with the given + * ID does not exist + * @return The Sone with the given ID, or {@code null} if there is no such + * Sone + */ + public Sone getSone(String id, boolean create) { + if (isLocalSone(id)) { + return getLocalSone(id); } - sone = getLocalSone(id); - return sone; + return getRemoteSone(id, create); + } + + /** + * Checks whether the core knows a Sone with the given ID. + * + * @param id + * The ID of the Sone + * @return {@code true} if there is a Sone with the given ID, {@code false} + * otherwise + */ + public boolean hasSone(String id) { + return isLocalSone(id) || isRemoteSone(id); } /** @@ -222,6 +256,20 @@ public class Core implements IdentityListener { } /** + * Returns whether the given ID is the ID of a local Sone. + * + * @param id + * The Sone ID to check for its locality + * @return {@code true} if the given ID is a local Sone, {@code false} + * otherwise + */ + public boolean isLocalSone(String id) { + synchronized (localSones) { + return localSones.containsKey(id); + } + } + + /** * Returns all local Sones. * * @return All local Sones @@ -237,11 +285,16 @@ public class Core implements IdentityListener { * * @param id * The ID of the Sone to get - * @return The Sone, or {@code null} if there is no Sone with the given ID + * @return The Sone with the given ID */ public Sone getLocalSone(String id) { synchronized (localSones) { - return localSones.get(id); + Sone sone = localSones.get(id); + if (sone == null) { + sone = new Sone(id); + localSones.put(id, sone); + } + return sone; } } @@ -261,11 +314,30 @@ public class Core implements IdentityListener { * * @param id * The ID of the remote Sone to get - * @return The Sone, or {@code null} if there is no such Sone + * @return The Sone with the given ID */ public Sone getRemoteSone(String id) { + return getRemoteSone(id, true); + } + + /** + * Returns the remote Sone with the given ID. + * + * @param id + * The ID of the remote Sone to get + * @param create + * {@code true} to always create a Sone, {@code false} to return + * {@code null} if no Sone with the given ID exists + * @return The Sone with the given ID + */ + public Sone getRemoteSone(String id, boolean create) { synchronized (remoteSones) { - return remoteSones.get(id); + Sone sone = remoteSones.get(id); + if ((sone == null) && create) { + sone = new Sone(id); + remoteSones.put(id, sone); + } + return sone; } } @@ -284,6 +356,37 @@ 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) { + boolean isNew = !knownSones.contains(sone.getId()) && newSones.remove(sone.getId()); + knownSones.add(sone.getId()); + return isNew; + } + } + + /** * Returns the post with the given ID. * * @param postId @@ -292,7 +395,12 @@ public class Core implements IdentityListener { */ public Post getPost(String postId) { synchronized (posts) { - return posts.get(postId); + Post post = posts.get(postId); + if (post == null) { + post = new Post(postId); + posts.put(postId, post); + } + return post; } } @@ -305,7 +413,12 @@ public class Core implements IdentityListener { */ public Reply getReply(String replyId) { synchronized (replies) { - return replies.get(replyId); + Reply reply = replies.get(replyId); + if (reply == null) { + reply = new Reply(replyId); + replies.put(replyId, reply); + } + return reply; } } @@ -357,7 +470,7 @@ public class Core implements IdentityListener { public Set getLikes(Reply reply) { Set sones = new HashSet(); for (Sone sone : getSones()) { - if (sone.getLikedPostIds().contains(reply.getId())) { + if (sone.getLikedReplyIds().contains(reply.getId())) { sones.add(sone); } } @@ -404,13 +517,9 @@ public class Core implements IdentityListener { return null; } synchronized (localSones) { - if (localSones.containsKey(ownIdentity.getId())) { - logger.log(Level.FINE, "Tried to add known local Sone: %s", ownIdentity); - return localSones.get(ownIdentity.getId()); - } final Sone sone; try { - sone = new Sone(ownIdentity).setInsertUri(new FreenetURI(ownIdentity.getInsertUri())).setRequestUri(new FreenetURI(ownIdentity.getRequestUri())); + sone = getLocalSone(ownIdentity.getId()).setIdentity(ownIdentity).setInsertUri(new FreenetURI(ownIdentity.getInsertUri())).setRequestUri(new FreenetURI(ownIdentity.getRequestUri())); sone.setLatestEdition(Numbers.safeParseLong(ownIdentity.getProperty("Sone.LatestEdition"), (long) 0)); } catch (MalformedURLException mue1) { logger.log(Level.SEVERE, "Could not convert the Identity’s URIs to Freenet URIs: " + ownIdentity.getInsertUri() + ", " + ownIdentity.getRequestUri(), mue1); @@ -422,6 +531,7 @@ public class Core implements IdentityListener { soneInserters.put(sone, soneInserter); soneInserter.start(); setSoneStatus(sone, SoneStatus.idle); + loadSone(sone); new Thread(new Runnable() { @Override @@ -465,15 +575,27 @@ public class Core implements IdentityListener { return null; } synchronized (remoteSones) { - if (remoteSones.containsKey(identity.getId())) { - logger.log(Level.FINE, "Identity already exists: %s", identity); - return remoteSones.get(identity.getId()); + final Sone sone = getRemoteSone(identity.getId()).setIdentity(identity); + boolean 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.getId()); + } } - Sone sone = new Sone(identity); - sone.setRequestUri(getSoneUri(identity.getRequestUri(), identity.getProperty("Sone.LatestEdition"))); remoteSones.put(identity.getId(), sone); soneDownloader.addSone(sone); - setSoneStatus(sone, SoneStatus.idle); + setSoneStatus(sone, SoneStatus.unknown); + new Thread(new Runnable() { + + @Override + @SuppressWarnings("synthetic-access") + public void run() { + soneDownloader.fetchSone(sone); + } + + }, "Sone Downloader").start(); return sone; } } @@ -515,8 +637,8 @@ public class Core implements IdentityListener { storedSone.setLikePostIds(sone.getLikedPostIds()); storedSone.setLikeReplyIds(sone.getLikedReplyIds()); storedSone.setLatestEdition(sone.getRequestUri().getEdition()); + storedSone.setModificationCounter(0); } - saveSone(storedSone); } } @@ -539,9 +661,129 @@ public class Core implements IdentityListener { return; } localSones.remove(sone.getId()); - soneInserters.remove(sone.getId()).stop(); + soneInserters.remove(sone).stop(); } 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); + } + } + + /** + * Loads and updates the given Sone from the configuration. If any error is + * encountered, loading is aborted and the given Sone is not changed. + * + * @param sone + * The Sone to load and update + */ + public void loadSone(Sone sone) { + if (!isLocalSone(sone)) { + logger.log(Level.FINE, "Tried to load non-local Sone: %s", sone); + return; + } + + /* load Sone. */ + String sonePrefix = "Sone/" + sone.getId(); + 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. */ + Profile profile = new Profile(); + profile.setFirstName(configuration.getStringValue(sonePrefix + "/Profile/FirstName").getValue(null)); + profile.setMiddleName(configuration.getStringValue(sonePrefix + "/Profile/MiddleName").getValue(null)); + profile.setLastName(configuration.getStringValue(sonePrefix + "/Profile/LastName").getValue(null)); + profile.setBirthDay(configuration.getIntValue(sonePrefix + "/Profile/BirthDay").getValue(null)); + profile.setBirthMonth(configuration.getIntValue(sonePrefix + "/Profile/BirthMonth").getValue(null)); + profile.setBirthYear(configuration.getIntValue(sonePrefix + "/Profile/BirthYear").getValue(null)); + + /* load posts. */ + Set posts = new HashSet(); + while (true) { + String postPrefix = sonePrefix + "/Posts/" + posts.size(); + String postId = configuration.getStringValue(postPrefix + "/ID").getValue(null); + if (postId == null) { + break; + } + long postTime = configuration.getLongValue(postPrefix + "/Time").getValue((long) 0); + String postText = configuration.getStringValue(postPrefix + "/Text").getValue(null); + if ((postTime == 0) || (postText == null)) { + logger.log(Level.WARNING, "Invalid post found, aborting load!"); + return; + } + posts.add(getPost(postId).setSone(sone).setTime(postTime).setText(postText)); + } + + /* load replies. */ + Set replies = new HashSet(); + while (true) { + String replyPrefix = sonePrefix + "/Replies/" + replies.size(); + String replyId = configuration.getStringValue(replyPrefix + "/ID").getValue(null); + if (replyId == null) { + break; + } + String postId = configuration.getStringValue(replyPrefix + "/Post/ID").getValue(null); + long replyTime = configuration.getLongValue(replyPrefix + "/Time").getValue((long) 0); + String replyText = configuration.getStringValue(replyPrefix + "/Text").getValue(null); + if ((postId == null) || (replyTime == 0) || (replyText == null)) { + logger.log(Level.WARNING, "Invalid reply found, aborting load!"); + return; + } + replies.add(getReply(replyId).setSone(sone).setPost(getPost(postId)).setTime(replyTime).setText(replyText)); + } + + /* load post likes. */ + Set likedPostIds = new HashSet(); + while (true) { + String likedPostId = configuration.getStringValue(sonePrefix + "/Likes/Post/" + likedPostIds.size() + "/ID").getValue(null); + if (likedPostId == null) { + break; + } + likedPostIds.add(likedPostId); + } + + /* load reply likes. */ + Set likedReplyIds = new HashSet(); + while (true) { + String likedReplyId = configuration.getStringValue(sonePrefix + "/Likes/Reply/" + likedReplyIds.size() + "/ID").getValue(null); + if (likedReplyId == null) { + break; + } + likedReplyIds.add(likedReplyId); + } + + /* load friends. */ + Set friends = new HashSet(); + while (true) { + String friendId = configuration.getStringValue(sonePrefix + "/Friends/" + friends.size() + "/ID").getValue(null); + if (friendId == null) { + break; + } + friends.add(friendId); + } + + /* if we’re still here, Sone was loaded successfully. */ + synchronized (sone) { + sone.setTime(soneTime); + sone.setProfile(profile); + sone.setPosts(posts); + sone.setReplies(replies); + sone.setLikePostIds(likedPostIds); + sone.setLikeReplyIds(likedReplyIds); + sone.setFriends(friends); + sone.setModificationCounter(soneModificationCounter); + } + synchronized (newSones) { + for (String friend : friends) { + knownSones.add(friend); + } + } } /** @@ -567,6 +809,7 @@ public class Core implements IdentityListener { /* save Sone into configuration. */ String sonePrefix = "Sone/" + sone.getId(); configuration.getLongValue(sonePrefix + "/Time").setValue(sone.getTime()); + configuration.getLongValue(sonePrefix + "/ModificationCounter").setValue(sone.getModificationCounter()); /* save profile. */ Profile profile = sone.getProfile(); @@ -612,6 +855,13 @@ public class Core implements IdentityListener { } configuration.getStringValue(sonePrefix + "/Likes/Reply/" + replyLikeCounter + "/ID").setValue(null); + /* save friends. */ + int friendCounter = 0; + for (String friend : sone.getFriends()) { + configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(friend); + } + configuration.getStringValue(sonePrefix + "/Friends/" + friendCounter + "/ID").setValue(null); + logger.log(Level.INFO, "Sone %s saved.", sone); } catch (ConfigurationException ce1) { logger.log(Level.WARNING, "Could not save Sone: " + sone, ce1); @@ -782,6 +1032,17 @@ public class Core implements IdentityListener { options.getIntegerOption("InsertionDelay").set(configuration.getIntValue("Option/InsertionDelay").getValue(null)); + /* load known Sones. */ + int soneCounter = 0; + while (true) { + String knownSoneId = configuration.getStringValue("KnownSone/" + soneCounter++ + "/ID").getValue(null); + if (knownSoneId == null) { + break; + } + synchronized (newSones) { + knownSones.add(knownSoneId); + } + } } /** @@ -793,6 +1054,16 @@ public class Core implements IdentityListener { configuration.getIntValue("Option/InsertionDelay").setValue(options.getIntegerOption("InsertionDelay").getReal()); configuration.getBooleanValue("Option/ClearOnNextRestart").setValue(options.getBooleanOption("ClearOnNextRestart").getReal()); configuration.getBooleanValue("Option/ReallyClearOnNextRestart").setValue(options.getBooleanOption("ReallyClearOnNextRestart").getReal()); + + /* save known Sones. */ + int soneCounter = 0; + synchronized (newSones) { + for (String knownSoneId : knownSones) { + configuration.getStringValue("KnownSone/" + soneCounter++ + "/ID").setValue(knownSoneId); + } + configuration.getStringValue("KnownSone/" + soneCounter + "/ID").setValue(null); + } + } catch (ConfigurationException ce1) { logger.log(Level.SEVERE, "Could not store configuration!", ce1); } @@ -803,13 +1074,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); @@ -837,7 +1106,7 @@ public class Core implements IdentityListener { */ @Override public void ownIdentityRemoved(OwnIdentity ownIdentity) { - /* TODO */ + logger.log(Level.FINEST, "Removing OwnIdentity: " + ownIdentity); } /** @@ -853,8 +1122,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(); } /**