From a106151ca4c3ebcce01bd84e39e7bc691c7d8dfc Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Tue, 6 Dec 2016 00:17:32 +0900 Subject: [PATCH] Added {dc} duplicate count binding and improved support for testing expressions and bindings with real data --- source/net/filebot/cli/CmdlineOperations.java | 2 +- source/net/filebot/format/ExpressionFileFilter.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/net/filebot/cli/CmdlineOperations.java b/source/net/filebot/cli/CmdlineOperations.java index 3949583d..6fd017bf 100644 --- a/source/net/filebot/cli/CmdlineOperations.java +++ b/source/net/filebot/cli/CmdlineOperations.java @@ -1013,7 +1013,7 @@ public class CmdlineOperations implements CmdlineInterface { ExpressionFormat formatter = format != null ? format : new ExpressionFormat("{fn} [{resolution} {vc} {channels} {ac} {minutes}m]"); // lazy format - return new FunctionList(selection, f -> formatter.format(new MediaBindingBean(xattr.getMetaInfo(f), f, null))); + return new FunctionList(selection, f -> formatter.format(new MediaBindingBean(xattr.getMetaInfo(f), f))); } @Override diff --git a/source/net/filebot/format/ExpressionFileFilter.java b/source/net/filebot/format/ExpressionFileFilter.java index 87343264..1242c47e 100644 --- a/source/net/filebot/format/ExpressionFileFilter.java +++ b/source/net/filebot/format/ExpressionFileFilter.java @@ -23,7 +23,7 @@ public class ExpressionFileFilter implements FileFilter { @Override public boolean accept(File f) { try { - return filter.matches(new MediaBindingBean(xattr.getMetaInfo(f), f, null)); + return filter.matches(new MediaBindingBean(xattr.getMetaInfo(f), f)); } catch (Exception e) { debug.warning("Filter expression failed: " + e); }