X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=99ebc6d7356e9745389f5076c79eb0e12cd4f7b3;hb=b29cf0908e6dfd2b55220a3a7e44200f2fe5b19e;hp=e0f26499c9a52f82f0e03910b504af115055e92c;hpb=d7b813e54e32217fb6332bc2fd51827aa3c76fee;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 e0f2649..99ebc6d 100644 --- a/src/main/java/net/pterodactylus/sone/core/Core.java +++ b/src/main/java/net/pterodactylus/sone/core/Core.java @@ -56,6 +56,16 @@ import freenet.keys.FreenetURI; */ public class Core extends AbstractService { + /** The default Sones. */ + private static final Set defaultSones = new HashSet(); + + static { + /* Sone of Sone. */ + defaultSones.add("USK@eRHt0ceFsHjRZ11j6dd68RSdIvfd8f9YjJLZ9lnhEyo,iJWjIWh6TkMZm1NY8qBranKTIuwsCPkVPG6T6c6ft-I,AQACAAE/Sone/3"); + /* Sone of Bombe. */ + defaultSones.add("USK@RuW~uAO35Ipne896-1OmaVJNPuYE4ZIB5oZ5ziaU57A,7rV3uiyztXBDt03DCoRiNwiGjgFCJuznM9Okc1opURU,AQACAAE/Sone/24"); + } + /** * Enumeration for the possible states of a {@link Sone}. * @@ -91,11 +101,14 @@ public class Core extends AbstractService { /** The Sone downloader. */ private SoneDownloader soneDownloader; + /** The Sone blacklist. */ + private final Set blacklistedSones = Collections.synchronizedSet(new HashSet()); + /** The local Sones. */ - private final Set localSones = new HashSet(); + private final Set localSones = Collections.synchronizedSet(new HashSet()); /** Sone inserters. */ - private final Map soneInserters = new HashMap(); + private final Map soneInserters = Collections.synchronizedMap(new HashMap()); /** The Sones’ statuses. */ private final Map soneStatuses = Collections.synchronizedMap(new HashMap()); @@ -103,13 +116,13 @@ public class Core extends AbstractService { /* various caches follow here. */ /** Cache for all known Sones. */ - private final Map soneCache = new HashMap(); + private final Map soneCache = Collections.synchronizedMap(new HashMap()); /** Cache for all known posts. */ - private final Map postCache = new HashMap(); + private final Map postCache = Collections.synchronizedMap(new HashMap()); /** Cache for all known replies. */ - private final Map replyCache = new HashMap(); + private final Map replyCache = Collections.synchronizedMap(new HashMap()); /** * Creates a new core. @@ -163,7 +176,17 @@ public class Core extends AbstractService { * @return The local Sones */ public Set getSones() { - return Collections.unmodifiableSet(localSones); + return Filters.filteredSet(localSones, new Filter() { + + /** + * {@inheritDoc} + */ + @Override + @SuppressWarnings("synthetic-access") + public boolean filterObject(Sone sone) { + return !blacklistedSones.contains(sone); + } + }); } /** @@ -189,7 +212,17 @@ public class Core extends AbstractService { * @return All known sones */ public Collection getKnownSones() { - return soneCache.values(); + return Filters.filteredCollection(soneCache.values(), new Filter() { + + /** + * {@inheritDoc} + */ + @Override + @SuppressWarnings("synthetic-access") + public boolean filterObject(Sone sone) { + return !blacklistedSones.contains(sone); + } + }); } /** @@ -202,13 +235,33 @@ public class Core extends AbstractService { @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 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 @@ -329,6 +382,38 @@ public class Core extends AbstractService { } /** + * 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 @@ -430,6 +515,7 @@ public class Core extends AbstractService { } else { addSone(parsedSone); } + setSoneStatus(parsedSone, SoneStatus.idle); } } catch (MalformedURLException mue1) { logger.log(Level.INFO, "Could not create URI from “" + requestUri + "”.", mue1); @@ -499,6 +585,8 @@ public class Core extends AbstractService { SoneInserter soneInserter = soneInserters.remove(sone); soneInserter.stop(); localSones.remove(sone); + soneStatuses.remove(sone); + soneCache.remove(sone.getId()); } /** @@ -565,8 +653,8 @@ public class Core extends AbstractService { * The post to check for * @return All Sones that like the post */ - public Set getLikes(final Post post) { - return Filters.filteredSet(getSones(), new Filter() { + public Collection getLikes(final Post post) { + return Filters.filteredCollection(getKnownSones(), new Filter() { @Override public boolean filterObject(Sone sone) { @@ -582,8 +670,8 @@ public class Core extends AbstractService { * The reply to check for * @return All Sones that like the reply */ - public Set getLikes(final Reply reply) { - return Filters.filteredSet(getSones(), new Filter() { + public Collection getLikes(final Reply reply) { + return Filters.filteredCollection(getKnownSones(), new Filter() { @Override public boolean filterObject(Sone sone) { @@ -634,12 +722,32 @@ public class Core extends AbstractService { // /** + * Adds some default Sones. + */ + private void addDefaultSones() { + for (String soneUri : defaultSones) { + loadSone(soneUri); + } + } + + /** * 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(60, new OptionWatcher() { @Override @@ -649,14 +757,21 @@ public class Core extends AbstractService { })); - options.addBooleanOption("ClearOnNextRestart", new DefaultOption(false)).set(configuration.getBooleanValue("Option/ClearOnNextRestart").getValue(null)); - options.addBooleanOption("ReallyClearOnNextRestart", new DefaultOption(false)).set(configuration.getBooleanValue("Option/ReallyClearOnNextRestart").getValue(null)); + options.addBooleanOption("ClearOnNextRestart", new DefaultOption(false)); + options.addBooleanOption("ReallyClearOnNextRestart", new DefaultOption(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); if (clearConfiguration) { /* stop loading the configuration. */ + addDefaultSones(); return; } @@ -789,6 +904,24 @@ public class Core extends AbstractService { } } + /* 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); @@ -897,6 +1030,18 @@ public class Core extends AbstractService { } 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); }