From 3e197b22636f6f156b43ceeca8d4ae4ff2bccc06 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Thu, 28 Jun 2012 02:36:32 +0000
Subject: [PATCH] * slightly improved release {group} matching

---
 .../sourceforge/filebot/media/ReleaseInfo.java   | 15 +++++++++++++--
 website/data/query-blacklist.txt                 |  8 ++++----
 website/data/release-groups.txt                  | 16 +++++++++++++---
 3 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/source/net/sourceforge/filebot/media/ReleaseInfo.java b/source/net/sourceforge/filebot/media/ReleaseInfo.java
index 927a2111..fd78dcfd 100644
--- a/source/net/sourceforge/filebot/media/ReleaseInfo.java
+++ b/source/net/sourceforge/filebot/media/ReleaseInfo.java
@@ -48,8 +48,19 @@ public class ReleaseInfo {
 	
 	
 	public String getReleaseGroup(File file) throws IOException {
-		// check parent and itself for group names
-		return matchLast(getReleaseGroupPattern(false), releaseGroupResource.get(), file.getParent(), file.getName());
+		// check file and folder for release group names
+		String[] groups = releaseGroupResource.get();
+		String[] files = new String[] { file.getParentFile().getName(), file.getName() };
+		
+		// try case-sensitive match
+		String match = matchLast(getReleaseGroupPattern(true), groups, files);
+		
+		// try case-insensitive match as fallback
+		if (match == null) {
+			match = matchLast(getReleaseGroupPattern(false), groups, files);
+		}
+		
+		return match;
 	}
 	
 	
diff --git a/website/data/query-blacklist.txt b/website/data/query-blacklist.txt
index 30b37120..a4daf721 100644
--- a/website/data/query-blacklist.txt
+++ b/website/data/query-blacklist.txt
@@ -1,10 +1,7 @@
-(?-i:CLASSiC)
-(?-i:DOCU)
+(?-i:CLASSIC|CLASSiC)
 (?-i:ENGLISH)
-(?-i:FIXED)
 (?-i:FRENCH)
 (?-i:GERMAN)
-(?-i:iNT)
 (?-i:LIMITED|LiMiTED)
 (?-i:SPANISH)
 (?-i:SWEDISH|SWEDiSH)
@@ -45,6 +42,7 @@ DC
 Demonoid
 Director's.Cut
 Directors.Cut
+docu
 Dual.Audio
 dubbed
 DVDXvID
@@ -55,6 +53,7 @@ Extended.Version
 ExtraScene
 ExtraTorrent
 Final.Cut
+FIXED
 Fra
 FRE
 GER
@@ -62,6 +61,7 @@ Hard.Subbed
 HDRip
 Hindi
 HQ
+iNT
 iNTERNAL
 iPod
 ISO
diff --git a/website/data/release-groups.txt b/website/data/release-groups.txt
index 04f58174..4daf1a77 100644
--- a/website/data/release-groups.txt
+++ b/website/data/release-groups.txt
@@ -37,6 +37,7 @@ ALLiANCE
 ALLZINE
 AMiABLE
 AN0NYM0US
+Anarchy
 aNBc
 ANBU
 Ani-Kraze
@@ -185,6 +186,7 @@ DUQA
 DutchReleaseTeam
 DvF
 DVL
+dvsky
 EBi
 EbP
 ECHiZEN
@@ -206,6 +208,7 @@ eots
 EPiK
 ESiR
 ESPiSE
+etach
 ETHOS
 ETM
 ETRG
@@ -380,7 +383,6 @@ Larceny
 LCHD
 LEVERAGE
 LEViTY
-LIMITED
 LiPAN
 LMAO
 LoD
@@ -394,6 +396,7 @@ LTT
 LUSO
 M794
 MACHD
+macro
 MAGiCAL
 MAGiCViBE
 MAiN
@@ -402,6 +405,7 @@ MARiNES
 MAXSPEED
 MC
 MCR
+med
 MEDiAMANiACS
 MEDiEVAL
 MELiTE
@@ -483,6 +487,7 @@ PELLUCiD
 Penumbra
 PerfectionHD
 PFa
+phase
 PhoenixRG
 piepHD
 PiLAF
@@ -530,8 +535,8 @@ rabomil
 RANDi
 RAP
 Razor1911
+Reaperza
 REAVERS
-RED
 Redµx
 REFiNED
 RELOADED
@@ -589,6 +594,7 @@ SiTV
 SKALiWAGZ
 SLM
 SLO
+SLOMO
 SMoKeR
 Sneak
 SNUGGLER
@@ -598,12 +604,14 @@ SoW
 SpaceHD
 SPARKS
 SPOOKY
+sprinter
 SSF
 Stealthmaster
 stieg
 Stranded
 streetwars
 STV
+Subject16
 SuBoXoNe
 SUNSPOT
 SURFER
@@ -613,6 +621,7 @@ Swesub
 SYS
 t00ng0d
 Taka
+tantrum
 TARGET
 TASTE
 TASTETV
@@ -634,12 +643,14 @@ TiMPE
 TiMTY
 TiTANS
 TjHD
+tla
 TLF
 TM
 TN
 TOKUS
 TOPAZ
 TorrenTGui
+tpz
 trentalent
 TRiPS
 TrollHD
@@ -690,7 +701,6 @@ WAF
 WANKAZ
 WASTE
 WAVEY
-WEST
 WHATELSE
 WHiiZz
 WiDE