/** The Sone downloader. */
private SoneDownloader soneDownloader;
+ /** The Sone blacklist. */
+ private final Set<Sone> blacklistedSones = new HashSet<Sone>();
+
/** The local Sones. */
private final Set<Sone> localSones = new HashSet<Sone>();
* @return The local Sones
*/
public Set<Sone> getSones() {
- return Collections.unmodifiableSet(localSones);
+ return Filters.filteredSet(localSones, new Filter<Sone>() {
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ @SuppressWarnings("synthetic-access")
+ public boolean filterObject(Sone sone) {
+ return !blacklistedSones.contains(sone);
+ }
+ });
}
/**
* @return All known sones
*/
public Collection<Sone> getKnownSones() {
- return soneCache.values();
+ return Filters.filteredCollection(soneCache.values(), new Filter<Sone>() {
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ @SuppressWarnings("synthetic-access")
+ public boolean filterObject(Sone sone) {
+ return !blacklistedSones.contains(sone);
+ }
+ });
}
/**
@Override
@SuppressWarnings("synthetic-access")
- public boolean filterObject(Sone object) {
- return !localSones.contains(object);
+ public boolean filterObject(Sone sone) {
+ return !blacklistedSones.contains(sone) && !localSones.contains(sone);
}
});
}
/**
+ * Returns all blacklisted Sones.
+ *
+ * @return All blacklisted Sones
+ */
+ public Collection<Sone> getBlacklistedSones() {
+ return Collections.unmodifiableCollection(blacklistedSones);
+ }
+
+ /**
+ * Checks whether the given Sone is blacklisted.
+ *
+ * @param sone
+ * The Sone to check
+ * @return {@code true} if this Sone is blacklisted, {@code false} otherwise
+ */
+ public boolean isBlacklistedSone(Sone sone) {
+ return blacklistedSones.contains(sone);
+ }
+
+ /**
* Returns the status of the given Sone.
*
* @param sone
}
/**
+ * Blackslists the given Sone.
+ *
+ * @param sone
+ * The Sone to blacklist
+ */
+ public void blacklistSone(Sone sone) {
+ if (blacklistedSones.add(sone)) {
+ soneDownloader.removeSone(sone);
+ if (localSones.remove(sone)) {
+ SoneInserter soneInserter = soneInserters.remove(sone);
+ soneInserter.stop();
+ }
+ }
+ }
+
+ /**
+ * Unblacklists the given Sone.
+ *
+ * @param sone
+ * The Sone to unblacklist
+ */
+ public void unblacklistSone(Sone sone) {
+ if (blacklistedSones.remove(sone)) {
+ if (sone.getInsertUri() != null) {
+ addLocalSone(sone);
+ } else {
+ addSone(sone);
+ }
+ }
+ }
+
+ /**
* Creates a new Sone at a random location.
*
* @param name
} else {
addSone(parsedSone);
}
+ setSoneStatus(parsedSone, SoneStatus.idle);
}
} catch (MalformedURLException mue1) {
logger.log(Level.INFO, "Could not create URI from “" + requestUri + "”.", mue1);
SoneInserter soneInserter = soneInserters.remove(sone);
soneInserter.stop();
localSones.remove(sone);
+ soneStatuses.remove(sone);
+ soneCache.remove(sone.getId());
}
/**
//
/**
+ * Adds some default Sones.
+ */
+ private void addDefaultSones() {
+ /* Sone’s Sone. */
+ loadSone("USK@eRHt0ceFsHjRZ11j6dd68RSdIvfd8f9YjJLZ9lnhEyo,iJWjIWh6TkMZm1NY8qBranKTIuwsCPkVPG6T6c6ft-I,AQACAAE/Sone/0");
+ /* Bombe’s Sone. */
+ loadSone("USK@RuW~uAO35Ipne896-1OmaVJNPuYE4ZIB5oZ5ziaU57A,7rV3uiyztXBDt03DCoRiNwiGjgFCJuznM9Okc1opURU,AQACAAE/Sone/15");
+ }
+
+ /**
* Loads the configuration.
*/
@SuppressWarnings("unchecked")
private void loadConfiguration() {
logger.entering(Core.class.getName(), "loadConfiguration()");
+ boolean firstStart = configuration.getBooleanValue("FirstStart").getValue(true);
+ if (firstStart) {
+ logger.log(Level.INFO, "First start of Sone, adding a couple of default Sones…");
+ addDefaultSones();
+ try {
+ configuration.getBooleanValue("FirstStart").setValue(false);
+ } catch (ConfigurationException ce1) {
+ logger.log(Level.WARNING, "Could not clear “first start” flag!");
+ }
+ }
+
options.addIntegerOption("InsertionDelay", new DefaultOption<Integer>(60, new OptionWatcher<Integer>() {
@Override
}));
- options.addBooleanOption("ClearOnNextRestart", new DefaultOption<Boolean>(false)).set(configuration.getBooleanValue("Option/ClearOnNextRestart").getValue(null));
- options.addBooleanOption("ReallyClearOnNextRestart", new DefaultOption<Boolean>(false)).set(configuration.getBooleanValue("Option/ReallyClearOnNextRestart").getValue(null));
+ options.addBooleanOption("ClearOnNextRestart", new DefaultOption<Boolean>(false));
+ options.addBooleanOption("ReallyClearOnNextRestart", new DefaultOption<Boolean>(false));
+ if (firstStart) {
+ return;
+ }
+
+ options.getBooleanOption("ClearOnNextRestart").set(configuration.getBooleanValue("Option/ClearOnNextRestart").getValue(null));
+ options.getBooleanOption("ReallyClearOnNextRestart").set(configuration.getBooleanValue("Option/ReallyClearOnNextRestart").getValue(null));
boolean clearConfiguration = options.getBooleanOption("ClearOnNextRestart").get() && options.getBooleanOption("ReallyClearOnNextRestart").get();
options.getBooleanOption("ClearOnNextRestart").set(null);
options.getBooleanOption("ReallyClearOnNextRestart").set(null);
}
}
+ /* load all blacklisted Sones. */
+ int blacklistedSonesCounter = 0;
+ while (true) {
+ String blacklistedSonePrefix = "BlacklistedSone." + blacklistedSonesCounter++;
+ String blacklistedSoneId = configuration.getStringValue(blacklistedSonePrefix + "/ID").getValue(null);
+ if (blacklistedSoneId == null) {
+ break;
+ }
+ String blacklistedSoneName = configuration.getStringValue(blacklistedSonePrefix + "/Name").getValue(null);
+ String blacklistedSoneKey = configuration.getStringValue(blacklistedSonePrefix + "/Key").getValue(null);
+ String blacklistedSoneInsertKey = configuration.getStringValue(blacklistedSonePrefix + "/InsertKey").getValue(null);
+ try {
+ blacklistSone(getSone(blacklistedSoneId).setName(blacklistedSoneName).setRequestUri(new FreenetURI(blacklistedSoneKey)).setInsertUri((blacklistedSoneInsertKey != null) ? new FreenetURI(blacklistedSoneInsertKey) : null));
+ } catch (MalformedURLException mue1) {
+ logger.log(Level.WARNING, "Could not create blacklisted Sone from requestUri (“" + blacklistedSoneKey + "”)!", mue1);
+ }
+ }
+
/* load all remote Sones. */
for (Sone remoteSone : getRemoteSones()) {
loadSone(remoteSone);
}
configuration.getStringValue("KnownSone." + knownSonesCounter + "/ID").setValue(null);
+ /* write all blacklisted Sones. */
+ int blacklistedSonesCounter = 0;
+ for (Sone blacklistedSone : getBlacklistedSones()) {
+ String blacklistedSonePrefix = "BlacklistedSone." + blacklistedSonesCounter++;
+ configuration.getStringValue(blacklistedSonePrefix + "/ID").setValue(blacklistedSone.getId());
+ configuration.getStringValue(blacklistedSonePrefix + "/Name").setValue(blacklistedSone.getName());
+ configuration.getStringValue(blacklistedSonePrefix + "/Key").setValue(blacklistedSone.getRequestUri().toString());
+ configuration.getStringValue(blacklistedSonePrefix + "/InsertKey").setValue((blacklistedSone.getInsertUri() != null) ? blacklistedSone.getInsertUri().toString() : null);
+ /* TODO - store all known stuff? */
+ }
+ configuration.getStringValue("BlacklistedSone." + blacklistedSonesCounter + "/ID").setValue(null);
+
} catch (ConfigurationException ce1) {
logger.log(Level.WARNING, "Could not store configuration!", ce1);
}