From 6a2e1a61d9bbf8ed692d54a1fdb91745bb7ec895 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Sun, 20 Mar 2016 21:21:08 +0000
Subject: [PATCH] Support multi-release-group patterns (e.g. FUM[ettv] or
 lol[ettv])

---
 source/net/filebot/media/ReleaseInfo.java     | 23 +++++++++----------
 .../net/filebot/similarity/Normalization.java |  2 +-
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/source/net/filebot/media/ReleaseInfo.java b/source/net/filebot/media/ReleaseInfo.java
index 06624af5..d69dd9d8 100644
--- a/source/net/filebot/media/ReleaseInfo.java
+++ b/source/net/filebot/media/ReleaseInfo.java
@@ -102,12 +102,12 @@ public class ReleaseInfo {
 		// try case-sensitive match
 		String match = matchLast(getReleaseGroupPattern(true), groups, strings);
 
-		// try case-insensitive match as fallback
-		if (match == null) {
-			match = matchLast(getReleaseGroupPattern(false), groups, strings);
+		if (match != null) {
+			return match;
 		}
 
-		return match;
+		// try case-insensitive match
+		return matchLast(getReleaseGroupPattern(false), groups, strings);
 	}
 
 	private Map<String, Locale> languages;
@@ -121,13 +121,14 @@ public class ReleaseInfo {
 		}
 
 		String lang = matchLast(languageSuffix, null, name);
-		if (lang == null)
+		if (lang == null) {
 			return null;
+		}
 
 		return languages.get(lang);
 	}
 
-	protected String matchLast(Pattern pattern, String[] standardValues, CharSequence... sequence) {
+	protected String matchLast(Pattern pattern, String[] paragon, CharSequence... sequence) {
 		String lastMatch = null;
 
 		// match last occurrence
@@ -142,11 +143,9 @@ public class ReleaseInfo {
 		}
 
 		// prefer standard value over matched value
-		if (lastMatch != null && standardValues != null) {
-			for (String standard : standardValues) {
-				if (standard.equalsIgnoreCase(lastMatch)) {
-					return standard;
-				}
+		if (lastMatch != null && paragon != null) {
+			for (String it : paragon) {
+				lastMatch = compile("(?<!\\p{Alnum})" + it.replaceAll("[\\p{Punct}\\s]", ".") + "(?!\\p{Alnum})", CASE_INSENSITIVE | UNICODE_CHARACTER_CLASS).matcher(lastMatch).replaceAll(it);
 			}
 		}
 
@@ -304,7 +303,7 @@ public class ReleaseInfo {
 
 	public Pattern getReleaseGroupPattern(boolean strict) throws Exception {
 		// pattern matching any release group name enclosed in separators
-		return compile("(?<!\\p{Alnum})" + or(releaseGroup.get()) + "(?!\\p{Alnum}|[^\\p{Alnum}](19|20)\\d{2})", strict ? 0 : CASE_INSENSITIVE | UNICODE_CHARACTER_CLASS);
+		return compile("((?<!\\p{Alnum})" + or(releaseGroup.get()) + "(?!\\p{Alnum}|[^\\p{Alnum}](19|20)\\d{2})($|[\\p{Punct}]))+", strict ? 0 : CASE_INSENSITIVE | UNICODE_CHARACTER_CLASS);
 	}
 
 	public Pattern getReleaseGroupTrimPattern() throws Exception {
diff --git a/source/net/filebot/similarity/Normalization.java b/source/net/filebot/similarity/Normalization.java
index 2ec4c888..ed92f9bb 100644
--- a/source/net/filebot/similarity/Normalization.java
+++ b/source/net/filebot/similarity/Normalization.java
@@ -7,7 +7,7 @@ import java.util.regex.Pattern;
 public class Normalization {
 
 	private static final Pattern apostrophe = compile("['`´‘’ʻ]+");
-	private static final Pattern punctuation = compile("[\\p{Punct}\\p{Space}]+");
+	private static final Pattern punctuation = compile("[\\p{Punct}\\s]+");
 
 	private static final Pattern space = compile("\\s+");
 	private static final Pattern spaceLikePunctuation = compile("[:?._]");