From 377506801b17a6588c2e3e18f2bf46953a22ac30 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Fri, 22 Feb 2013 11:37:08 +0000 Subject: [PATCH] * enhanced formats for AMC --- installer/portable/filebot.cmd | 2 +- website/reviews.json | 5 +++++ website/scripts/amc.groovy | 6 +++--- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/installer/portable/filebot.cmd b/installer/portable/filebot.cmd index 63ef19ca..44dc8390 100644 --- a/installer/portable/filebot.cmd +++ b/installer/portable/filebot.cmd @@ -1,2 +1,2 @@ @ECHO OFF -java -Xmx256m -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.deployment=portable "-Dapplication.dir=%~dp0." "-Duser.home=%~dp0." "-Djava.io.tmpdir=%~dp0temp" "-Djna.library.path=%~dp0." "-Djava.library.path=%~dp0." -Djava.util.prefs.PreferencesFactory=net.sourceforge.tuned.prefs.FilePreferencesFactory "-Dnet.sourceforge.tuned.prefs.file=%~dp0prefs.properties" -jar "%~dp0FileBot.jar" %* \ No newline at end of file +java -Djava.net.useSystemProxies=true -Dsun.net.client.defaultConnectTimeout=10000 -Dsun.net.client.defaultReadTimeout=60000 -Dapplication.deployment=portable -Dapplication.analytics=true "-Dapplication.dir=%~dp0." "-Duser.home=%~dp0." "-Djava.io.tmpdir=%~dp0temp" "-Djna.library.path=%~dp0." "-Djava.library.path=%~dp0." -Djava.util.prefs.PreferencesFactory=net.sourceforge.tuned.prefs.FilePreferencesFactory "-Dnet.sourceforge.tuned.prefs.file=%~dp0prefs.properties" -jar "%~dp0FileBot.jar" %* \ No newline at end of file diff --git a/website/reviews.json b/website/reviews.json index fc40eddd..edb2b0ae 100644 --- a/website/reviews.json +++ b/website/reviews.json @@ -89,6 +89,11 @@ "date": "2011-02-18", "text": "best app on series renaming i could find" }, + { + "user": "Nolan", + "date": "2013-02-15", + "text": "excellent app" + }, { "user": "charmainebellora", "date": "2013-01-23", diff --git a/website/scripts/amc.groovy b/website/scripts/amc.groovy index d1cca925..ce351082 100644 --- a/website/scripts/amc.groovy +++ b/website/scripts/amc.groovy @@ -31,8 +31,8 @@ def pushover = tryQuietly{ pushover } // series/anime/movie format expressions def format = [ - tvs: tryQuietly{ seriesFormat } ?: '''TV Shows/{n}/{episode.special ? "Special" : "Season "+s.pad(2)}/{n} - {episode.special ? "S00E"+special.pad(2) : s00e00} - {t}{".$lang"}''', - anime: tryQuietly{ animeFormat } ?: '''Anime/{n}/{n} - {sxe} - {t}''', + tvs: tryQuietly{ seriesFormat } ?: '''TV Shows/{n}/{episode.special ? "Special" : "Season "+s.pad(2)}/{n.replaceTrailingBrackets()} - {episode.special ? "S00E"+special.pad(2) : s00e00} - {t.replaceAll(/[`´‘’ʻ]/, "'").replaceAll(/[!?.]+$/).replacePart(', Part $1')}{".$lang"}''', + anime: tryQuietly{ animeFormat } ?: '''Anime/{n}/{n} - {sxe} - {t.replaceAll(/[!?.]+$/).replaceAll(/[`´‘’ʻ]/, "'").replacePart(', Part $1')}''', mov: tryQuietly{ movieFormat } ?: '''Movies/{n} ({y})/{n} ({y}){" CD$pi"}{".$lang"}''', music: tryQuietly{ musicFormat } ?: '''Music/{n}/{album+'/'}{pi.pad(2)+'. '}{artist} - {t}''' ] @@ -121,7 +121,7 @@ def groups = input.groupBy{ f -> // DECIDE EPISODE VS MOVIE (IF NOT CLEAR) if (tvs && mov) { - def norm = { s -> s.lower().space(' ') } + def norm = { s -> s.ascii().lower().space(' ') } def dn = norm(guessMovieFolder(f)?.name ?: '') def fn = norm(f.nameWithoutExtension) def sn = norm(tvs)