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;
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.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;
/**
/** The local Sones. */
private final Set<Sone> localSones = new HashSet<Sone>();
+ /** Sone inserters. */
+ private final Map<Sone, SoneInserter> soneInserters = new HashMap<Sone, SoneInserter>();
+
/**
* Creates a new core.
*/
*
* @return The local Sones
*/
- public Set<Sone> localSones() {
+ public Set<Sone> getSones() {
return Collections.unmodifiableSet(localSones);
}
//
/**
+ * Adds the given Sone.
+ *
+ * @param sone
+ * The Sone to add
+ */
+ public void addSone(Sone sone) {
+ if (localSones.add(sone)) {
+ SoneInserter soneInserter = new SoneInserter(freenetInterface, sone);
+ soneInserter.start();
+ soneInserters.put(sone, soneInserter);
+ }
+ }
+
+ /**
* Creates a new Sone at a random location.
*
* @param name
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.setProfile(new Profile());
+ /* set modification counter to 1 so it is inserted immediately. */
+ sone.setModificationCounter(1);
+ addSone(sone);
} catch (MalformedURLException mue1) {
throw new SoneException(Type.INVALID_URI);
}
* The sone to delete
*/
public void deleteSone(Sone sone) {
+ SoneInserter soneInserter = soneInserters.remove(sone);
+ soneInserter.stop();
localSones.remove(sone);
}
*/
@Override
protected void serviceStop() {
+ /* stop all Sone inserters. */
+ for (SoneInserter soneInserter : soneInserters.values()) {
+ soneInserter.stop();
+ }
saveConfiguration();
}
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<String> 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);
+ 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 {
- localSones.add(new Sone(UUID.fromString(id), soneName, new FreenetURI(requestUri), new FreenetURI(insertUri)));
+ Profile profile = new Profile();
+ profile.setFirstName(firstName);
+ profile.setMiddleName(middleName);
+ profile.setLastName(lastName);
+ Sone sone = new Sone(UUID.fromString(id), name, new FreenetURI(requestUri), new FreenetURI(insertUri));
+ 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 = new Post(UUID.fromString(id), sone, time, text);
+ sone.addPost(post);
+ } while (true);
+ sone.setModificationCounter(modificationCounter);
+ addSone(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()");
}
* Saves the configuraiton.
*/
private void saveConfiguration() {
-
- /* get the names of all Sones. */
- Set<String> soneNames = new HashSet<String>();
- for (Sone sone : localSones) {
- soneNames.add(sone.getName());
- }
- String soneNamesString = StringEscaper.escapeWords(soneNames);
-
- logger.log(Level.INFO, "Storing %d Sones…", soneNames.size());
+ Set<Sone> 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());
+ 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(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());
+ }
}
} catch (ConfigurationException ce1) {
logger.log(Level.WARNING, "Could not store configuration!", ce1);
projects / Sone.git / blobdiff