mobeigi/filebot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* fine-tune movie detection

Browse Source
This commit is contained in:
Reinhard Pointner 2013-03-13 15:48:13 +00:00
parent d1f9f266ca
commit 768fcd3075
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
website/data/query-blacklist.txt
View File

@ -134,6 +134,7 @@ FRE
French
GER
German
H.SBS
Hard.Subbed
HBO
hd
@ -142,6 +143,7 @@ Hi10P
Hindi
History.Channel
HQ
HSBS
info
iNT
iNTERNAL
@ -184,7 +186,8 @@ ReRip
RESYNC
RETAIL
RiffTrax
sample[s]?
sample
samples
SBS
Screenshot
sd

2
website/scripts/amc.groovy
View File

@ -129,7 +129,7 @@ def groups = input.groupBy{ f ->
def mn = norm(mov.name)
// S00E00 | 2012.07.21 | One Piece 217 | Firefly - Serenity | [Taken 1, Taken 2, Taken 3, Taken 4, ..., Taken 10]
if (parseEpisodeNumber(fn, true) || parseDate(fn) || (fn =~ sn && parseEpisodeNumber(fn.after(sn), false) && !matchMovie(f, true)) || fn.after(sn) ==~ /.{0,3} - .+/ || f.dir.listFiles{ it.isVideo() && norm(it.name) =~ sn && it.name =~ /\b\d{1,3}\b/}.size() >= 10) {
if (parseEpisodeNumber(fn, true) || parseDate(fn) || (fn =~ sn && parseEpisodeNumber(fn.after(sn), false) && !matchMovie(f, true)) || (fn.after(sn) ==~ /.{0,3} - .+/ && !matchMovie(f, true)) || f.dir.listFiles{ it.isVideo() && norm(it.name) =~ sn && it.name =~ /\b\d{1,3}\b/}.size() >= 10) {
_log.fine("Exclude Movie: $mov")
mov = null
} else if ((detectMovie(f, true) && [dn, fn].find{ it =~ /(19|20)\d{2}/ }) || [dn, fn].find{ it =~ mn && !(it.after(mn) =~ /\b\d{1,3}\b/) }) {

2
website/scripts/update-mes.groovy
View File

@ -11,7 +11,7 @@ def mes = MyEpisodes(mesacc[0], mesacc[1])
def myshows = mes.getShowList()
// series name => series key (e.g. Doctor Who (2005) => doctorwho)
def collationKey = { s -> s.replaceAll(/\W/).replaceAll(/(?<!\d)\d{4}$/).lower() }
def collationKey = { s -> s == null ? '' : s.replaceAll(/\W/).replaceAll(/(?<!\d)\d{4}$/).lower() }
args.getFiles{ it.isVideo() && parseEpisodeNumber(it) && detectSeriesName(it) }.groupBy{ detectSeriesName(it) }.each{ series, files ->
def show = myshows.find{ collationKey(it.name) == collationKey(series) }