From e184a70e443a5cdd4e43b1663ccfcb39267ccbe5 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Sun, 8 Jul 2012 13:13:18 +0000 Subject: [PATCH] * should work a little bit better like this --- website/scripts/utorrent-postprocess.groovy | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/website/scripts/utorrent-postprocess.groovy b/website/scripts/utorrent-postprocess.groovy index 8678ec75..0b8b1f92 100644 --- a/website/scripts/utorrent-postprocess.groovy +++ b/website/scripts/utorrent-postprocess.groovy @@ -38,18 +38,15 @@ def groups = input.groupBy{ f -> if (fn =~ "(?i:$tvs - .+)" || parseEpisodeNumber(fn, true) || parseDate(fn)) { println "Exclude Movie: $mov" mov = null - } else if (detectMovie(f, true)) { - // probably a movie, but maybe not - if (fn =~ /(19|20)\d{2}/ || !(tvs =~ "(?i:$mov.name)")) { - println "Exclude Series: $tvs" - tvs = null - } else if (fn =~ "(?i:$tvs)" && parseEpisodeNumber(fn.after(tvs), false)) { - println "Exclude Movie: $mov" - mov = null - } else if (fn =~ "(?i:$mov.name)" && !parseEpisodeNumber(fn.after(mov.name), false)) { - println "Exclude Series: $tvs" - tvs = null - } + } else if (detectMovie(f, true) && (fn =~ /(19|20)\d{2}/ || !(tvs =~ "(?i:$mov.name)"))) { + println "Exclude Series: $tvs" + tvs = null + } else if (fn =~ "(?i:$tvs)" && parseEpisodeNumber(fn.after(tvs), false)) { + println "Exclude Movie: $mov" + mov = null + } else if (fn =~ "(?i:$mov.name)" && !parseEpisodeNumber(fn.after(mov.name), false)) { + println "Exclude Series: $tvs" + tvs = null } }