* update rules

build.xml

@@ -233,7 +233,7 @@
 	</target>
 
 
-	<target name="ppa-binary" depends="fatjar">
+	<target name="ppa-binary" depends="svn-update, fatjar">
 		<tar longfile="gnu" compression="gzip" destfile="${path.ubuntu-binary.tar.gz}">
 			<tarfileset fullpath="i386/opt/filebot/FileBot.jar" file="${path.fatjar}" />
 			<tarfileset fullpath="amd64/opt/filebot/FileBot.jar" file="${path.fatjar}" />

source/net/sourceforge/filebot/format/ExpressionFormat.lib.groovy

@@ -4,9 +4,9 @@ import java.util.regex.Pattern
 
 
 // simplified switch/case pattern matching
-Object.metaClass.match = { Map cases -> def val = delegate; cases.findResult { switch(val) { case it.key: return it.value} } }
-def csv(path, delim = ';', keyIndex = 0, valueIndex = 1) { def f = path as File; def values = [:]; f.splitEachLine(delim) { values.put(it[keyIndex], it[valueIndex]) }; return values }
 def c(c) { try { c.call() } catch (Throwable e) { null } }
+def csv(path, delim = ';', keyIndex = 0, valueIndex = 1) { def f = path as File; def values = [:]; f.splitEachLine(delim) { line -> values.put(line[keyIndex], valueIndex < line.size() ? line[valueIndex] : null) }; return values }
+Object.metaClass.match = { Map cases -> def val = delegate; cases.findResult { switch(val) { case it.key: return it.value} } }
 
 
 /**

source/net/sourceforge/filebot/ui/rename/FormatDialog.properties

@@ -17,7 +17,7 @@ episode.example[2]: {n} [{airdate}] {t}
 # uglyfy name
 episode.example[3]: {n.space('.').lower()}.{s}{e.pad(2)}
 # organize folder structure
-episode.example[4]: {n}/{"Season $s"}/{s00e00} - {t}
+episode.example[4]: {n}/{"Season ${s.pad(2)}"}/{s00e00} - {t}
 
 # simple name/year
 movie.example[0]: {n} ({y}){" CD$pi"}{".$lang"}

website/data/query-blacklist.txt

@@ -15,6 +15,7 @@
 ^[lp]
 ^Action$
 ^Adventure$
+^and$
 ^AUDIO_TS$
 ^BDMV$
 ^Big$
@@ -250,8 +251,7 @@ UsaBit.com
 video[s]?
 vo
 Volume.TB
-www.Cpasbien.me
-www[.][\w-.]+[.](com|net|tk|ro|cd)
+www[.][\w-.]+[.](com|net|tk|ro|cd|me|de)
 xRipp
 XtremeDoN
 YIFY