From f5cd05b04a1f5d1962ed69f008674fede4074300 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Tue, 15 Oct 2013 08:35:22 +0000 Subject: [PATCH] * fine-tune amc for 123xy patterns --- website/scripts/amc.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/website/scripts/amc.groovy b/website/scripts/amc.groovy index 47f8789f..46296317 100644 --- a/website/scripts/amc.groovy +++ b/website/scripts/amc.groovy @@ -115,7 +115,7 @@ input = input.findAll{ f -> !(f.path =~ /\b(?i:sample|trailer|extras|deleted.sce input.each{ f -> _log.finest("Input: $f") } // artwork/nfo utility -include('lib/htpc') +if (artwork || xbmc) { include('lib/htpc') } // group episodes/movies and rename according to XBMC standards def groups = input.groupBy{ f -> @@ -149,14 +149,14 @@ def groups = input.groupBy{ f -> println parseEpisodeNumber(fn, true) || parseDate(fn) println ([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) println (fn.after(sn) ==~ /.{0,3} - .+/ && matchMovie(fn, true) == null) - println f.dir.listFiles{ it.isVideo() && (dn =~ sn || norm(it.name) =~ sn) && it.name =~ /\b\d{1,3}\b/}.size() >= 10 + println f.dir.listFiles{ it.isVideo() && (dn =~ sn || norm(it.name) =~ sn) && it.name =~ /\d{1,3}/}.size() >= 10 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}/ }) **/ // 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}\b/}.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}/ }) ) ) { + 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}/}.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}/ })) {