diff --git a/source/net/filebot/media/MediaDetection.java b/source/net/filebot/media/MediaDetection.java index 4b65629a..469103c0 100644 --- a/source/net/filebot/media/MediaDetection.java +++ b/source/net/filebot/media/MediaDetection.java @@ -81,12 +81,7 @@ public class MediaDetection { } public static FileFilter getClutterFileFilter() { - try { - return releaseInfo.getClutterFileFilter(); - } catch (Exception e) { - debug.log(Level.SEVERE, "Failed to load clutter file filter: " + e.getMessage(), e); - } - return f -> false; + return releaseInfo.getClutterFileFilter(); } public static boolean isDiskFolder(File folder) { diff --git a/source/net/filebot/media/ReleaseInfo.java b/source/net/filebot/media/ReleaseInfo.java index 5b36372d..f87bc5a2 100644 --- a/source/net/filebot/media/ReleaseInfo.java +++ b/source/net/filebot/media/ReleaseInfo.java @@ -318,6 +318,10 @@ public class ReleaseInfo { return compileWordPattern(getProperty("pattern.video.repack")); } + public Pattern getExcludePattern() { + return compileWordPattern(getProperty("pattern.clutter.excludes")); + } + public Pattern getClutterBracketPattern(boolean strict) { // match patterns like [Action, Drama] or {ENG-XViD-MP3-DVDRiP} etc String brackets = "()[]{}"; @@ -350,10 +354,6 @@ public class ReleaseInfo { return compileWordPattern(queryBlacklist.get()); // pattern matching any release group name enclosed in separators } - public Pattern getExcludePattern() throws Exception { - return compile(or(excludeBlacklist.get()), CASE_INSENSITIVE); - } - private Pattern compileWordPattern(String[] patterns) { return compile("(? releaseGroup = lines("url.release-groups", Cache.ONE_WEEK); private final Resource queryBlacklist = lines("url.query-blacklist", Cache.ONE_WEEK); - private final Resource excludeBlacklist = lines("url.exclude-blacklist", Cache.ONE_WEEK); private final Resource tvdbIndex = tsv("url.thetvdb-index", Cache.ONE_WEEK, this::parseSeries, SearchResult[]::new); private final Resource anidbIndex = tsv("url.anidb-index", Cache.ONE_WEEK, this::parseSeries, SearchResult[]::new); diff --git a/source/net/filebot/media/ReleaseInfo.properties b/source/net/filebot/media/ReleaseInfo.properties index dc1b43fc..593d1e43 100644 --- a/source/net/filebot/media/ReleaseInfo.properties +++ b/source/net/filebot/media/ReleaseInfo.properties @@ -16,18 +16,18 @@ pattern.subtitle.tags: forced|HI|SDH # additional release info patterns pattern.video.format: DivX|Xvid|AVC|(x|h)[.]?(264|265)|HEVC|3ivx|PGS|MP[E]?G[45]?|MP[34]|(FLAC|AAC|AC3|DD|MA).?[2457][.]?[01]|[26]ch|(Multi.)?DTS(.HD)?(.MA)?|FLAC|AAC|AC3|TrueHD|Atmos|[M0]?(720|1080)[pi]|(?<=[-])(720|1080|2D|3D)|10.?bit|(24|30|60)FPS|Hi10[P]?|[a-z]{2,3}.(2[.]0|5[.]1)|(19|20)[0-9]+(.)S[0-9]+(?!(.)?E[0-9]+)|(?<=\\d+)v[0-4]|CD\\d+ +# clutter file exclude pattern +pattern.clutter.excludes: (?<=[!-\\(\\[])(Sample|Trailer)|(Sample|Trailer)(?=[-.\\)\\]])|(NCED|NCOP|(OP|ED)\\p{Digit}\\p{Alpha})|(Extras|Trailers|Featurettes|Interviews|Scenes|Shorts)$|Behind.the.Scenes|Deleted.and.Extended.Scenes|Deleted.Scenes + +# only files smaller than 250 MB may be considered clutter +number.clutter.maxfilesize: 262144000 + # known release group names url.release-groups: https://app.filebot.net/data/release-groups.txt.xz # blacklisted terms that will be ignored url.query-blacklist: https://app.filebot.net/data/query-blacklist.txt.xz -# clutter files that will be ignored -url.exclude-blacklist: https://app.filebot.net/data/exclude-blacklist.txt.xz - -# only files smaller than 250 MB may be considered clutter -number.clutter.maxfilesize: 262144000 - # list of patterns directly matching files to series names url.series-mappings: https://app.filebot.net/data/series-mappings.txt.xz