From 49d744319e5664a0f2b0f35d71a27d3964b9a2e8 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Sun, 18 Jun 2017 20:21:07 +0800 Subject: [PATCH] Fine-tune exclude file filter @see https://www.filebot.net/forums/viewtopic.php?f=6&t=5128 --- source/net/filebot/media/ReleaseInfo.java | 8 +++++++- source/net/filebot/media/ReleaseInfo.properties | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/source/net/filebot/media/ReleaseInfo.java b/source/net/filebot/media/ReleaseInfo.java index 8362ee84..ed1d3823 100644 --- a/source/net/filebot/media/ReleaseInfo.java +++ b/source/net/filebot/media/ReleaseInfo.java @@ -527,7 +527,13 @@ public class ReleaseInfo { @Override public boolean accept(File file) { - return (namePattern.matcher(file.getName()).find() || (file.isFile() && namePattern.matcher(file.getParentFile().getName()).find())); + if (file.isFile()) { + // check file name without extension and parent folder name + return namePattern.matcher(getNameWithoutExtension(file.getName())).find() || namePattern.matcher(file.getParentFile().getName()).find(); + } else { + // just check folder name + return namePattern.matcher(file.getName()).find(); + } } } diff --git a/source/net/filebot/media/ReleaseInfo.properties b/source/net/filebot/media/ReleaseInfo.properties index 0078793b..9b6886c6 100644 --- a/source/net/filebot/media/ReleaseInfo.properties +++ b/source/net/filebot/media/ReleaseInfo.properties @@ -17,7 +17,7 @@ pattern.subtitle.tags: forced|HI|SDH 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 +pattern.clutter.excludes: (?<=[!\\-\\(\\[])(Sample|Trailer)|(Sample|Trailer)(?=[\\-\\)\\]])|(?<=[.\\-])(s|t|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 150 MB may be considered clutter number.clutter.maxfilesize: 150000000