From eccace4f513df76c5250744c022779cf6c111401 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Sat, 12 Mar 2016 18:09:28 +0000 Subject: [PATCH] Make sure that '-1080' is on the exclude list --- source/net/filebot/media/ReleaseInfo.properties | 2 +- source/net/filebot/media/SmartSeasonEpisodeMatcher.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/source/net/filebot/media/ReleaseInfo.properties b/source/net/filebot/media/ReleaseInfo.properties index a260321e..a87301e2 100644 --- a/source/net/filebot/media/ReleaseInfo.properties +++ b/source/net/filebot/media/ReleaseInfo.properties @@ -11,7 +11,7 @@ pattern.video.s3d: ((H|HALF|F|FULL)[^\\p{Alnum}]*)?(SBS|TAB|OU) pattern.subtitle.tags: forced|HI|SDH|Director.?s.Commentary # additional release info patterns -pattern.video.format: DivX|Xvid|AVC|x264|h264|h.264|HEVC|h265|h.265|3ivx|PGS|MPG|MPEG|MPEG4|MP3|FLAC|AAC|AAC2.0|AAC5.1|AAC.2.0|AAC.5.1|AC3|AC3|AC3.2.0|AC3|AC3.5.1|dd20|dd51|2ch|6ch|DTS|Multi.DTS|DTS.HD|DTS.HD.MA|TrueHD|720p|0720p|1080p|M1080|10bit|10.bit|24FPS|30FPS|60FPS|Hi10|Hi10P|[\\p{Alpha}]{2,3}.(2[.]0|5[.]1)|(19|20)[0-9]+(.)S[0-9]+(?!(.)?E[0-9]+)|(?<=\\d+)v[0-4] +pattern.video.format: DivX|Xvid|AVC|(x|h)[.]?(264|265)|HEVC|3ivx|PGS|MP[E]?G[45]?|MP[34]|FLAC|(AAC|AC3|DD)(.?[2457][.]?[01])?|[26]ch|(Multi.)?DTS(.HD)?(.MA)?|TrueHD|[M0]?(720|1080)[pi]|[-](720|1080)|10.?bit|(24|30|60)FPS|Hi10[P]?|[\\p{Alpha}]{2,3}.(2[.]0|5[.]1)|(19|20)[0-9]+(.)S[0-9]+(?!(.)?E[0-9]+)|(?<=\\d+)v[0-4] # known release group names url.release-groups: https://app.filebot.net/data/release-groups.txt.xz diff --git a/source/net/filebot/media/SmartSeasonEpisodeMatcher.java b/source/net/filebot/media/SmartSeasonEpisodeMatcher.java index f49f4cc4..8d60699b 100644 --- a/source/net/filebot/media/SmartSeasonEpisodeMatcher.java +++ b/source/net/filebot/media/SmartSeasonEpisodeMatcher.java @@ -1,5 +1,7 @@ package net.filebot.media; +import static net.filebot.media.MediaDetection.*; + import java.io.File; import java.util.List; @@ -12,7 +14,7 @@ public class SmartSeasonEpisodeMatcher extends SeasonEpisodeMatcher { } protected String clean(CharSequence name) { - return MediaDetection.stripFormatInfo(name); + return stripFormatInfo(name); } @Override