X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=a4b3569846e9438f1b762a63d2a5f6790a5ad8b6;hb=c8f518f638aa16cf37145561b709d28252de213a;hp=c9107993a2c5c41af62a9215937381d235789133;hpb=ccd98b291f132395ad87b2ff65d98d8237184be1;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 c910799..a4b3569 100644 --- a/src/main/java/net/pterodactylus/sone/core/Core.java +++ b/src/main/java/net/pterodactylus/sone/core/Core.java @@ -38,6 +38,8 @@ import net.pterodactylus.sone.data.Reply; import net.pterodactylus.sone.data.Sone; import net.pterodactylus.util.config.Configuration; import net.pterodactylus.util.config.ConfigurationException; +import net.pterodactylus.util.filter.Filter; +import net.pterodactylus.util.filter.Filters; import net.pterodactylus.util.logging.Logging; import net.pterodactylus.util.service.AbstractService; import freenet.client.FetchResult; @@ -50,6 +52,26 @@ import freenet.keys.FreenetURI; */ public class Core extends AbstractService { + /** + * Enumeration for the possible states of a {@link Sone}. + * + * @author David ‘Bombe’ Roden + */ + public enum SoneStatus { + + /** The Sone is unknown, i.e. not yet downloaded. */ + unknown, + + /** The Sone is idle, i.e. not being downloaded or inserted. */ + idle, + + /** The Sone is currently being inserted. */ + inserting, + + /** The Sone is currently being downloaded. */ + downloading, + } + /** The logger. */ private static final Logger logger = Logging.getLogger(Core.class); @@ -68,6 +90,9 @@ public class Core extends AbstractService { /** Sone inserters. */ private final Map soneInserters = new HashMap(); + /** The Sones’ statuses. */ + private final Map soneStatuses = Collections.synchronizedMap(new HashMap()); + /* various caches follow here. */ /** Cache for all known Sones. */ @@ -83,7 +108,7 @@ public class Core extends AbstractService { * Creates a new core. */ public Core() { - super("Sone Core"); + super("Sone Core", false); } // @@ -137,6 +162,7 @@ public class Core extends AbstractService { if (!soneCache.containsKey(soneId)) { Sone sone = new Sone(soneId); soneCache.put(soneId, sone); + setSoneStatus(sone, SoneStatus.unknown); } return soneCache.get(soneId); } @@ -151,7 +177,46 @@ public class Core extends AbstractService { } /** - * Creates a new post. + * Gets all known Sones that are not local Sones. + * + * @return All remote Sones + */ + public Collection getRemoteSones() { + return Filters.filteredCollection(getKnownSones(), new Filter() { + + @Override + @SuppressWarnings("synthetic-access") + public boolean filterObject(Sone object) { + return !localSones.contains(object); + } + }); + } + + /** + * Returns the status of the given Sone. + * + * @param sone + * The Sone to get the status for + * @return The status of the Sone + */ + public SoneStatus getSoneStatus(Sone sone) { + return soneStatuses.get(sone); + } + + /** + * Sets the status of the Sone. + * + * @param sone + * The Sone to set the status for + * @param soneStatus + * The status of the Sone + */ + public void setSoneStatus(Sone sone, SoneStatus soneStatus) { + soneStatuses.put(sone, soneStatus); + } + + /** + * Creates a new post and adds it to the given Sone. * * @param sone * The sone that creates the post @@ -164,7 +229,7 @@ public class Core extends AbstractService { } /** - * Creates a new post. + * Creates a new post and adds it to the given Sone. * * @param sone * The Sone that creates the post @@ -226,7 +291,10 @@ public class Core extends AbstractService { * The Sone to watch for updates */ public void addSone(Sone sone) { - soneDownloader.addSone(sone); + soneCache.put(sone.getId(), sone); + if (!localSones.contains(sone)) { + soneDownloader.addSone(sone); + } } /** @@ -237,7 +305,8 @@ public class Core extends AbstractService { */ public void addLocalSone(Sone sone) { if (localSones.add(sone)) { - SoneInserter soneInserter = new SoneInserter(freenetInterface, sone); + setSoneStatus(sone, SoneStatus.idle); + SoneInserter soneInserter = new SoneInserter(this, freenetInterface, sone); soneInserter.start(); soneInserters.put(sone, soneInserter); } @@ -253,7 +322,7 @@ public class Core extends AbstractService { * if a Sone error occurs */ public Sone createSone(String name) throws SoneException { - return createSone(name, null, null); + return createSone(name, "Sone-" + name, null, null); } /** @@ -263,6 +332,8 @@ public class Core extends AbstractService { * * @param name * The name of the Sone + * @param documentName + * The document name in the SSK * @param requestUri * The request URI of the Sone, or {@link NullPointerException} * to create a Sone at a random location @@ -273,7 +344,7 @@ public class Core extends AbstractService { * @throws SoneException * if a Sone error occurs */ - public Sone createSone(String name, String requestUri, String insertUri) throws SoneException { + public Sone createSone(String name, String documentName, String requestUri, String insertUri) throws SoneException { if ((name == null) || (name.trim().length() == 0)) { throw new SoneException(Type.INVALID_SONE_NAME); } @@ -290,7 +361,7 @@ public class Core extends AbstractService { Sone sone; try { logger.log(Level.FINEST, "Creating new Sone “%s” at %s (%s)…", new Object[] { name, finalRequestUri, finalInsertUri }); - sone = getSone(UUID.randomUUID().toString()).setName(name).setRequestUri(new FreenetURI(finalRequestUri).setKeyType("USK").setDocName("Sone-" + name)).setInsertUri(new FreenetURI(finalInsertUri).setKeyType("USK").setDocName("Sone-" + name)); + sone = getSone(UUID.randomUUID().toString()).setName(name).setRequestUri(new FreenetURI(finalRequestUri).setKeyType("USK").setDocName(documentName)).setInsertUri(new FreenetURI(finalInsertUri).setKeyType("USK").setDocName(documentName)); sone.setProfile(new Profile()); /* set modification counter to 1 so it is inserted immediately. */ sone.setModificationCounter(1); @@ -302,18 +373,84 @@ public class Core extends AbstractService { } /** - * Loads the Sone from the given request URI. + * Loads the Sone from the given request URI. The fetching of the data is + * performed in a new thread so this method returns immediately. * * @param requestUri * The request URI to load the Sone from */ - public void loadSone(String requestUri) { - try { - FetchResult fetchResult = freenetInterface.fetchUri(new FreenetURI(requestUri).setMetaString(new String[] { "sone.xml" })); - soneDownloader.parseSone(null, fetchResult); - } catch (MalformedURLException mue1) { - logger.log(Level.INFO, "Could not create URI from “" + requestUri + "”.", mue1); - } + public void loadSone(final String requestUri) { + loadSone(requestUri, null); + } + + /** + * Loads the Sone from the given request URI. The fetching of the data is + * performed in a new thread so this method returns immediately. If + * {@code insertUri} is not {@code null} the loaded Sone is converted into a + * local Sone and available using as any other local Sone. + * + * @param requestUri + * The request URI to load the Sone from + * @param insertUri + * The insert URI of the Sone + */ + public void loadSone(final String requestUri, final String insertUri) { + new Thread(new Runnable() { + + @Override + @SuppressWarnings("synthetic-access") + public void run() { + try { + FreenetURI realRequestUri = new FreenetURI(requestUri).setMetaString(new String[] { "sone.xml" }); + FetchResult fetchResult = freenetInterface.fetchUri(realRequestUri); + if (fetchResult == null) { + return; + } + Sone parsedSone = soneDownloader.parseSone(null, fetchResult, realRequestUri); + if (parsedSone != null) { + if (insertUri != null) { + parsedSone.setInsertUri(new FreenetURI(insertUri)); + addLocalSone(parsedSone); + } else { + addSone(parsedSone); + } + } + } catch (MalformedURLException mue1) { + logger.log(Level.INFO, "Could not create URI from “" + requestUri + "”.", mue1); + } + } + }, "Sone Downloader").start(); + } + + /** + * Loads and updates the given Sone. + * + * @param sone + * The Sone to load + */ + public void loadSone(final Sone sone) { + new Thread(new Runnable() { + + @Override + @SuppressWarnings("synthetic-access") + public void run() { + FreenetURI realRequestUri = sone.getRequestUri().setMetaString(new String[] { "sone.xml" }); + setSoneStatus(sone, SoneStatus.downloading); + try { + FetchResult fetchResult = freenetInterface.fetchUri(realRequestUri); + if (fetchResult == null) { + /* TODO - mark Sone as bad. */ + return; + } + Sone parsedSone = soneDownloader.parseSone(sone, fetchResult, realRequestUri); + if (parsedSone != null) { + addSone(parsedSone); + } + } finally { + setSoneStatus(sone, (sone.getTime() == 0) ? SoneStatus.unknown : SoneStatus.idle); + } + } + }, "Sone Downloader").start(); } /** @@ -385,6 +522,35 @@ public class Core extends AbstractService { return replies; } + /** + * Gets all Sones that like the given post. + * + * @param post + * The post to check for + * @return All Sones that like the post + */ + public Set getLikes(final Post post) { + return Filters.filteredSet(getSones(), new Filter() { + + @Override + public boolean filterObject(Sone sone) { + return sone.isLikedPostId(post.getId()); + } + }); + } + + /** + * Deletes the given reply. It is removed from its Sone and from the reply + * cache. + * + * @param reply + * The reply to remove + */ + public void deleteReply(Reply reply) { + reply.getSone().removeReply(reply); + replyCache.remove(reply.getId()); + } + // // SERVICE METHODS // @@ -430,6 +596,7 @@ public class Core extends AbstractService { break; } String name = configuration.getStringValue(sonePrefix + "/Name").getValue(null); + long time = configuration.getLongValue(sonePrefix + "/Time").getValue((long) 0); String insertUri = configuration.getStringValue(sonePrefix + "/InsertURI").getValue(null); String requestUri = configuration.getStringValue(sonePrefix + "/RequestURI").getValue(null); long modificationCounter = configuration.getLongValue(sonePrefix + "/ModificationCounter").getValue((long) 0); @@ -441,7 +608,7 @@ public class Core extends AbstractService { profile.setFirstName(firstName); profile.setMiddleName(middleName); profile.setLastName(lastName); - Sone sone = getSone(id).setName(name).setRequestUri(new FreenetURI(requestUri)).setInsertUri(new FreenetURI(insertUri)); + Sone sone = getSone(id).setName(name).setTime(time).setRequestUri(new FreenetURI(requestUri)).setInsertUri(new FreenetURI(insertUri)); sone.setProfile(profile); int postId = 0; do { @@ -450,7 +617,7 @@ public class Core extends AbstractService { if (id == null) { break; } - long time = configuration.getLongValue(postPrefix + "/Time").getValue(null); + time = configuration.getLongValue(postPrefix + "/Time").getValue((long) 0); String text = configuration.getStringValue(postPrefix + "/Text").getValue(null); Post post = getPost(id).setSone(sone).setTime(time).setText(text); sone.addPost(post); @@ -481,10 +648,31 @@ public class Core extends AbstractService { String friendKey = configuration.getStringValue(friendPrefix + "/Key").getValue(null); String friendName = configuration.getStringValue(friendPrefix + "/Name").getValue(null); friendSone.setRequestUri(new FreenetURI(friendKey)).setName(friendName); - soneDownloader.addSone(friendSone); sone.addFriend(friendSone); } + /* load blocked Sone IDs. */ + int blockedSoneCounter = 0; + while (true) { + String blockedSonePrefix = sonePrefix + "/BlockedSone." + blockedSoneCounter++; + String blockedSoneId = configuration.getStringValue(blockedSonePrefix + "/ID").getValue(null); + if (blockedSoneId == null) { + break; + } + sone.addBlockedSoneId(blockedSoneId); + } + + /* load liked post IDs. */ + int likedPostIdCounter = 0; + while (true) { + String likedPostIdPrefix = sonePrefix + "/LikedPostId." + likedPostIdCounter++; + String likedPostId = configuration.getStringValue(likedPostIdPrefix + "/ID").getValue(null); + if (likedPostId == null) { + break; + } + sone.addLikedPostId(likedPostId); + } + sone.setModificationCounter(modificationCounter); addLocalSone(sone); } catch (MalformedURLException mue1) { @@ -493,6 +681,28 @@ public class Core extends AbstractService { } while (true); logger.log(Level.INFO, "Loaded %d Sones.", getSones().size()); + /* load all known Sones. */ + int knownSonesCounter = 0; + while (true) { + String knownSonePrefix = "KnownSone." + knownSonesCounter++; + String knownSoneId = configuration.getStringValue(knownSonePrefix + "/ID").getValue(null); + if (knownSoneId == null) { + break; + } + String knownSoneName = configuration.getStringValue(knownSonePrefix + "/Name").getValue(null); + String knownSoneKey = configuration.getStringValue(knownSonePrefix + "/Key").getValue(null); + try { + getSone(knownSoneId).setName(knownSoneName).setRequestUri(new FreenetURI(knownSoneKey)); + } catch (MalformedURLException mue1) { + logger.log(Level.WARNING, "Could not create Sone from requestUri (“" + knownSoneKey + "”)!", mue1); + } + } + + /* load all remote Sones. */ + for (Sone remoteSone : getRemoteSones()) { + loadSone(remoteSone); + } + logger.exiting(Core.class.getName(), "loadConfiguration()"); } @@ -509,6 +719,7 @@ public class Core extends AbstractService { String sonePrefix = "Sone/Sone." + soneId++; configuration.getStringValue(sonePrefix + "/ID").setValue(sone.getId()); configuration.getStringValue(sonePrefix + "/Name").setValue(sone.getName()); + configuration.getLongValue(sonePrefix + "/Time").setValue(sone.getTime()); configuration.getStringValue(sonePrefix + "/RequestURI").setValue(sone.getRequestUri().toString()); configuration.getStringValue(sonePrefix + "/InsertURI").setValue(sone.getInsertUri().toString()); configuration.getLongValue(sonePrefix + "/ModificationCounter").setValue(sone.getModificationCounter()); @@ -547,10 +758,37 @@ public class Core extends AbstractService { /* write null ID as terminator. */ configuration.getStringValue(sonePrefix + "/Friend." + friendId + "/ID").setValue(null); + /* write all blocked Sones. */ + int blockedSoneCounter = 0; + for (String blockedSoneId : sone.getBlockedSoneIds()) { + String blockedSonePrefix = sonePrefix + "/BlockedSone." + blockedSoneCounter++; + configuration.getStringValue(blockedSonePrefix + "/ID").setValue(blockedSoneId); + } + configuration.getStringValue(sonePrefix + "/BlockedSone." + blockedSoneCounter + "/ID").setValue(null); + + /* write all liked posts. */ + int likedPostIdCounter = 0; + for (String soneLikedPostId : sone.getLikedPostIds()) { + String likedPostIdPrefix = sonePrefix + "/LikedPostId." + likedPostIdCounter++; + configuration.getStringValue(likedPostIdPrefix + "/ID").setValue(soneLikedPostId); + } + configuration.getStringValue(sonePrefix + "/LikedPostId." + likedPostIdCounter + "/ID").setValue(null); + } /* write null ID as terminator. */ configuration.getStringValue("Sone/Sone." + soneId + "/ID").setValue(null); + /* write all known Sones. */ + int knownSonesCounter = 0; + for (Sone knownSone : getRemoteSones()) { + String knownSonePrefix = "KnownSone." + knownSonesCounter++; + configuration.getStringValue(knownSonePrefix + "/ID").setValue(knownSone.getId()); + configuration.getStringValue(knownSonePrefix + "/Name").setValue(knownSone.getName()); + configuration.getStringValue(knownSonePrefix + "/Key").setValue(knownSone.getRequestUri().toString()); + /* TODO - store all known stuff? */ + } + configuration.getStringValue("KnownSone." + knownSonesCounter + "/ID").setValue(null); + } catch (ConfigurationException ce1) { logger.log(Level.WARNING, "Could not store configuration!", ce1); }