From c4ab4e838297cdb7b414d8e3a963b8da857bf10d Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Wed, 8 Jan 2014 08:36:32 +0000
Subject: [PATCH] * fine-tune exclude patterns

---
 BuildData.groovy                                  | 15 ++++++++-------
 .../sourceforge/filebot/media/MediaDetection.java |  5 +++++
 website/data/query-blacklist.txt                  |  3 ++-
 website/data/release-groups.txt                   |  1 +
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/BuildData.groovy b/BuildData.groovy
index 11849841..62666e24 100644
--- a/BuildData.groovy
+++ b/BuildData.groovy
@@ -1,5 +1,5 @@
-import  org.tukaani.xz.*
-
+import org.tukaani.xz.*
+import net.sourceforge.filebot.media.*
 
 /* ------------------------------------------------------------------------- */
 
@@ -209,7 +209,7 @@ tvdb.values().each{ r ->
 
 def addSeriesAlias = { from, to ->
 	def se = thetvdb_index.find{ from == it[1] && !it.contains(to) }
-	if (se == null) throw new Exception("Unabled to find series '${from}'")
+	if (se == null) throw new Exception("Unabled to find series '${from}': '${to}'")
 	thetvdb_index << [se[0], to]
 }
 
@@ -246,10 +246,11 @@ if (thetvdb_txt.size() < 30000) { throw new Exception('TheTVDB index sanity fail
 def anidb = new net.sourceforge.filebot.web.AnidbClient('filebot', 4).getAnimeTitles()
 
 def anidb_index = anidb.findResults{
-	def row = []
-	row += it.getAnimeId().pad(5)
-	row += getNamePermutations(it.effectiveNames*.replaceAll(/\s+/, ' ')*.trim()*.replaceAll(/['`´‘’ʻ]+/, /'/))
-	return row
+	def names = it.effectiveNames*.replaceAll(/\s+/, ' ')*.trim()*.replaceAll(/['`´‘’ʻ]+/, /'/)
+	names = getNamePermutations(names)
+	names = names.findAll{ stripReleaseInfo(it)?.length() > 0 }
+
+	return names.empty ? null : [it.getAnimeId().pad(5)] + names
 }
 
 // join and sort
diff --git a/source/net/sourceforge/filebot/media/MediaDetection.java b/source/net/sourceforge/filebot/media/MediaDetection.java
index 3f91089a..3bc3c295 100644
--- a/source/net/sourceforge/filebot/media/MediaDetection.java
+++ b/source/net/sourceforge/filebot/media/MediaDetection.java
@@ -1124,6 +1124,11 @@ public class MediaDetection {
 			}
 			return strictKey;
 		}
+
+		@Override
+		public String toString() {
+			return strictName != null ? strictName : lenientName;
+		}
 	}
 
 	/*
diff --git a/website/data/query-blacklist.txt b/website/data/query-blacklist.txt
index 6c3febfb..f7c40f19 100644
--- a/website/data/query-blacklist.txt
+++ b/website/data/query-blacklist.txt
@@ -128,6 +128,7 @@
 ^volume[0-9]?$
 ^Volumes$
 ^watch$
+^www$
 A.PROCESAR
 A.Release.Lounge
 ABC
@@ -309,7 +310,7 @@ video[s]?
 vo
 Volume.TB
 WS
-www[.][\w-.]+[.](com|net|tk|ro|cd|me|de)
+www.[\p{Alnum}\p{Punct}]+?.(com|net|tk|ro|cd|me|de)
 xbmc
 xRipp
 XtremeDoN
diff --git a/website/data/release-groups.txt b/website/data/release-groups.txt
index 74d3a492..3181638e 100644
--- a/website/data/release-groups.txt
+++ b/website/data/release-groups.txt
@@ -1633,6 +1633,7 @@ PKF
 PL
 PLANET3
 PLASTKASSE
+PLAYNOW
 playXD
 PLEADERS
 PLT