1
0
mirror of https://github.com/mitb-archive/filebot synced 2024-12-24 08:48:51 -05:00

* fine-tune exclude patterns

This commit is contained in:
Reinhard Pointner 2014-01-08 08:36:32 +00:00
parent 0800bc5eb0
commit c4ab4e8382
4 changed files with 16 additions and 8 deletions

View File

@ -1,5 +1,5 @@
import org.tukaani.xz.* import org.tukaani.xz.*
import net.sourceforge.filebot.media.*
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
@ -209,7 +209,7 @@ tvdb.values().each{ r ->
def addSeriesAlias = { from, to -> def addSeriesAlias = { from, to ->
def se = thetvdb_index.find{ from == it[1] && !it.contains(to) } def se = thetvdb_index.find{ from == it[1] && !it.contains(to) }
if (se == null) throw new Exception("Unabled to find series '${from}'") if (se == null) throw new Exception("Unabled to find series '${from}': '${to}'")
thetvdb_index << [se[0], to] thetvdb_index << [se[0], to]
} }
@ -246,10 +246,11 @@ if (thetvdb_txt.size() < 30000) { throw new Exception('TheTVDB index sanity fail
def anidb = new net.sourceforge.filebot.web.AnidbClient('filebot', 4).getAnimeTitles() def anidb = new net.sourceforge.filebot.web.AnidbClient('filebot', 4).getAnimeTitles()
def anidb_index = anidb.findResults{ def anidb_index = anidb.findResults{
def row = [] def names = it.effectiveNames*.replaceAll(/\s+/, ' ')*.trim()*.replaceAll(/['`´ʻ]+/, /'/)
row += it.getAnimeId().pad(5) names = getNamePermutations(names)
row += getNamePermutations(it.effectiveNames*.replaceAll(/\s+/, ' ')*.trim()*.replaceAll(/['`´ʻ]+/, /'/)) names = names.findAll{ stripReleaseInfo(it)?.length() > 0 }
return row
return names.empty ? null : [it.getAnimeId().pad(5)] + names
} }
// join and sort // join and sort

View File

@ -1124,6 +1124,11 @@ public class MediaDetection {
} }
return strictKey; return strictKey;
} }
@Override
public String toString() {
return strictName != null ? strictName : lenientName;
}
} }
/* /*

View File

@ -128,6 +128,7 @@
^volume[0-9]?$ ^volume[0-9]?$
^Volumes$ ^Volumes$
^watch$ ^watch$
^www$
A.PROCESAR A.PROCESAR
A.Release.Lounge A.Release.Lounge
ABC ABC
@ -309,7 +310,7 @@ video[s]?
vo vo
Volume.TB Volume.TB
WS WS
www[.][\w-.]+[.](com|net|tk|ro|cd|me|de) www.[\p{Alnum}\p{Punct}]+?.(com|net|tk|ro|cd|me|de)
xbmc xbmc
xRipp xRipp
XtremeDoN XtremeDoN

View File

@ -1633,6 +1633,7 @@ PKF
PL PL
PLANET3 PLANET3
PLASTKASSE PLASTKASSE
PLAYNOW
playXD playXD
PLEADERS PLEADERS
PLT PLT