X-Git-Url: http://git.nikiroo.be/?p=fanfix.git;a=blobdiff_plain;f=library%2FRemoteLibraryServer.java;h=59819bb948903a1893b9e9d2751f43ca8d3a66a5;hp=e54f105d6bf9233c4f1c4383c948630b57b79555;hb=4536c5cf2d7b8e68768f90d281b3e4974cd26ae9;hpb=87ffaa787388b0389f5134aa70c4b1e2e940c118 diff --git a/library/RemoteLibraryServer.java b/library/RemoteLibraryServer.java index e54f105..59819bb 100644 --- a/library/RemoteLibraryServer.java +++ b/library/RemoteLibraryServer.java @@ -3,6 +3,7 @@ package be.nikiroo.fanfix.library; import java.io.IOException; import java.net.URL; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -578,12 +579,16 @@ public class RemoteLibraryServer extends ServerObject { private boolean isAllowed(MetaData meta, List whitelist, List blacklist) { - if (!whitelist.isEmpty() && !whitelist.contains(meta.getSource())) { - return false; + MetaResultList one = new MetaResultList(Arrays.asList(meta)); + if (!whitelist.isEmpty()) { + if (one.filter(whitelist, null, null).isEmpty()) { + return false; + } } - - if (blacklist.contains(meta.getSource())) { - return false; + if (!blacklist.isEmpty()) { + if (!one.filter(blacklist, null, null).isEmpty()) { + return false; + } } return true;