import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Predicates.not;
import static com.google.common.collect.FluentIterable.from;
+import static java.lang.String.format;
import static net.pterodactylus.sone.data.Identified.GET_ID;
import static net.pterodactylus.sone.data.Sone.LOCAL_SONE_FILTER;
import static net.pterodactylus.sone.data.Sone.TO_FREENET_URI;
/* synchronize access on this on sones. */
private final Map<Sone, SoneRescuer> soneRescuers = new HashMap<Sone, SoneRescuer>();
- /** All Sones. */
- /* synchronize access on this on itself. */
- private final Map<String, Sone> sones = new HashMap<String, Sone>();
-
/** All known Sones. */
private final Set<String> knownSones = new HashSet<String>();
public SoneRescuer getSoneRescuer(Sone sone) {
checkNotNull(sone, "sone must not be null");
checkArgument(sone.isLocal(), "sone must be local");
- synchronized (sones) {
+ synchronized (soneRescuers) {
SoneRescuer soneRescuer = soneRescuers.get(sone);
if (soneRescuer == null) {
soneRescuer = new SoneRescuer(this, soneDownloader, sone);
@Override
public Collection<Sone> getSones() {
- synchronized (sones) {
- return ImmutableSet.copyOf(sones.values());
- }
+ return database.getSones();
}
@Override
@Override
public Optional<Sone> getSone(String id) {
- synchronized (sones) {
- return Optional.fromNullable(sones.get(id));
- }
+ return database.getSone(id);
}
@Override
public Collection<Sone> getLocalSones() {
- synchronized (sones) {
- return from(sones.values()).filter(new Predicate<Sone>() {
-
- @Override
- public boolean apply(Sone sone) {
- return sone.isLocal();
- }
- }).toSet();
- }
+ return database.getLocalSones();
}
/**
@Override
public Collection<Sone> getRemoteSones() {
- synchronized (sones) {
- return from(sones.values()).filter(new Predicate<Sone>() {
-
- @Override
- public boolean apply(Sone sone) {
- return !sone.isLocal();
- }
- }).toSet();
- }
+ return database.getRemoteSones();
}
/**
logger.log(Level.WARNING, "Given OwnIdentity is null!");
return null;
}
- logger.info(String.format("Adding Sone from OwnIdentity: %s", ownIdentity));
- synchronized (sones) {
+ logger.info(format("Adding Sone from OwnIdentity: %s", ownIdentity));
+ synchronized (soneRescuers) {
final Sone sone;
sone = database.newSoneBuilder().by(ownIdentity.getId()).local().using(new Client("Sone", SonePlugin.VERSION.toString())).build(Optional.<SoneCreated>absent());
sone.modify().setLatestEdition(Numbers.safeParseLong(ownIdentity.getProperty("Sone.LatestEdition"), (long) 0)).update();
sone.setKnown(true);
/* TODO - load posts ’n stuff */
- sones.put(ownIdentity.getId(), sone);
+ database.storeSone(sone);
final SoneInserter soneInserter = new SoneInserter(this, eventBus, freenetInterface, sone);
soneInserters.put(sone, soneInserter);
sone.setStatus(SoneStatus.idle);
*/
public Sone createSone(OwnIdentity ownIdentity) {
if (!webOfTrustUpdater.addContextWait(ownIdentity, "Sone")) {
- logger.log(Level.SEVERE, String.format("Could not add “Sone” context to own identity: %s", ownIdentity));
+ logger.log(Level.SEVERE, format("Could not add “Sone” context to own identity: %s", ownIdentity));
return null;
}
Sone sone = addLocalSone(ownIdentity);
logger.log(Level.WARNING, "Given Identity is null!");
return null;
}
- synchronized (sones) {
+ synchronized (soneRescuers) {
Optional<Sone> existingSone = database.getSone(identity.getId());
if (existingSone.isPresent() && existingSone.get().isLocal()) {
return existingSone.get();
}
boolean newSone = !existingSone.isPresent();
- final Sone sone = newSone ? database.newSoneBuilder().by(identity.getId()).build(Optional.<SoneCreated>absent()) : existingSone.get();
+ final Sone sone = newSone ? database.newSoneBuilder().by(identity.getId()).using(new Client("Sone", SonePlugin.VERSION.toString())).build(Optional.<SoneCreated>absent()) : existingSone.get();
sone.modify().setLatestEdition(Numbers.safeParseLong(identity.getProperty("Sone.LatestEdition"), (long) 0)).update();
if (newSone) {
synchronized (knownSones) {
Optional<Sone> storedSone = getSone(sone.getId());
if (storedSone.isPresent()) {
if (!soneRescueMode && !(sone.getTime() > storedSone.get().getTime())) {
- logger.log(Level.FINE, String.format("Downloaded Sone %s is not newer than stored Sone %s.", sone, storedSone));
+ logger.log(Level.FINE, format("Downloaded Sone %s is not newer than stored Sone %s.", sone, storedSone));
return;
}
/* find removed posts. */
continue;
}
if (newPost.getTime() < getSoneFollowingTime(sone)) {
- newPost.setKnown(true);
+ newPost.setKnown();
} else if (!newPost.isKnown()) {
eventBus.post(new NewPostFoundEvent(newPost));
}
database.storeImage(image);
}
}
- synchronized (sones) {
+ synchronized (soneRescuers) {
sone.setOptions(storedSone.get().getOptions());
sone.setKnown(storedSone.get().isKnown());
sone.setStatus((sone.getTime() == 0) ? SoneStatus.unknown : SoneStatus.idle);
soneInserters.get(storedSone.get()).setSone(sone);
touchConfiguration();
}
- sones.put(sone.getId(), sone);
+ database.storeSone(sone);
}
}
}
*/
public void deleteSone(Sone sone) {
if (!(sone.getIdentity() instanceof OwnIdentity)) {
- logger.log(Level.WARNING, String.format("Tried to delete Sone of non-own identity: %s", sone));
+ logger.log(Level.WARNING, format("Tried to delete Sone of non-own identity: %s", sone));
return;
}
- synchronized (sones) {
+ synchronized (soneRescuers) {
if (!getLocalSones().contains(sone)) {
- logger.log(Level.WARNING, String.format("Tried to delete non-local Sone: %s", sone));
+ logger.log(Level.WARNING, format("Tried to delete non-local Sone: %s", sone));
return;
}
- sones.remove(sone.getId());
SoneInserter soneInserter = soneInserters.remove(sone);
soneInserter.stop();
}
*/
public void loadSone(Sone sone) {
if (!sone.isLocal()) {
- logger.log(Level.FINE, String.format("Tried to load non-local Sone: %s", sone));
+ logger.log(Level.FINE, format("Tried to load non-local Sone: %s", sone));
return;
}
- logger.info(String.format("Loading local Sone: %s", sone));
+ logger.info(format("Loading local Sone: %s", sone));
/* initialize options. */
sone.getOptions().addBooleanOption("AutoFollow", new DefaultOption<Boolean>(false));
}
database.storePosts(sone, posts);
for (Post post : posts) {
- post.setKnown(true);
+ post.setKnown();
}
database.storePostReplies(sone, replies);
for (PostReply reply : replies) {
reply.modify().setKnown().update(Optional.<ReplyUpdated<PostReply>>absent());
}
- logger.info(String.format("Sone loaded successfully: %s", sone));
+ logger.info(format("Sone loaded successfully: %s", sone));
}
/**
*/
public void deletePost(Post post) {
if (!post.getSone().isLocal()) {
- logger.log(Level.WARNING, String.format("Tried to delete post of non-local Sone: %s", post.getSone()));
+ logger.log(Level.WARNING, format("Tried to delete post of non-local Sone: %s", post.getSone()));
return;
}
database.removePost(post);
* The post to mark as known
*/
public void markPostKnown(Post post) {
- post.setKnown(true);
+ post.setKnown();
eventBus.post(new MarkPostKnownEvent(post));
touchConfiguration();
for (PostReply reply : post.getReplies()) {
public void deleteReply(PostReply reply) {
Sone sone = reply.getSone();
if (!sone.isLocal()) {
- logger.log(Level.FINE, String.format("Tried to delete non-local reply: %s", reply));
+ logger.log(Level.FINE, format("Tried to delete non-local reply: %s", reply));
return;
}
postReplyUpdated().get().replyUpdated(reply);
@Override
public void serviceStop() {
localElementTicker.shutdownNow();
- synchronized (sones) {
+ synchronized (soneRescuers) {
for (Entry<Sone, SoneInserter> soneInserter : soneInserters.entrySet()) {
soneInserter.getValue().stop();
saveSone(soneInserter.getKey());
webOfTrustUpdater.stop();
updateChecker.stop();
soneDownloader.stop();
- soneDownloaders.shutdown();
identityManager.stop();
+ soneDownloaders.shutdownNow();
}
//
*/
private synchronized void saveSone(Sone sone) {
if (!sone.isLocal()) {
- logger.log(Level.FINE, String.format("Tried to save non-local Sone: %s", sone));
+ logger.log(Level.FINE, format("Tried to save non-local Sone: %s", sone));
return;
}
if (!(sone.getIdentity() instanceof OwnIdentity)) {
- logger.log(Level.WARNING, String.format("Local Sone without OwnIdentity found, refusing to save: %s", sone));
+ logger.log(Level.WARNING, format("Local Sone without OwnIdentity found, refusing to save: %s", sone));
return;
}
- logger.log(Level.INFO, String.format("Saving Sone: %s", sone));
+ logger.log(Level.INFO, format("Saving Sone: %s", sone));
try {
/* save Sone into configuration. */
String sonePrefix = "Sone/" + sone.getId();
webOfTrustUpdater.setProperty((OwnIdentity) sone.getIdentity(), "Sone.LatestEdition", String.valueOf(sone.getLatestEdition()));
- logger.log(Level.INFO, String.format("Sone %s saved.", sone));
+ logger.log(Level.INFO, format("Sone %s saved.", sone));
} catch (ConfigurationException ce1) {
- logger.log(Level.WARNING, String.format("Could not save Sone: %s", sone), ce1);
+ logger.log(Level.WARNING, format("Could not save Sone: %s", sone), ce1);
}
}
configuration.getStringValue("SoneFollowingTimes/" + soneCounter + "/Sone").setValue(null);
}
- /* save known posts. */
- database.save();
-
/* save bookmarked posts. */
int bookmarkedPostCounter = 0;
synchronized (bookmarkedPosts) {
} catch (ConfigurationException ce1) {
logger.log(Level.SEVERE, "Could not store configuration!", ce1);
- } catch (DatabaseException de1) {
- logger.log(Level.SEVERE, "Could not save database!", de1);
} finally {
synchronized (configuration) {
storingConfiguration = false;
try {
options.getIntegerOption(optionName).set(configuration.getIntValue("Option/" + optionName).getValue(null));
} catch (IllegalArgumentException iae1) {
- logger.log(Level.WARNING, String.format("Invalid value for %s in configuration, using default.", optionName));
+ logger.log(Level.WARNING, format("Invalid value for %s in configuration, using default.", optionName));
}
}
@Subscribe
public void ownIdentityAdded(OwnIdentityAddedEvent ownIdentityAddedEvent) {
OwnIdentity ownIdentity = ownIdentityAddedEvent.ownIdentity();
- logger.log(Level.FINEST, String.format("Adding OwnIdentity: %s", ownIdentity));
+ logger.log(Level.FINEST, format("Adding OwnIdentity: %s", ownIdentity));
if (ownIdentity.hasContext("Sone")) {
+ database.storeIdentity(ownIdentity);
addLocalSone(ownIdentity);
}
}
@Subscribe
public void ownIdentityRemoved(OwnIdentityRemovedEvent ownIdentityRemovedEvent) {
OwnIdentity ownIdentity = ownIdentityRemovedEvent.ownIdentity();
- logger.log(Level.FINEST, String.format("Removing OwnIdentity: %s", ownIdentity));
+ logger.log(Level.FINEST, format("Removing OwnIdentity: %s", ownIdentity));
trustedIdentities.removeAll(ownIdentity);
}
@Subscribe
public void identityAdded(IdentityAddedEvent identityAddedEvent) {
Identity identity = identityAddedEvent.identity();
- logger.log(Level.FINEST, String.format("Adding Identity: %s", identity));
+ logger.log(Level.FINEST, format("Adding Identity: %s", identity));
trustedIdentities.put(identityAddedEvent.ownIdentity(), identity);
+ database.storeIdentity(identity);
addRemoteSone(identity);
}
@Subscribe
public void identityUpdated(IdentityUpdatedEvent identityUpdatedEvent) {
final Identity identity = identityUpdatedEvent.identity();
+ database.storeIdentity(identity);
soneDownloaders.execute(new Runnable() {
@Override
for (PostReply reply : sone.get().getReplies()) {
eventBus.post(new PostReplyRemovedEvent(reply));
}
- synchronized (sones) {
- sones.remove(identity.getId());
- }
eventBus.post(new SoneRemovedEvent(sone.get()));
}
*/
@Subscribe
public void imageInsertFinished(ImageInsertFinishedEvent imageInsertFinishedEvent) {
- logger.log(Level.WARNING, String.format("Image insert finished for %s: %s", imageInsertFinishedEvent.image(), imageInsertFinishedEvent.resultingUri()));
+ logger.log(Level.WARNING, format("Image insert finished for %s: %s", imageInsertFinishedEvent.image(), imageInsertFinishedEvent.resultingUri()));
imageInsertFinishedEvent.image().modify().setKey(imageInsertFinishedEvent.resultingUri().toString()).update();
deleteTemporaryImage(imageInsertFinishedEvent.image().getId());
touchConfiguration();
projects / Sone.git / blobdiff