added support to add all episodes and/or seasons

1 files changed, 54 insertions, 14 deletions

diff --git a/module/plugins/crypter/Movie2kTo.py b/module/plugins/crypter/Movie2kTo.py
index e33dc1d9f..a79b32938 100644
--- a/module/plugins/crypter/Movie2kTo.py
+++ b/module/plugins/crypter/Movie2kTo.py
@@ -7,22 +7,62 @@ from module.plugins.Crypter import Crypter
 class Movie2kTo(Crypter):
 	__name__ = "Movie2kTo"
 	__type__ = "container"
-	__pattern__ = r"http://(?:www\.)?movie2k\.to/(.*\.html)"
+	__pattern__ = r"http://(?:www\.)?movie2k\.to/(.*)\.html"
 	__version__ = "0.1"
-	__config__ = [("accepted_hosters", "str", "List of accepted hosters", "Xvidstage, ")]
+	__config__ = [("accepted_hosters", "str", "List of accepted hosters", "Xvidstage, "),
+				("whole_season", "bool", "Download whole season", "False"),
+				("everything", "bool", "Download everything", "False")]
 	__description__ = """Movie2k.to Container Plugin"""
 	__author_name__ = ('4Christopher')
 	__author_mail__ = ('4Christopher@gmx.de')
 	BASE_URL_PATTERN = r'http://(?:www\.)?movie2k\.to/'
-	TVSHOW_URL_PATH_PATTERN = r'tvshows-(?P<id>\d+?)-(?P<name>.*)\.html'
-	FILM_URL_PATH_PATTERN = r'(?P<name>.*)-online-film-(?P<id>\d+?)\.html'
+	TVSHOW_URL_PATH_PATTERN = r'tvshows-(?P<id>\d+?)-(?P<name>.+)'
+	FILM_URL_PATH_PATTERN = r'(?P<name>.+?)-online-film-(?P<id>\d+)'
+	SEASON_PATTERN = r'<div id="episodediv(\d+?)" style="display:(inline|none)">(.*?)</div>'
+	EP_PATTERN = r'<option value="(.+?)"( selected)?>Episode\s*?(\d+?)</option>'
 	BASE_URL = 'http://www.movie2k.to'
 		
 	def decrypt(self, pyfile):
 		self.html = self.load(pyfile.url)
 		self.package = pyfile.package()
 		self.folder = self.package.folder
-		self.url_path = re.match(self.__pattern__, pyfile.url).group(1)
+		whole_season = self.getConfig('whole_season')
+		everything = self.getConfig('everything')
+		self.getInfo(pyfile.url)
+
+		if (whole_season or everything) and self.format == 'tvshow':
+			self.logDebug('Downloading the whole season')
+			for season, season_sel, html in re.findall(self.SEASON_PATTERN, self.html, re.DOTALL | re.I):
+				if (season_sel == 'inline') or everything:
+					season_links = []
+					for url_path, ep_sel, ep in re.findall(self.EP_PATTERN, html, re.I):
+						season_name = self.name_tvshow(season, ep)
+						self.logDebug('%s: %s' % (season_name, url_path))
+						if ep_sel and (season_sel == 'inline'):
+							self.logDebug('%s selected (in the start URL: %s)' % (season_name, pyfile.url))
+							season_links += self.getLinks('%s/%s' % (self.BASE_URL, url_path))
+						elif (whole_season and (season_sel == 'inline')) or everything:
+							season_links += self.getLinks('%s/%s' % (self.BASE_URL, url_path))
+					self.packages.append(('Season %s' % season, season_links, 'Season %s' % season))
+
+		else:
+			self.getLinks(pyfile.url)
+			if self.format != 'film':
+				self.name = self.package.name
+				self.logDebug('Using new name: %s' % self.name)
+			self.logDebug('folder name: %s' % self.package.folder)
+			self.packages.append((self.name, links, self.package.folder))
+
+	def tvshow_number(self, number):
+		if int(number) < 10:
+			return '0%s' % number
+		else:
+			return number
+	def name_tvshow(self, season, ep):
+		return '%s S%sE%s' % (self.name, self.tvshow_number(season), self.tvshow_number(ep))
+
+	def getInfo(self, url):
+		self.url_path = re.match(self.__pattern__, url).group(1)
 		self.logDebug('URL Path: %s' % self.url_path)
 		self.format = pattern_re = None
 		if re.match(r'tvshows', self.url_path):
@@ -31,32 +71,32 @@ class Movie2kTo(Crypter):
 		elif re.search(r'.*online-film-\d+?\.html', self.url_path):
 			self.format = 'film'
 			pattern_re = re.search(self.FILM_URL_PATH_PATTERN, self.url_path)
+		else:
+			self.format = 'porn'
+
+		self.logDebug('Format: %s' % self.format)
 
 		self.name = pattern_re.group('name')
-		self.id = pattern_re.group('id')
 		self.logDebug('Name: %s' % self.name)
+		self.id = pattern_re.group('id')
 		self.logDebug('ID: %s' % self.id)
 		
-		accepted_hosters = re.findall(r'\b(\w+?)\b', self.getConfig(accepted_hosters))
+	def getLinks(self, url):
+		accepted_hosters = re.findall(r'\b(\w+?)\b', self.getConfig('accepted_hosters'))
 		links = []
 		## h_id: hoster_id of a possible hoster
 		for h_id, hoster in re.findall(r'links\[(\d+?)\].*&nbsp;(.*?)</a>', self.html):
 			if hoster in accepted_hosters:
-				self.logDebug('id: %s, %s' % (h_id, hoster))
 				if h_id != self.id:
 					self.html = self.load('%s/tvshows-%s-%s.html' % (self.BASE_URL, h_id, self.name))
 				else:
 					self.logDebug('This is already the right ID')
 				try:
 					url = re.search(r'<a target="_blank" href="(.*?)"', self.html).group(1)
-					self.logDebug(url)
+					self.logDebug('id: %s, %s: %s' % (h_id, hoster, url))
 					links.append(url)
 				except:
 					self.logDebug('Failed to find the URL')
 		
 		self.logDebug(links)
-		if self.format != 'film':
-			self.name = self.package.name
-			self.logDebug('Using new name: %s' % self.name)
-		self.logDebug('folder name: %s' % self.package.folder)
-		self.packages.append((self.name, links, self.package.folder))
+		return links