import net.pterodactylus.sone.core.SoneException.Type;
import net.pterodactylus.sone.data.Post;
-import net.pterodactylus.sone.data.PostShell;
import net.pterodactylus.sone.data.Profile;
import net.pterodactylus.sone.data.Reply;
-import net.pterodactylus.sone.data.ReplyShell;
-import net.pterodactylus.sone.data.Shell;
-import net.pterodactylus.sone.data.ShellCache;
import net.pterodactylus.sone.data.Sone;
-import net.pterodactylus.sone.data.SoneShell;
import net.pterodactylus.util.config.Configuration;
import net.pterodactylus.util.config.ConfigurationException;
import net.pterodactylus.util.logging.Logging;
/** Interface to freenet. */
private FreenetInterface freenetInterface;
+ /** The Sone downloader. */
+ private SoneDownloader soneDownloader;
+
/** The local Sones. */
private final Set<Sone> localSones = new HashSet<Sone>();
/* various caches follow here. */
/** Cache for all known Sones. */
- private final ShellCache<Sone> soneCache = new ShellCache<Sone>(SoneShell.creator);
+ private final Map<String, Sone> soneCache = new HashMap<String, Sone>();
/** Cache for all known posts. */
- private final ShellCache<Post> postCache = new ShellCache<Post>(PostShell.creator);
+ private final Map<String, Post> postCache = new HashMap<String, Post>();
/** Cache for all known replies. */
- private final ShellCache<Reply> replyCache = new ShellCache<Reply>(ReplyShell.creator);
+ private final Map<String, Reply> replyCache = new HashMap<String, Reply>();
/**
* Creates a new core.
*/
public Core freenetInterface(FreenetInterface freenetInterface) {
this.freenetInterface = freenetInterface;
+ soneDownloader = new SoneDownloader(freenetInterface);
return this;
}
}
/**
- * Returns a Sone or a {@link Shell} around one for the given ID.
+ * 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, or a {@link Shell} around one
+ * @return The Sone
*/
public Sone getSone(String soneId) {
- Sone sone = soneCache.get(soneId);
- if (sone instanceof SoneShell) {
- soneCache.put(soneId, sone = ((SoneShell) sone).getShelled());
+ if (!soneCache.containsKey(soneId)) {
+ Sone sone = new Sone(soneId);
+ soneCache.put(soneId, sone);
}
- return sone;
+ return soneCache.get(soneId);
}
//
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 addRemoteSone(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
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).setKeyType("USK").setDocName("Sone-" + name), new FreenetURI(finalInsertUri).setKeyType("USK").setDocName("Sone-" + name));
+ 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);
*/
@Override
protected void serviceStop() {
+ soneDownloader.stop();
/* stop all Sone inserters. */
for (SoneInserter soneInserter : soneInserters.values()) {
soneInserter.stop();
profile.setFirstName(firstName);
profile.setMiddleName(middleName);
profile.setLastName(lastName);
- Sone sone = new Sone(UUID.fromString(id), name, 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;
}
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);
+ Post post = new Post(id, sone, time, text);
postCache.put(id, post);
sone.addPost(post);
} while (true);
if (replyId == null) {
break;
}
- Sone replySone = soneCache.get(configuration.getStringValue(replyPrefix + "/Sone/ID").getValue(null));
+ 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);
- if (replySone instanceof SoneShell) {
- ((SoneShell) replySone).setRequestUri(new FreenetURI(replySoneKey)).setName(replySoneName);
- }
+ 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 = new ReplyShell().setSone(replySone).setPost(replyPost).setTime(replyTime).setText(replyText).getShelled();
+ Reply reply = new Reply(replyId, replySone, replyPost, replyTime, 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 = soneCache.get(friendId);
+ String friendKey = configuration.getStringValue(friendPrefix + "/Key").getValue(null);
+ String friendName = configuration.getStringValue(friendPrefix + "/Name").getValue(null);
+ friendSone.setRequestUri(new FreenetURI(friendKey)).setName(friendName);
+ addRemoteSone(friendSone);
+ sone.addFriend(sone);
+ }
+
sone.setModificationCounter(modificationCounter);
addSone(sone);
} catch (MalformedURLException mue1) {
}
/* 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);
projects / Sone.git / blobdiff