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

* make movie index lookup more restrictive and reliable

This commit is contained in:
Reinhard Pointner 2012-12-09 18:57:04 +00:00
parent 35e95c3a43
commit 419884ab73
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/net/sourceforge/filebot/media/MediaDetection.java
View File

@ -419,7 +419,10 @@ public class MediaDetection {
terms.add(reduceMovieName(getName(movieFolder))); terms.add(reduceMovieName(getName(movieFolder)));
} }
List<Movie> movieNameMatches = matchMovieName(terms, strict, 3); List<Movie> movieNameMatches = matchMovieName(terms, true, 0);
if (movieNameMatches.isEmpty()) {
movieNameMatches = matchMovieName(terms, strict, 2);
}
// skip further queries if collected matches are already sufficient // skip further queries if collected matches are already sufficient
if (options.size() > 0 && movieNameMatches.size() > 0) { if (options.size() > 0 && movieNameMatches.size() > 0) {
@ -429,7 +432,10 @@ public class MediaDetection {
// if matching name+year failed, try matching only by name // if matching name+year failed, try matching only by name
if (movieNameMatches.isEmpty() && strict) { if (movieNameMatches.isEmpty() && strict) {
movieNameMatches = matchMovieName(terms, false, 3); movieNameMatches = matchMovieName(terms, false, 0);
if (movieNameMatches.isEmpty()) {
movieNameMatches = matchMovieName(terms, false, 2);
}
} }
// assume name without spacing will mess up any lookup // assume name without spacing will mess up any lookup

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

@ -1,8 +1,3 @@
(?-i:ENGLISH)
(?-i:FRENCH)
(?-i:GERMAN)
(?-i:SPANISH)
(?-i:SWEDISH|SWEDiSH)
.+sample$ .+sample$
1-3-3-8.com 1-3-3-8.com
5[.,]1 5[.,]1
@ -32,17 +27,24 @@
^DVD ^DVD
^Erotic$ ^Erotic$
^Extract$ ^Extract$
^Film$
^Film[s]? ^Film[s]?
^Filme$
^Finished ^Finished
^home$
^Horror$ ^Horror$
^HVDVD_TS$ ^HVDVD_TS$
^In.Progress$ ^In.Progress$
^Incoming$ ^Incoming$
^jukebox$
^media$
^mnt$ ^mnt$
^Movie[s]? ^Movie[s]?
^new$ ^new$
^other$ ^other$
^private$ ^private$
^pyload$
^raid$
^Romance$ ^Romance$
^rtorrent$ ^rtorrent$
^Science.Fiction$ ^Science.Fiction$
@ -58,6 +60,7 @@
^Torrent[s]? ^Torrent[s]?
^Tracker ^Tracker
^Trailer ^Trailer
^transfer$
^user$ ^user$
^VCD$ ^VCD$
^VIDEO_TS$ ^VIDEO_TS$
@ -93,6 +96,7 @@ dubbed
DVDXvID DVDXvID
DVSKY DVSKY
ENG ENG
English
EXTENDED EXTENDED
Extended.Version Extended.Version
ExtraScene ExtraScene
@ -102,7 +106,9 @@ Final.Cut
FIXED FIXED
Fra Fra
FRE FRE
French
GER GER
German
Hard.Subbed Hard.Subbed
HBO HBO
HDRip HDRip
@ -116,6 +122,7 @@ iPod
ISO ISO
iTA iTA
iTALIA iTALIA
Italian
jigaxx jigaxx
KIDZCORNER KIDZCORNER
KOR KOR
@ -158,6 +165,7 @@ ShareZONE
ShortKut ShortKut
Snapshots Snapshots
SPA SPA
Spanish
Special.Edition Special.Edition
Sub Sub
SUBBED SUBBED
@ -165,6 +173,7 @@ Subs
Subtit Subtit
Subtitle Subtitle
swe.?sub swe.?sub
Swedish
SYNC SYNC
SYNCED SYNCED
SYNCFIX SYNCFIX