From a170799efc6f70b44fcf3237e68d2c55a117a9dd Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Sun, 8 Jul 2012 03:13:59 +0000 Subject: [PATCH] * allow rename(...) to crash the script via --conflict fail --- website/scripts/utorrent-postprocess.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/scripts/utorrent-postprocess.groovy b/website/scripts/utorrent-postprocess.groovy index 246cc91f..3887232d 100644 --- a/website/scripts/utorrent-postprocess.groovy +++ b/website/scripts/utorrent-postprocess.groovy @@ -52,7 +52,7 @@ groups.each{ group, files -> // EPISODE MODE if (group.tvs && !group.mov) { def dest = rename(file:files, format:'TV Shows/{n}/{episode.special ? "Special" : "Season "+s}/{n} - {episode.special ? "S00E"+special.pad(2) : s00e00} - {t}', db:'TheTVDB') - if (dest) { + if (dest != null || _args.conflict == 'fail') { // allow script to crash via --conflict fail dest.mapByFolder().keySet().each{ dir -> println "Fetching artwork for $dir from TheTVDB" def query = group.tvs @@ -71,7 +71,7 @@ groups.each{ group, files -> // MOVIE MODE if (group.mov && !group.tvs) { def dest = rename(file:files, format:'Movies/{n} ({y})/{n} ({y}){" CD$pi"}', db:'TheMovieDB') - if (dest) { + if (dest != null || _args.conflict == 'fail') { // allow script to crash via --conflict fail dest.mapByFolder().keySet().each{ dir -> println "Fetching artwork for $dir from TheMovieDB" fetchMovieArtworkAndNfo(dir, group.mov)