X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=83f7e6c523d13a5caf43db8e08cd6092e35ccde9;hb=d9ff777c483f3fea071a9cf8dd7c40e792fd8f1e;hp=e44cf55620af31f5307025f0b8f7664e7d9b75be;hpb=16928d48cfc6f698b00c37efb689ba721a6ad6a9;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 e44cf55..83f7e6c 100644 --- a/src/main/java/net/pterodactylus/sone/core/Core.java +++ b/src/main/java/net/pterodactylus/sone/core/Core.java @@ -389,7 +389,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); } } @@ -436,10 +436,6 @@ 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 = getLocalSone(ownIdentity.getId()).setIdentity(ownIdentity).setInsertUri(new FreenetURI(ownIdentity.getInsertUri())).setRequestUri(new FreenetURI(ownIdentity.getRequestUri())); @@ -454,15 +450,7 @@ public class Core implements IdentityListener { soneInserters.put(sone, soneInserter); soneInserter.start(); setSoneStatus(sone, SoneStatus.idle); - new Thread(new Runnable() { - - @Override - @SuppressWarnings("synthetic-access") - public void run() { - soneDownloader.fetchSone(sone); - } - - }, "Sone Downloader").start(); + loadSone(sone); return sone; } } @@ -497,14 +485,20 @@ 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()); - } - Sone sone = new Sone(identity); - sone.setRequestUri(getSoneUri(identity.getRequestUri(), identity.getProperty("Sone.LatestEdition"))); + final Sone sone = getRemoteSone(identity.getId()).setIdentity(identity); + sone.setRequestUri(getSoneUri(identity.getRequestUri())); + sone.setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0)); remoteSones.put(identity.getId(), sone); soneDownloader.addSone(sone); + new Thread(new Runnable() { + + @Override + @SuppressWarnings("synthetic-access") + public void run() { + soneDownloader.fetchSone(sone); + } + + }, "Sone Downloader").start(); setSoneStatus(sone, SoneStatus.idle); return sone; } @@ -571,9 +565,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; + } + Boolean friendLocal = configuration.getBooleanValue(sonePrefix + "/Friends/" + friends.size() + "/Local").getValue(null); + if (friendLocal == null) { + logger.log(Level.WARNING, "Invalid friend found, aborting load!"); + return; + } + friends.add(friendLocal ? getLocalSone(friendId) : getRemoteSone(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); + } } /** @@ -599,6 +713,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(); @@ -843,13 +958,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); @@ -877,7 +990,7 @@ public class Core implements IdentityListener { */ @Override public void ownIdentityRemoved(OwnIdentity ownIdentity) { - /* TODO */ + logger.log(Level.FINEST, "Removing OwnIdentity: " + ownIdentity); } /** @@ -893,8 +1006,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(); } /**