moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2024-12-24 16:58:51 -05:00
Code Issues Releases Wiki Activity

* allow 4-digit season number (e.g. 2009, 2010, ...)

Browse Source
This commit is contained in:
Reinhard Pointner 2010-11-26 14:13:40 +00:00
parent 3974551821
commit b81be6a2a0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/net/sourceforge/filebot/similarity/SeasonEpisodeMatcher.java
View File

@ -20,8 +20,8 @@ public class SeasonEpisodeMatcher {
public SeasonEpisodeMatcher() { public SeasonEpisodeMatcher() {
patterns = new SeasonEpisodePattern[3]; patterns = new SeasonEpisodePattern[3];
// match patterns like S01E01, s01e02, ... [s01]_[e02], s01.e02, s01e02a, ... // match patterns like S01E01, s01e02, ... [s01]_[e02], s01.e02, s01e02a, s2010e01 ...
patterns[0] = new SeasonEpisodePattern("(?<!\\p{Alnum})[Ss](\\d{1,2})[^\\p{Alnum}]{0,3}[Ee](\\d{1,3})(?!\\p{Digit})"); patterns[0] = new SeasonEpisodePattern("(?<!\\p{Alnum})[Ss](\\d{1,2}|\\d{4})[^\\p{Alnum}]{0,3}[Ee](\\d{1,3})(?!\\p{Digit})");
// match patterns like 1x01, 1.02, ..., 1x01a, 10x01, 10.02, ... // match patterns like 1x01, 1.02, ..., 1x01a, 10x01, 10.02, ...
patterns[1] = new SeasonEpisodePattern("(?<!\\p{Alnum})(\\d{1,2})[x.](\\d{2,3})(?!\\p{Digit})"); patterns[1] = new SeasonEpisodePattern("(?<!\\p{Alnum})(\\d{1,2})[x.](\\d{2,3})(?!\\p{Digit})");

1
test/net/sourceforge/filebot/similarity/SeasonEpisodeMatcherTest.java
View File

@ -44,6 +44,7 @@ public class SeasonEpisodeMatcherTest {
@Test @Test
public void pattern_S01E01() { public void pattern_S01E01() {
assertEquals(new SxE(1, 1), matcher.match("S01E01").get(0)); assertEquals(new SxE(1, 1), matcher.match("S01E01").get(0));
assertEquals(new SxE(2010, 0), matcher.match("S2010E00").get(0));
// test multiple matches // test multiple matches
assertEquals(new SxE(1, 2), matcher.match("S01E01 and S01E02 - Multiple MatchCollection").get(1)); assertEquals(new SxE(1, 2), matcher.match("S01E01 and S01E02 - Multiple MatchCollection").get(1));