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

* make strict -rename movie mode more flexible

Browse Source
This commit is contained in:
Reinhard Pointner 2012-04-13 17:52:49 +00:00
parent 07e0b20dc1
commit 4b50c9b042
3 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -298,8 +298,13 @@ public class MediaDetection {
return options; return options;
} }
// if matching name+year failed, try matching only by name
if (movieNameMatches.isEmpty() && strict) {
movieNameMatches = matchMovieName(files, locale, false);
}
// query by file / folder name // query by file / folder name
if (queryLookupService != null && !strict) { if (queryLookupService != null) {
options.addAll(queryMovieByFileName(files, queryLookupService, locale)); options.addAll(queryMovieByFileName(files, queryLookupService, locale));
} }
@ -394,12 +399,12 @@ public class MediaDetection {
public static Set<Integer> grepImdbIdFor(File file) throws Exception { public static Set<Integer> grepImdbIdFor(File file) throws Exception {
Set<Integer> collection = new LinkedHashSet<Integer>(); Set<Integer> collection = new LinkedHashSet<Integer>();
if (file.exists()) {
for (File nfo : file.getParentFile().listFiles(MediaTypes.getDefaultFilter("application/nfo"))) { for (File nfo : file.getParentFile().listFiles(MediaTypes.getDefaultFilter("application/nfo"))) {
String text = new String(readFile(nfo), "UTF-8"); String text = new String(readFile(nfo), "UTF-8");
collection.addAll(grepImdbId(text)); collection.addAll(grepImdbId(text));
}
} }
return collection; return collection;
} }

2
source/net/sourceforge/filebot/media/ReleaseInfo.properties
View File

@ -1,5 +1,5 @@
# source names mostly copied from [http://en.wikipedia.org/wiki/Pirated_movie_release_types] # source names mostly copied from [http://en.wikipedia.org/wiki/Pirated_movie_release_types]
pattern.video.source: CAMRip|CAM|PDVD|TS|TELESYNC|PDVD|PPV|PPVRip|Screener|SCR|SCREENER|DVDSCR|DVDSCREENER|BDSCR|R5|R5LINE|DVDRip|DVDR|TVRip|DSR|PDTV|HDTV|DVB|DVBRip|DTHRip|VODRip|VODR|BDRip|BRRip|BluRay|BDR|BR-Scr|BR-Screener|HDDVD|HDRip|WorkPrint|VHS|VCD|TELECINE|WEB-DL|Webrip pattern.video.source: CAMRip|CAM|PDVD|TS|TELESYNC|PDVD|PPV|PPVRip|Screener|SCR|SCREENER|DVDSCR|DVDSCREENER|BDSCR|R5|R5LINE|DVD|DVDRip|DVDR|TVRip|DSR|PDTV|HDTV|DVB|DVBRip|DTHRip|VODRip|VODR|BDRip|BRRip|BluRay|BDR|BR-Scr|BR-Screener|HDDVD|HDRip|WorkPrint|VHS|VCD|TELECINE|WEB-DL|Webrip
# additional release info patterns # additional release info patterns
pattern.video.format: DivX|Xvid|AVC|x264|h264|3ivx|mpeg|mpeg4|mp3|aac|ac3|2ch|6ch|WS|HR|720p|1080p|NTSC pattern.video.format: DivX|Xvid|AVC|x264|h264|3ivx|mpeg|mpeg4|mp3|aac|ac3|2ch|6ch|WS|HR|720p|1080p|NTSC

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

@ -5,14 +5,22 @@
[1-9].?of.?[1-9] [1-9].?of.?[1-9]
^(TV.)?(Show|Serie)[s]? ^(TV.)?(Show|Serie)[s]?
^[0-9]{1,2}[.] ^[0-9]{1,2}[.]
^AUDIO_TS$
^BDMV$
^Cover ^Cover
^DVD
^Film[s]? ^Film[s]?
^HVDVD_TS$
^Info ^Info
^Movie[s]? ^Movie[s]?
^New$
^SAMPLE ^SAMPLE
^Season.[0-9]+ ^Season.[0-9]+
^Torrents[s]?
^Tracker ^Tracker
^Trailer ^Trailer
^VCD$
^VIDEO_TS$
A.Release.Lounge A.Release.Lounge
Anime[s]? Anime[s]?
By.Cool.Release By.Cool.Release