From e0279e8d055a65ef481f8745f479a4c5a601b828 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Mon, 14 Jul 2014 11:19:41 +0000 Subject: [PATCH] * update video tags --- source/net/filebot/media/ReleaseInfo.java | 5 +++-- source/net/filebot/media/ReleaseInfo.properties | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/source/net/filebot/media/ReleaseInfo.java b/source/net/filebot/media/ReleaseInfo.java index ad048800..fbd8001b 100644 --- a/source/net/filebot/media/ReleaseInfo.java +++ b/source/net/filebot/media/ReleaseInfo.java @@ -134,12 +134,13 @@ public class ReleaseInfo { Pattern languageSuffix = getLanguageSuffixPattern(languages, strict); Pattern languageTag = getLanguageTagPattern(languages); Pattern videoSource = getVideoSourcePattern(); + Pattern videoTags = getVideoTagPattern(); Pattern videoFormat = getVideoFormatPattern(strict); Pattern resolution = getResolutionPattern(); Pattern queryBlacklist = getBlacklistPattern(); - stopwords = new Pattern[] { languageTag, videoSource, videoFormat, resolution, languageSuffix }; - blacklist = new Pattern[] { queryBlacklist, languageTag, clutterBracket, releaseGroup, videoSource, videoFormat, resolution, languageSuffix }; + stopwords = new Pattern[] { languageTag, videoSource, videoTags, videoFormat, resolution, languageSuffix }; + blacklist = new Pattern[] { queryBlacklist, languageTag, clutterBracket, releaseGroup, videoSource, videoTags, videoFormat, resolution, languageSuffix }; // cache compiled patterns for common usage this.stopwords.put(strict, stopwords); diff --git a/source/net/filebot/media/ReleaseInfo.properties b/source/net/filebot/media/ReleaseInfo.properties index 5c67db37..8d58c70a 100644 --- a/source/net/filebot/media/ReleaseInfo.properties +++ b/source/net/filebot/media/ReleaseInfo.properties @@ -2,7 +2,7 @@ pattern.video.source: CAMRip|CAM|PDVD|TS|TELESYNC|PDVD|PTVD|PPV|PPVRip|Screener|SCR|SCREENER|DVDSCR|DVDSCREENER|BDSCR|R4|R5|R5LINE|R5.LINE|DVD|DVD5|DVD9|DVDRip|DVDR|TVRip|DSR|PDTV|SDTV|HDTV|DVB|DVBRip|DTHRip|VODRip|VODR|BDRip|BRRip|BluRay|BDR|BD25|BD50|3D.BluRay|3DBluRay|3DBD|BR.Scr|BR.Screener|HDDVD|HDRip|WorkPrint|VHS|VCD|TELECINE|WEB.DL|WEBRip|ithd|iTunesHD|Laserdisc # patterns for all video tags -pattern.video.tags: extended|uncensored|remastered|unrated|uncut|directors.cut|special.edition +pattern.video.tags: extended|uncensored|remastered|unrated|uncut|director.?s.cut|theatrical.cut|ultimate.cut|final.cut|special.edition # additional release info patterns pattern.video.format: DivX|Xvid|AVC|x264|h264|h.264|3ivx|mpg|mpeg|mpeg4|mp3|AAC|AAC2.0|AAC5.1|AAC.2.0|AAC.5.1|AC3|dd20|dd51|2ch|6ch|DTS|DTS.HD|DTS.HD.MA|TrueHD|720p|1080p|10bit|(19|20)[0-9]+(.)S[0-9]+(?!(.)?E[0-9]+)