* clean-up and little tweaks

This commit is contained in:
Reinhard Pointner 2012-10-14 04:30:52 +00:00
parent 395de24346
commit d4a365af5c
5 changed files with 9 additions and 6 deletions

View File

@ -2,4 +2,4 @@
parameter.exclude: ^StreamKind|Count$
# preview expressions (keys are tagged so they can be sorted alphabetically)
expressions: n,y,s,e,t,airdate,startdate,absolute,special,imdbid,episode,sxe,s00e00,movie,vc,ac,cf,vf,af,resolution,hpi,ws,sdhd,source,group,crc32,fn,ext,file,pi,pn,lang,actors,director,collection,genres,certification,rating,dim,info.runtime,info.status,imdb.rating,imdb.votes,media.title,media.durationString,media.overallBitRateString,video.codecID,video.frameRate,video.displayAspectRatioString,video.height,video.scanType,audio.format,audio.bitRateString,audio.language,text.codecInfo,text.language
expressions: n,y,s,e,t,airdate,startdate,absolute,special,imdbid,episode,sxe,s00e00,movie,vc,ac,cf,vf,af,resolution,hpi,ws,sdhd,source,group,crc32,fn,ext,file,pi,pn,lang,actors,director,collection,genres,certification,rating,dim,info.runtime,info.status,media.title,media.durationString,media.overallBitRateString,video.codecID,video.frameRate,video.displayAspectRatioString,video.height,video.scanType,audio.format,audio.bitRateString,audio.language,text.codecInfo,text.language

View File

@ -22,6 +22,7 @@
^Crime$
^Documentary$
^download[s]?$
^downloading$
^DVD
^Erotic$
^Film[s]?
@ -33,6 +34,7 @@
^Romance$
^Science.Fiction$
^Season.[0-9]+
^seeding$
^storage$
^Test$
^Torrents[s]?

View File

@ -1,3 +1,4 @@
Dark.Matters.Twisted.But.True Dark Matters
Franklin.and.Bash Franklin & Bash
HIMYM How I Met your Mother
Rizolli.and.Isles Rizzoli & Isles

View File

@ -1,4 +1,4 @@
// filebot -script fn:replace --action copy --filter [.]srt$ --def e=[.](eng|english) r=.en
// filebot -script fn:replace --action copy --filter "[.]srt$" --def "e=[.](eng|english)" "r=.en"
// imports
import net.sourceforge.filebot.StandardRenameAction

View File

@ -35,7 +35,7 @@ def forceIgnore(f) {
// collect input fileset as specified by the given --def parameters
if (args.empty) {
if (args.empty || ['single', 'multi'].contains(ut_kind)) {
// assume we're called with utorrent parameters
if (ut_kind == 'single') {
input += new File(ut_dir, ut_file) // single-file torrent
@ -122,8 +122,8 @@ groups.each{ group, files ->
// EPISODE MODE
if ((group.tvs || group.anime) && !group.mov) {
// choose series / anime config
def config = group.tvs ? [name: group.tvs, format:'TV Shows/{n}/{episode.special ? "Special" : "Season "+s}/{n} - {episode.special ? "S00E"+special.pad(2) : s00e00} - {t}', db:'TheTVDB']
: [name: group.anime, format:'Anime/{n}/{n} - {sxe} - {t}', db:'AniDB']
def config = group.tvs ? [name: group.tvs, format:'''TV Shows/{n}/{episode.special ? "Special" : "Season "+s}/{n} - {episode.special ? "S00E"+special.pad(2) : s00e00} - {t}''', db:'TheTVDB']
: [name: group.anime, format:'''Anime/{n}/{n} - {sxe} - {t}''', db:'AniDB']
def dest = rename(file: files, format: config.format, db: config.db)
if (dest && artwork) {
dest.mapByFolder().each{ dir, fs ->
@ -145,7 +145,7 @@ groups.each{ group, files ->
// MOVIE MODE
if (group.mov && !group.tvs && !group.anime) {
def dest = rename(file:files, format:'Movies/{n} ({y})/{n} ({y}){" CD$pi"}{".$lang"}', db:'TheMovieDB')
def dest = rename(file:files, format:'''Movies/{n} ({y})/{n} ({y}){" CD$pi"}{".$lang"}''', db:'TheMovieDB')
if (dest && artwork) {
dest.mapByFolder().each{ dir, fs ->
println "Fetching artwork for $dir from TheMovieDB"