X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Frhynodge%2Ffilters%2FEpisodeFilter.java;h=9ba7cece1cb395d20ba1e12e82945c0b68e29b6a;hb=8b9fa1f4f9d9df7212e6e440dc42dd10f32e0596;hp=7709d9e4a00e051fb61716a6e63c99d1f92d2fa7;hpb=72ecb2d82560d84e0a547974854f95070feea1cf;p=rhynodge.git

diff --git a/src/main/java/net/pterodactylus/rhynodge/filters/EpisodeFilter.java b/src/main/java/net/pterodactylus/rhynodge/filters/EpisodeFilter.java
index 7709d9e..9ba7cec 100644
--- a/src/main/java/net/pterodactylus/rhynodge/filters/EpisodeFilter.java
+++ b/src/main/java/net/pterodactylus/rhynodge/filters/EpisodeFilter.java
@@ -17,10 +17,12 @@
 
 package net.pterodactylus.rhynodge.filters;
 
+import static com.google.common.base.Optional.absent;
 import static com.google.common.base.Preconditions.checkState;
+import static com.google.common.collect.FluentIterable.from;
+import static java.util.Arrays.asList;
 
-import java.util.HashMap;
-import java.util.Map;
+import java.util.Collection;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -32,6 +34,12 @@ import net.pterodactylus.rhynodge.states.FailedState;
 import net.pterodactylus.rhynodge.states.TorrentState;
 import net.pterodactylus.rhynodge.states.TorrentState.TorrentFile;
 
+import com.google.common.base.Function;
+import com.google.common.base.Optional;
+import com.google.common.collect.HashMultimap;
+import com.google.common.collect.Multimap;
+import org.apache.log4j.Logger;
+
 /**
  * {@link Filter} implementation that extracts {@link Episode} information from
  * the {@link TorrentFile}s contained in a {@link TorrentState}.
@@ -40,8 +48,10 @@ import net.pterodactylus.rhynodge.states.TorrentState.TorrentFile;
  */
 public class EpisodeFilter implements Filter {
 
+	private static final Logger logger = Logger.getLogger(EpisodeFilter.class);
+
 	/** The pattern to parse episode information from the filename. */
-	private static Pattern episodePattern = Pattern.compile("S(\\d{2})E(\\d{2})|[^\\d](\\d{1,2})x(\\d{2})[^\\d]");
+	private static final Collection<Pattern> episodePatterns = asList(Pattern.compile("[Ss](\\d{2})[Ee](\\d{2})"), Pattern.compile("[^\\d](\\d{1,2})x(\\d{2})[^\\d]"));
 
 	//
 	// FILTER METHODS
@@ -58,20 +68,16 @@ public class EpisodeFilter implements Filter {
 		checkState(state instanceof TorrentState, "state is not a TorrentState but a %s!", state.getClass());
 
 		TorrentState torrentState = (TorrentState) state;
-		Map<Episode, Episode> episodes = new HashMap<Episode, Episode>();
+		final Multimap<Episode, TorrentFile> episodes = HashMultimap.create();
 		for (TorrentFile torrentFile : torrentState) {
-			Episode episode = extractEpisode(torrentFile);
-			if (episode == null) {
+			Optional<Episode> episode = extractEpisode(torrentFile);
+			if (!episode.isPresent()) {
 				continue;
 			}
-			if (!episodes.containsKey(episode)) {
-				episodes.put(episode, episode);
-			}
-			episode = episodes.get(episode);
-			episode.addTorrentFile(torrentFile);
+			episodes.put(episode.get(), torrentFile);
 		}
 
-		return new EpisodeState(episodes.values());
+		return new EpisodeState(from(episodes.keySet()).transform(episodeFiller(episodes)).toSet());
 	}
 
 	//
@@ -79,27 +85,49 @@ public class EpisodeFilter implements Filter {
 	//
 
 	/**
+	 * Returns a function that creates an {@link Episode} that contains all {@link
+	 * TorrentFile}s.
+	 *
+	 * @param episodeTorrents
+	 * 		A multimap mapping episodes to torrent files.
+	 * @return The function that performs the extraction of torrent files
+	 */
+	private static Function<Episode, Episode> episodeFiller(final Multimap<Episode, TorrentFile> episodeTorrents) {
+		return new Function<Episode, Episode>() {
+			@Override
+			public Episode apply(Episode episode) {
+				Episode completeEpisode = new Episode(episode.season(), episode.episode());
+				for (TorrentFile torrentFile : episodeTorrents.get(episode)) {
+					completeEpisode.addTorrentFile(torrentFile);
+				}
+				return completeEpisode;
+			}
+		};
+	}
+
+	/**
 	 * Extracts episode information from the given torrent file.
 	 *
 	 * @param torrentFile
-	 *            The torrent file to extract the episode information from
-	 * @return The extracted episode information, or {@code null} if no episode
-	 *         information could be found
+	 * 		The torrent file to extract the episode information from
+	 * @return The extracted episode information, or {@link Optional#absent()} if
+	 *         no episode information could be found
 	 */
-	private static Episode extractEpisode(TorrentFile torrentFile) {
-		Matcher matcher = episodePattern.matcher(torrentFile.name());
-		if (!matcher.find()) {
-			return null;
-		}
-		String seasonString = matcher.group(1);
-		String episodeString = matcher.group(2);
-		if ((seasonString == null) && (episodeString == null)) {
-			seasonString = matcher.group(3);
-			episodeString = matcher.group(4);
+	private static Optional<Episode> extractEpisode(TorrentFile torrentFile) {
+		logger.debug(String.format("Extracting episode from %s...", torrentFile));
+		for (Pattern episodePattern : episodePatterns) {
+			Matcher matcher = episodePattern.matcher(torrentFile.name());
+			if (!matcher.find() || matcher.groupCount() < 2) {
+				continue;
+			}
+			String seasonString = matcher.group(1);
+			String episodeString = matcher.group(2);
+			logger.debug(String.format("Parsing %s and %s as season and episode...", seasonString, episodeString));
+			int season = Integer.valueOf(seasonString);
+			int episode = Integer.valueOf(episodeString);
+			return Optional.of(new Episode(season, episode));
 		}
-		int season = Integer.valueOf(seasonString);
-		int episode = Integer.valueOf(episodeString);
-		return new Episode(season, episode);
+		return absent();
 	}
 
 }