diff --git a/BuildData.groovy b/BuildData.groovy index 393b9fe4..b0c56402 100644 --- a/BuildData.groovy +++ b/BuildData.groovy @@ -77,7 +77,7 @@ def getNamePermutations(names) { } out += res - out = out.findAll{ it.length() >= 2 && !(it =~ /^[a-z]/) && it =~ /^[.\p{L}\p{Digit}]/ } // MUST START WITH UNICODE LETTER + out = out.findAll{ it.length() >= 2 && !(it ==~ /[1-9]?[0-9][1-9]/) && !(it =~ /^[a-z]/) && it =~ /^[.\p{L}\p{Digit}]/ } // MUST START WITH UNICODE LETTER out = out.findAll{ !MediaDetection.releaseInfo.structureRootPattern.matcher(it).matches() } // IGNORE NAMES THAT OVERLAP WITH MEDIA FOLDER NAMES out = out.unique{ it.toLowerCase().normalizePunctuation() }.findAll{ it.length() > 0 } diff --git a/website/data/query-blacklist.txt b/website/data/query-blacklist.txt index 61e2546d..80fbb44f 100644 --- a/website/data/query-blacklist.txt +++ b/website/data/query-blacklist.txt @@ -38,8 +38,8 @@ ^data$ ^deluge$ ^disk[0-9]$ -^Documentary$ ^Documentaries$ +^Documentary$ ^Done$ ^Download$ ^Downloading$ diff --git a/website/data/series-mappings.txt b/website/data/series-mappings.txt index 73254ebc..ed3990f2 100644 --- a/website/data/series-mappings.txt +++ b/website/data/series-mappings.txt @@ -1,3 +1,4 @@ +at.midnight @midnight BSG Battlestar Galactica CSI(?!.{0,3}(NY|LA|Miami|Academy)) CSI: Crime Scene Investigation epl English Premier League