From ae528b5c968c75103f5f85afcd8d6bbeddb86ab9 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Thu, 9 Aug 2012 05:11:59 +0000 Subject: [PATCH] * added matchAll to make it easy to match multiple regex matches --- .../format/ExpressionFormat.lib.groovy | 23 ++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/source/net/sourceforge/filebot/format/ExpressionFormat.lib.groovy b/source/net/sourceforge/filebot/format/ExpressionFormat.lib.groovy index f13ecc9c..385d0e89 100644 --- a/source/net/sourceforge/filebot/format/ExpressionFormat.lib.groovy +++ b/source/net/sourceforge/filebot/format/ExpressionFormat.lib.groovy @@ -41,7 +41,28 @@ String.metaClass.pad = Number.metaClass.pad = { length = 2, padding = "0" -> del /** * Return a substring matching the given pattern or break. */ -String.metaClass.match = { String pattern, int matchGroup = 0 -> def matcher = Pattern.compile(pattern, Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE).matcher(delegate); if (matcher.find()) return matcher.group(matchGroup) else throw new Exception("Match failed") } +String.metaClass.match = { String pattern, int matchGroup = 0 -> + def matcher = Pattern.compile(pattern, Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE).matcher(delegate) + if (matcher.find()) + return matcher.group(matchGroup) + else + throw new Exception("Match failed") +} + +/** + * Return a list of all matching patterns or break. + */ +String.metaClass.matchAll = { String pattern, int matchGroup = 0 -> + def matches = [] + def matcher = Pattern.compile(pattern, Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE).matcher(delegate) + while(matcher.find()) + matches += matcher.group(matchGroup) + + if (matches.size() > 0) + return matches + else + throw new Exception("Match failed") +} /**