* should work a little bit better like this
This commit is contained in:
parent
861d557e92
commit
e184a70e44
|
@ -38,9 +38,7 @@ def groups = input.groupBy{ f ->
|
||||||
if (fn =~ "(?i:$tvs - .+)" || parseEpisodeNumber(fn, true) || parseDate(fn)) {
|
if (fn =~ "(?i:$tvs - .+)" || parseEpisodeNumber(fn, true) || parseDate(fn)) {
|
||||||
println "Exclude Movie: $mov"
|
println "Exclude Movie: $mov"
|
||||||
mov = null
|
mov = null
|
||||||
} else if (detectMovie(f, true)) {
|
} else if (detectMovie(f, true) && (fn =~ /(19|20)\d{2}/ || !(tvs =~ "(?i:$mov.name)"))) {
|
||||||
// probably a movie, but maybe not
|
|
||||||
if (fn =~ /(19|20)\d{2}/ || !(tvs =~ "(?i:$mov.name)")) {
|
|
||||||
println "Exclude Series: $tvs"
|
println "Exclude Series: $tvs"
|
||||||
tvs = null
|
tvs = null
|
||||||
} else if (fn =~ "(?i:$tvs)" && parseEpisodeNumber(fn.after(tvs), false)) {
|
} else if (fn =~ "(?i:$tvs)" && parseEpisodeNumber(fn.after(tvs), false)) {
|
||||||
|
@ -51,7 +49,6 @@ def groups = input.groupBy{ f ->
|
||||||
tvs = null
|
tvs = null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// CHECK CONFLICT
|
// CHECK CONFLICT
|
||||||
if (((mov && tvs) || (!mov && !tvs)) && failOnError) {
|
if (((mov && tvs) || (!mov && !tvs)) && failOnError) {
|
||||||
|
|
Loading…
Reference in New Issue