From f9200718cf8774305f21ad9cf3ae59cadbe1ef6d Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Sun, 19 Feb 2012 00:07:10 +0000 Subject: [PATCH] Update season and episode regex to support tv shows with release year after the Series name --- source/lib/DownloadDispatcher/Source/Plugin/TV.class.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/lib/DownloadDispatcher/Source/Plugin/TV.class.php b/source/lib/DownloadDispatcher/Source/Plugin/TV.class.php index 066e582..77d0f8b 100644 --- a/source/lib/DownloadDispatcher/Source/Plugin/TV.class.php +++ b/source/lib/DownloadDispatcher/Source/Plugin/TV.class.php @@ -156,7 +156,7 @@ class DownloadDispatcher_Source_Plugin_TV extends DownloadDispatcher_Source_Plug return null; }; - if (preg_match('/(\d+)x\d+|s(\d+)e\d+|(?:(?:19|20)\d{2}[\s\.]+)?(\d+)\d{2}/i', $name, $matches)) { + if (preg_match('/(\d+)\d{2}(?!\d|[\s\.](?:\d+x\d+|s\d+e\d+))|(\d+)x\d+|s(\d+)e\d+/i', $name, $matches)) { return $set_season($matches); } else { return 0; @@ -173,7 +173,8 @@ class DownloadDispatcher_Source_Plugin_TV extends DownloadDispatcher_Source_Plug return null; }; - if (preg_match('/\d+x(\d+)|s\d+e(\d+)|(?:(?:19|20)\d{2}[\s\.]+)?\d+(\d{2})/i', $name, $matches)) { +# if (preg_match('/\d+x(\d+)|s\d+e(\d+)|(?:(?:19|20)\d{2}[\s\.]+)?\d+(\d{2})/i', $name, $matches)) { + if (preg_match('/\d+(\d{2})(?!\d|[\s\.](?:\d+x\d+|s\d+e\d+))|\d+x(\d+)|s\d+e(\d+)/i', $name, $matches)) { return $set_episode($matches); } else { return 0;