git://git.nikiroo.be
/
nikiroo-utils.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
weblib: fixes
[nikiroo-utils.git]
/
src
/
be
/
nikiroo
/
fanfix
/
library
/
RemoteLibraryServer.java
diff --git
a/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
b/src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
index e54f105d6bf9233c4f1c4383c948630b57b79555..59819bb948903a1893b9e9d2751f43ca8d3a66a5 100644
(file)
--- a/
src/be/nikiroo/fanfix/library/RemoteLibraryServer.java
+++ b/
src/be/nikiroo/fanfix/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.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;
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<String> whitelist,
List<String> blacklist) {
private boolean isAllowed(MetaData meta, List<String> whitelist,
List<String> 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;
}
return true;