X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=459431ced7ee5dc24b9e8f8a775f7ead52aa48cf;hb=94041feaf2a141b8c75725301f06d7e4bc617a12;hp=ca278dde76ec5901eea13a7c79c71a91bc2b6390;hpb=625d29060bba56be82e5d34890b5278eeff104c0;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 ca278dd..459431c 100644 --- a/src/main/java/net/pterodactylus/sone/core/Core.java +++ b/src/main/java/net/pterodactylus/sone/core/Core.java @@ -21,7 +21,6 @@ import java.net.MalformedURLException; import java.util.Collections; import java.util.HashMap; import java.util.HashSet; -import java.util.List; import java.util.Map; import java.util.Set; import java.util.UUID; @@ -29,14 +28,14 @@ import java.util.logging.Level; import java.util.logging.Logger; import net.pterodactylus.sone.core.SoneException.Type; +import net.pterodactylus.sone.data.Post; import net.pterodactylus.sone.data.Profile; +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.logging.Logging; import net.pterodactylus.util.service.AbstractService; -import net.pterodactylus.util.text.StringEscaper; -import net.pterodactylus.util.text.TextException; import freenet.keys.FreenetURI; /** @@ -55,12 +54,26 @@ public class Core extends AbstractService { /** Interface to freenet. */ private FreenetInterface freenetInterface; + /** The Sone downloader. */ + private SoneDownloader soneDownloader; + /** The local Sones. */ private final Set localSones = new HashSet(); /** Sone inserters. */ private final Map soneInserters = new HashMap(); + /* various caches follow here. */ + + /** Cache for all known Sones. */ + private final Map soneCache = new HashMap(); + + /** Cache for all known posts. */ + private final Map postCache = new HashMap(); + + /** Cache for all known replies. */ + private final Map replyCache = new HashMap(); + /** * Creates a new core. */ @@ -93,6 +106,8 @@ public class Core extends AbstractService { */ public Core freenetInterface(FreenetInterface freenetInterface) { this.freenetInterface = freenetInterface; + soneDownloader = new SoneDownloader(this, freenetInterface); + soneDownloader.start(); return this; } @@ -105,6 +120,50 @@ public class Core extends AbstractService { return Collections.unmodifiableSet(localSones); } + /** + * Returns the Sone with the given ID, or an empty Sone that has been + * initialized with the given ID. + * + * @param soneId + * The ID of the Sone + * @return The Sone + */ + public Sone getSone(String soneId) { + if (!soneCache.containsKey(soneId)) { + Sone sone = new Sone(soneId); + soneCache.put(soneId, sone); + } + return soneCache.get(soneId); + } + + /** + * Creates a new post. + * + * @param sone + * The sone that creates the post + * @param text + * The text of the post + * @return The created post + */ + public Post createPost(Sone sone, String text) { + return createPost(sone, System.currentTimeMillis(), text); + } + + /** + * Creates a new post. + * + * @param sone + * The Sone that creates the post + * @param time + * The time of the post + * @param text + * The text of the post + * @return The created post + */ + public Post createPost(Sone sone, long time, String text) { + return getPost(UUID.randomUUID().toString()).setSone(sone).setTime(time).setText(text); + } + // // ACTIONS // @@ -115,15 +174,30 @@ public class Core extends AbstractService { * @param sone * The Sone to add */ - public void addSone(Sone sone) { + public void addLocalSone(Sone sone) { if (localSones.add(sone)) { + soneCache.put(sone.getId(), sone); SoneInserter soneInserter = new SoneInserter(freenetInterface, sone); soneInserter.start(); + soneDownloader.addSone(sone); soneInserters.put(sone, soneInserter); } } /** + * Adds a remote Sone so that it is watched for updates. + * + * @param sone + * The sone to watch + */ + public void addSone(Sone sone) { + if (!soneCache.containsKey(sone.getId())) { + soneCache.put(sone.getId(), sone); + } + soneDownloader.addSone(sone); + } + + /** * Creates a new Sone at a random location. * * @param name @@ -170,15 +244,14 @@ 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 = new Sone(UUID.randomUUID(), name, new FreenetURI(finalRequestUri), new FreenetURI(finalInsertUri)); + sone = new Sone(UUID.randomUUID().toString()).setName(name).setRequestUri(new FreenetURI(finalRequestUri).setKeyType("USK").setDocName("Sone-" + name)).setInsertUri(new FreenetURI(finalInsertUri).setKeyType("USK").setDocName("Sone-" + name)); sone.setProfile(new Profile()); /* set modification counter to 1 so it is inserted immediately. */ sone.setModificationCounter(1); - addSone(sone); + addLocalSone(sone); } catch (MalformedURLException mue1) { throw new SoneException(Type.INVALID_URI); } - localSones.add(sone); return sone; } @@ -194,6 +267,36 @@ public class Core extends AbstractService { localSones.remove(sone); } + /** + * Returns the post with the given ID. If no post exists yet with the given + * ID, a new post is returned. + * + * @param postId + * The ID of the post + * @return The post + */ + public Post getPost(String postId) { + if (!postCache.containsKey(postId)) { + postCache.put(postId, new Post(postId)); + } + return postCache.get(postId); + } + + /** + * Returns the reply with the given ID. If no reply exists yet with the + * given ID, a new reply is returned. + * + * @param replyId + * The ID of the reply + * @return The reply + */ + public Reply getReply(String replyId) { + if (!replyCache.containsKey(replyId)) { + replyCache.put(replyId, new Reply(replyId)); + } + return replyCache.get(replyId); + } + // // SERVICE METHODS // @@ -211,6 +314,7 @@ public class Core extends AbstractService { */ @Override protected void serviceStop() { + soneDownloader.stop(); /* stop all Sone inserters. */ for (SoneInserter soneInserter : soneInserters.values()) { soneInserter.stop(); @@ -228,42 +332,83 @@ public class Core extends AbstractService { private void loadConfiguration() { logger.entering(Core.class.getName(), "loadConfiguration()"); - /* get names of all local Sones. */ - String allSoneNamesString = configuration.getStringValue("Sone/Names").getValue(null); - if (allSoneNamesString == null) { - allSoneNamesString = ""; - } - List allSoneNames; - try { - allSoneNames = StringEscaper.parseLine(allSoneNamesString); - } catch (TextException te1) { - logger.log(Level.WARNING, "Could not parse Sone names: “" + allSoneNamesString + "”", te1); - allSoneNames = Collections.emptyList(); - } - /* parse local Sones. */ - logger.log(Level.INFO, "Loading %d Sones…", allSoneNames.size()); - for (String soneName : allSoneNames) { - String id = configuration.getStringValue("Sone/Name." + soneName + "/ID").getValue(null); - String insertUri = configuration.getStringValue("Sone/Name." + soneName + "/InsertURI").getValue(null); - String requestUri = configuration.getStringValue("Sone/Name." + soneName + "/RequestURI").getValue(null); - long modificationCounter = configuration.getLongValue("Sone/Name." + soneName + "/ModificationCounter").getValue((long) 0); - String firstName = configuration.getStringValue("Sone/Name." + soneName + "/Profile/FirstName").getValue(null); - String middleName = configuration.getStringValue("Sone/Name." + soneName + "/Profile/MiddleName").getValue(null); - String lastName = configuration.getStringValue("Sone/Name." + soneName + "/Profile/LastName").getValue(null); + logger.log(Level.INFO, "Loading Sones…"); + int soneId = 0; + do { + String sonePrefix = "Sone/Sone." + soneId++; + String id = configuration.getStringValue(sonePrefix + "/ID").getValue(null); + if (id == null) { + break; + } + String name = configuration.getStringValue(sonePrefix + "/Name").getValue(null); + 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); + String firstName = configuration.getStringValue(sonePrefix + "/Profile/FirstName").getValue(null); + String middleName = configuration.getStringValue(sonePrefix + "/Profile/MiddleName").getValue(null); + String lastName = configuration.getStringValue(sonePrefix + "/Profile/LastName").getValue(null); try { Profile profile = new Profile(); profile.setFirstName(firstName); profile.setMiddleName(middleName); profile.setLastName(lastName); - Sone sone = new Sone(UUID.fromString(id), soneName, new FreenetURI(requestUri), new FreenetURI(insertUri)); + Sone sone = new Sone(id).setName(name).setRequestUri(new FreenetURI(requestUri)).setInsertUri(new FreenetURI(insertUri)); + soneCache.put(id, sone); sone.setProfile(profile); + int postId = 0; + do { + String postPrefix = sonePrefix + "/Post." + postId++; + id = configuration.getStringValue(postPrefix + "/ID").getValue(null); + if (id == null) { + break; + } + long time = configuration.getLongValue(postPrefix + "/Time").getValue(null); + String text = configuration.getStringValue(postPrefix + "/Text").getValue(null); + Post post = getPost(id).setSone(sone).setTime(time).setText(text); + sone.addPost(post); + } while (true); + int replyCounter = 0; + do { + String replyPrefix = sonePrefix + "/Reply." + replyCounter++; + String replyId = configuration.getStringValue(replyPrefix + "/ID").getValue(null); + if (replyId == null) { + break; + } + Sone replySone = getSone(configuration.getStringValue(replyPrefix + "/Sone/ID").getValue(null)); + String replySoneKey = configuration.getStringValue(replyPrefix + "/Sone/Key").getValue(null); + String replySoneName = configuration.getStringValue(replyPrefix + "/Sone/Name").getValue(null); + replySone.setRequestUri(new FreenetURI(replySoneKey)).setName(replySoneName); + Post replyPost = postCache.get(configuration.getStringValue(replyPrefix + "/Post").getValue(null)); + long replyTime = configuration.getLongValue(replyPrefix + "/Time").getValue(null); + String replyText = configuration.getStringValue(replyPrefix + "/Text").getValue(null); + Reply reply = getReply(replyId).setSone(replySone).setPost(replyPost).setTime(replyTime).setText(replyText); + replyCache.put(replyId, reply); + } while (true); + + /* load friends. */ + int friendCounter = 0; + while (true) { + String friendPrefix = sonePrefix + "/Friend." + friendCounter++; + String friendId = configuration.getStringValue(friendPrefix + "/ID").getValue(null); + if (friendId == null) { + break; + } + Sone friendSone = getSone(friendId); + String friendKey = configuration.getStringValue(friendPrefix + "/Key").getValue(null); + String friendName = configuration.getStringValue(friendPrefix + "/Name").getValue(null); + friendSone.setRequestUri(new FreenetURI(friendKey)).setName(friendName); + addSone(friendSone); + sone.addFriend(sone); + } + sone.setModificationCounter(modificationCounter); - addSone(sone); + addLocalSone(sone); } catch (MalformedURLException mue1) { logger.log(Level.WARNING, "Could not create Sone from requestUri (“" + requestUri + "”) and insertUri (“" + insertUri + "”)!", mue1); } - } + } while (true); + logger.log(Level.INFO, "Loaded %d Sones.", getSones().size()); logger.exiting(Core.class.getName(), "loadConfiguration()"); } @@ -272,30 +417,60 @@ public class Core extends AbstractService { * Saves the configuraiton. */ private void saveConfiguration() { - - /* get the names of all Sones. */ - Set soneNames = new HashSet(); - for (Sone sone : localSones) { - soneNames.add(sone.getName()); - } - String soneNamesString = StringEscaper.escapeWords(soneNames); - - logger.log(Level.INFO, "Storing %d Sones…", soneNames.size()); + Set sones = getSones(); + logger.log(Level.INFO, "Storing %d Sones…", sones.size()); try { - /* store names of all Sones. */ - configuration.getStringValue("Sone/Names").setValue(soneNamesString); - /* store all Sones. */ + int soneId = 0; for (Sone sone : localSones) { - configuration.getStringValue("Sone/Name." + sone.getName() + "/ID").setValue(sone.getId()); - configuration.getStringValue("Sone/Name." + sone.getName() + "/RequestURI").setValue(sone.getRequestUri().toString()); - configuration.getStringValue("Sone/Name." + sone.getName() + "/InsertURI").setValue(sone.getInsertUri().toString()); - configuration.getLongValue("Sone/Name." + sone.getName() + "/ModificationCounter").setValue(sone.getModificationCounter()); + String sonePrefix = "Sone/Sone." + soneId++; + configuration.getStringValue(sonePrefix + "/ID").setValue(sone.getId()); + configuration.getStringValue(sonePrefix + "/Name").setValue(sone.getName()); + configuration.getStringValue(sonePrefix + "/RequestURI").setValue(sone.getRequestUri().toString()); + configuration.getStringValue(sonePrefix + "/InsertURI").setValue(sone.getInsertUri().toString()); + configuration.getLongValue(sonePrefix + "/ModificationCounter").setValue(sone.getModificationCounter()); Profile profile = sone.getProfile(); - configuration.getStringValue("Sone/Name." + sone.getName() + "/Profile/FirstName").setValue(profile.getFirstName()); - configuration.getStringValue("Sone/Name." + sone.getName() + "/Profile/MiddleName").setValue(profile.getMiddleName()); - configuration.getStringValue("Sone/Name." + sone.getName() + "/Profile/LastName").setValue(profile.getLastName()); + configuration.getStringValue(sonePrefix + "/Profile/FirstName").setValue(profile.getFirstName()); + configuration.getStringValue(sonePrefix + "/Profile/MiddleName").setValue(profile.getMiddleName()); + configuration.getStringValue(sonePrefix + "/Profile/LastName").setValue(profile.getLastName()); + int postId = 0; + for (Post post : sone.getPosts()) { + String postPrefix = sonePrefix + "/Post." + postId++; + configuration.getStringValue(postPrefix + "/ID").setValue(post.getId()); + configuration.getLongValue(postPrefix + "/Time").setValue(post.getTime()); + configuration.getStringValue(postPrefix + "/Text").setValue(post.getText()); + } + /* write null ID as terminator. */ + configuration.getStringValue(sonePrefix + "/Post." + postId + "/ID").setValue(null); + + int replyId = 0; + for (Reply reply : sone.getReplies()) { + String replyPrefix = sonePrefix + "/Reply." + replyId++; + configuration.getStringValue(replyPrefix + "/ID").setValue(reply.getId()); + configuration.getStringValue(replyPrefix + "/Sone/ID").setValue(reply.getSone().getId()); + configuration.getStringValue(replyPrefix + "/Sone/Key").setValue(reply.getSone().getRequestUri().toString()); + configuration.getStringValue(replyPrefix + "/Sone/Name").setValue(reply.getSone().getName()); + configuration.getStringValue(replyPrefix + "/Post").setValue(reply.getPost().getId()); + configuration.getLongValue(replyPrefix + "/Time").setValue(reply.getTime()); + configuration.getStringValue(replyPrefix + "/Text").setValue(reply.getText()); + } + /* write null ID as terminator. */ + configuration.getStringValue(sonePrefix + "/Reply." + replyId + "/ID").setValue(null); + + int friendId = 0; + for (Sone friend : sone.getFriends()) { + String friendPrefix = sonePrefix + "/Friend." + friendId++; + configuration.getStringValue(friendPrefix + "/ID").setValue(friend.getId()); + configuration.getStringValue(friendPrefix + "/Key").setValue(friend.getRequestUri().toString()); + configuration.getStringValue(friendPrefix + "/Name").setValue(friend.getName()); + } + /* write null ID as terminator. */ + configuration.getStringValue(sonePrefix + "/Friend." + friendId + "/ID").setValue(null); + } + /* write null ID as terminator. */ + configuration.getStringValue("Sone/Sone." + soneId + "/ID").setValue(null); + } catch (ConfigurationException ce1) { logger.log(Level.WARNING, "Could not store configuration!", ce1); }