X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=c3bacac3e76e63648196bcbfa3075269cf4bc8bf;hb=73b8d9fa03d043185870eacacbc72aa04d199252;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..c3bacac 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -91,6 +91,9 @@ public class Core extends AbstractService {
 	/** 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>();
 
@@ -163,7 +166,17 @@ public class Core extends AbstractService {
 	 * @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);
+			}
+		});
 	}
 
 	/**
@@ -189,7 +202,17 @@ public class Core extends AbstractService {
 	 * @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);
+			}
+		});
 	}
 
 	/**
@@ -202,13 +225,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<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
@@ -329,6 +372,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
@@ -499,6 +574,8 @@ public class Core extends AbstractService {
 		SoneInserter soneInserter = soneInserters.remove(sone);
 		soneInserter.stop();
 		localSones.remove(sone);
+		soneStatuses.remove(sone);
+		soneCache.remove(sone.getId());
 	}
 
 	/**
@@ -789,6 +866,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 +992,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().toString());
+				/* TODO - store all known stuff? */
+			}
+			configuration.getStringValue("BlacklistedSone." + blacklistedSonesCounter + "/ID").setValue(null);
+
 		} catch (ConfigurationException ce1) {
 			logger.log(Level.WARNING, "Could not store configuration!", ce1);
 		}