From 90705fd66f64867a018330c27b42cbbb5b8b64b6 Mon Sep 17 00:00:00 2001
From: Reinhard Pointner <rednoah@users.noreply.github.com>
Date: Mon, 25 Jun 2012 17:30:21 +0000
Subject: [PATCH] * improved multi-episode pattern matching

---
 .../sourceforge/filebot/similarity/SeasonEpisodeMatcher.java  | 4 ++--
 source/net/sourceforge/filebot/web/EpisodeFormat.java         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/source/net/sourceforge/filebot/similarity/SeasonEpisodeMatcher.java b/source/net/sourceforge/filebot/similarity/SeasonEpisodeMatcher.java
index 74eb9f02..0c37fae2 100644
--- a/source/net/sourceforge/filebot/similarity/SeasonEpisodeMatcher.java
+++ b/source/net/sourceforge/filebot/similarity/SeasonEpisodeMatcher.java
@@ -29,7 +29,7 @@ public class SeasonEpisodeMatcher {
 		patterns[0] = new SeasonEpisodePattern(null, "(?<!\\p{Alnum})(?i:season|series)[^\\p{Alnum}]{0,3}(\\d{1,4})[^\\p{Alnum}]{0,3}(?i:episode)[^\\p{Alnum}]{0,3}(\\d{1,4})[^\\p{Alnum}]{0,3}(?!\\p{Digit})");
 		
 		// match patterns like S01E01, s01e02, ... [s01]_[e02], s01.e02, s01e02a, s2010e01 ... s01e01-02-03-04, [s01]_[e01-02-03-04] ...
-		patterns[1] = new SeasonEpisodePattern(null, "(?<!\\p{Alnum})[Ss](\\d{1,2}|\\d{4})[^\\p{Alnum}]{0,3}[Ee]((\\d{1,2}\\D?)+)(?!\\p{Digit})") {
+		patterns[1] = new SeasonEpisodePattern(null, "(?<!\\p{Alnum})[Ss](\\d{1,2}|\\d{4})[^\\p{Alnum}]{0,3}[Ee](((?<=[^._ ])\\d{1,2}(\\D|$))+)") {
 			
 			@Override
 			protected Collection<SxE> process(MatchResult match) {
@@ -43,7 +43,7 @@ public class SeasonEpisodeMatcher {
 		};
 		
 		// match patterns like 1x01, 1.02, ..., 1x01a, 10x01, 10.02, ... 1x01-02-03-04, 1x01x02x03x04 ...
-		patterns[2] = new SeasonEpisodePattern(sanity, "(?<!\\p{Alnum}|\\d{4}[.])(\\d{1,2})[x.]((\\d{2,3}\\D?)+)(?!\\p{Digit})") {
+		patterns[2] = new SeasonEpisodePattern(sanity, "(?<!\\p{Alnum}|\\d{4}[.])(\\d{1,2})[x.](((?<=[^._ ])\\d{2,3}(\\D|$))+)") {
 			
 			@Override
 			protected Collection<SxE> process(MatchResult match) {
diff --git a/source/net/sourceforge/filebot/web/EpisodeFormat.java b/source/net/sourceforge/filebot/web/EpisodeFormat.java
index 34120372..7333e831 100644
--- a/source/net/sourceforge/filebot/web/EpisodeFormat.java
+++ b/source/net/sourceforge/filebot/web/EpisodeFormat.java
@@ -145,7 +145,7 @@ public class EpisodeFormat extends Format {
 			if (!it.getSeason().equals(ps)) {
 				sb.append(String.format("S%02d", it.getSeason())).append(String.format("E%02d", it.getEpisode()));
 			} else {
-				sb.append('-').append(String.format("E%02d", it.getEpisode()));
+				sb.append(String.format("E%02d", it.getEpisode()));
 			}
 			ps = it.getSeason();
 		}