* update blacklist terms

* fine-tune tvs/mov differentiation

source/net/sourceforge/filebot/media/ReleaseInfo.properties

@@ -2,7 +2,7 @@
 pattern.video.source: CAMRip|CAM|PDVD|TS|TELESYNC|PDVD|PPV|PPVRip|Screener|SCR|SCREENER|DVDSCR|DVDSCREENER|BDSCR|R4|R5|R5LINE|R5.LINE|DVD|DVD5|DVD9|DVDRip|DVDR|TVRip|DSR|PDTV|SDTV|HDTV|DVB|DVBRip|DTHRip|VODRip|VODR|BDRip|BRRip|BluRay|BDR|BD25|BD50|3D.BluRay|3DBluRay|3DBD|BR.Scr|BR.Screener|HDDVD|HDRip|WorkPrint|VHS|VCD|TELECINE|WEB.DL|WEBRip|ithd|iTunesHD
 
 # additional release info patterns
-pattern.video.format: DivX|Xvid|AVC|x264|h264|h.264|3ivx|mpg|mpeg|mpeg4|mp3|AAC|AAC2.0|AAC5.1|AAC.2.0|AAC.5.1|AC3|dd20|dd51|2ch|6ch|TS|DTS|DTS.HD|DTS.HD.MA|TrueHD|WS|HR|7p|720p|18p|1080p|PAL|NTSC|3D
+pattern.video.format: DivX|Xvid|AVC|x264|h264|h.264|3ivx|mpg|mpeg|mpeg4|mp3|AAC|AAC2.0|AAC5.1|AAC.2.0|AAC.5.1|AC3|dd20|dd51|2ch|6ch|DTS|DTS.HD|DTS.HD.MA|TrueHD|720p|1080p
 
 # known release group names
 url.release-groups: http://filebot.net/data/release-groups.txt

website/data/query-blacklist.txt

@@ -2,7 +2,10 @@
 .+sample$
 1-3-3-8.com
 10.bit
+18p
+3D
 5[.,]1
+7p
 @KIDZ
 [1-3]CD
 [1-3]CDRip
@@ -175,12 +178,13 @@ H.SBS
 Hard.Subbed
 HAVE.TO.BE.CUT
 HBO
-hd
+HD
 HDRip
 Hi10P
 Hindi
 History.Channel
 HQ
+HR
 HSBS
 info
 iNT
@@ -212,9 +216,11 @@ NHK
 NL
 NL.Subs
 NLT
+NTSC
 o2.pl
 onlinetvrecorder
 P2P
+PAL
 PBS
 PELICULAS
 plex
@@ -279,6 +285,7 @@ UsaBit.com
 video[s]?
 vo
 Volume.TB
+WS
 www[.][\w-.]+[.](com|net|tk|ro|cd|me|de)
 xbmc
 xRipp

website/scripts/amc.groovy

@@ -171,13 +171,17 @@ def groups = input.groupBy{ f ->
 		println '--- EPISODE FILTER (NEG) ---'
 		println (mov.year >= 1950 && f.listPath().reverse().take(3).find{ it.name =~ mov.year })
 		println (mn =~ sn && [dn, fn].find{ it =~ /(19|20)\d{2}/ })
+		println '--- MOVIE FILTER (POS) ---'
+		println (similarity(mn, fn) >= 0.8 || [dn, fn].find{ it =~ /\b/+mov.year+/\b/ } != null)
+		println ([dn, fn].find{ it =~ mn && !(it.after(mn) =~ /\b\d{1,3}\b/) && (similarity(it, mn) > similarity(it, sn)) } != null)
+		println (detectMovie(f, true) && [dn, fn].find{ it =~ /(19|20)\d{2}/ } != null)
 		**/
 		
 		// S00E00 | 2012.07.21 | One Piece 217 | Firefly - Serenity | [Taken 1, Taken 2, Taken 3, Taken 4, ..., Taken 10]
 		if ((parseEpisodeNumber(fn, true) || parseDate(fn) || ([dn, fn].find{ it =~ sn && matchMovie(it, true) == null } && (parseEpisodeNumber(stripReleaseInfo(fn.after(sn), false), false) || fn.after(sn) =~ /\D\d{1,2}\D{1,3}\d{1,2}\D/) && matchMovie(fn, true) == null) || (fn.after(sn) ==~ /.{0,3} - .+/ && matchMovie(fn, true) == null) || f.dir.listFiles{ it.isVideo() && (dn =~ sn || norm(it.name) =~ sn) && it.name =~ /\d{1,3}/}.findResults{ it.name.matchAll(/\d{1,3}/) as Set }.unique().size() >= 10 || mov.year < 1900) && !( (mov.year >= 1950 && f.listPath().reverse().take(3).find{ it.name =~ mov.year }) || (mn =~ sn && [dn, fn].find{ it =~ /(19|20)\d{2}/ }) ) ) {
 			_log.fine("Exclude Movie: $mov")
 			mov = null
-		} else if (similarity(mn, fn) >= 0.8 || [dn, fn].find{ it =~ /\b/+mov.year+/\b/ } || [dn, fn].find{ it =~ mn && !(it.after(mn) =~ /\b\d{1,3}\b/) && !(it.before(mn).contains(sn)) } || (detectMovie(f, true) && [dn, fn].find{ it =~ /(19|20)\d{2}/ })) {
+		} else if ((similarity(mn, fn) >= 0.8 || [dn, fn].find{ it =~ /\b/+mov.year+/\b/ } != null) || ([dn, fn].find{ it =~ mn && !(it.after(mn) =~ /\b\d{1,3}\b/) && (similarity(it, mn) > similarity(it, sn)) } != null) || (detectMovie(f, true) && [dn, fn].find{ it =~ /(19|20)\d{2}/ } != null)) {
 			_log.fine("Exclude Series: $tvs")
 			tvs = null
 		}