X-Git-Url: http://git.nikiroo.be/?p=nikiroo-utils.git;a=blobdiff_plain;f=src%2Fbe%2Fnikiroo%2Ffanfix%2Flibrary%2FWebLibraryServer.java;h=3ccdc3d00ec9a4f6e0feeda95682b18363a55c11;hp=97f2f0e8f69c6c07e217e1022ee4aa0fa96eaa4d;hb=5c4ce687a0510cef279bcba66be79b0e053396b9;hpb=8dc26a0ac5e5f1aa9296c5db71114dce19503973

diff --git a/src/be/nikiroo/fanfix/library/WebLibraryServer.java b/src/be/nikiroo/fanfix/library/WebLibraryServer.java
index 97f2f0e..3ccdc3d 100644
--- a/src/be/nikiroo/fanfix/library/WebLibraryServer.java
+++ b/src/be/nikiroo/fanfix/library/WebLibraryServer.java
@@ -4,6 +4,7 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
@@ -359,12 +360,16 @@ public class WebLibraryServer extends WebLibraryServerHtml {
 	}
 
 	private boolean isAllowed(MetaData meta, WLoginResult login) {
-		if (login.isWl() && !whitelist.isEmpty()
-				&& !whitelist.contains(meta.getSource())) {
-			return false;
+		MetaResultList one = new MetaResultList(Arrays.asList(meta));
+		if (login.isWl() && !whitelist.isEmpty()) {
+			if (one.filter(whitelist, null, null).isEmpty()) {
+				return false;
+			}
 		}
-		if (login.isBl() && blacklist.contains(meta.getSource())) {
-			return false;
+		if (login.isBl() && !blacklist.isEmpty()) {
+			if (!one.filter(blacklist, null, null).isEmpty()) {
+				return false;
+			}
 		}
 
 		return true;