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

Fix "Ip Man 3 FR"

Browse Source 
@see https://www.filebot.net/forums/viewtopic.php?f=6&t=3546#p19839
This commit is contained in:
Reinhard Pointner 2016-03-27 22:16:23 +00:00
parent 6b70a50ba9
commit 153e87a4c6
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/net/filebot/media/ReleaseInfo.java
View File

@ -168,7 +168,7 @@ public class ReleaseInfo {
Pattern releaseGroup = getReleaseGroupPattern(strict); Pattern releaseGroup = getReleaseGroupPattern(strict);
Pattern releaseGroupTrim = getReleaseGroupTrimPattern(); Pattern releaseGroupTrim = getReleaseGroupTrimPattern();
Pattern languageSuffix = getSubtitleLanguageTagPattern(languages); Pattern languageSuffix = getSubtitleLanguageTagPattern(languages);
Pattern languageTag = getLanguageTagPattern(languages); Pattern languageTag = getLanguageTagPattern(languages, strict);
Pattern videoSource = getVideoSourcePattern(); Pattern videoSource = getVideoSourcePattern();
Pattern videoTags = getVideoTagPattern(); Pattern videoTags = getVideoTagPattern();
Pattern videoFormat = getVideoFormatPattern(strict); Pattern videoFormat = getVideoFormatPattern(strict);
@ -258,9 +258,15 @@ public class ReleaseInfo {
return structureRootFolderPattern; return structureRootFolderPattern;
} }
public Pattern getLanguageTagPattern(Collection<String> languages) { public Pattern getLanguageTagPattern(Collection<String> languages, boolean strict) {
// [en] // [en]
return compile("(?<=[-\\[{(])" + or(quoteAll(languages)) + "(?=\\p{Punct})", CASE_INSENSITIVE | UNICODE_CHARACTER_CLASS); if (strict) {
return compile("(?<=[-\\[\\{\\(])" + or(quoteAll(languages)) + "(?=[-\\]\\}\\)]|$)", CASE_INSENSITIVE | UNICODE_CHARACTER_CLASS);
}
// FR
List<String> allCapsLanguageTags = languages.stream().map(String::toUpperCase).collect(toList());
return compile("(?<!\\p{Alnum})" + or(quoteAll(allCapsLanguageTags)) + "(?!\\p{Alnum})");
} }
public Pattern getSubtitleCategoryTagPattern(Collection<String> languages) { public Pattern getSubtitleCategoryTagPattern(Collection<String> languages) {