Merge pull request #115 from 4Christopher/Movie2kTo

Movie2kTo: Added regular expression for matching the hoster URL

1 files changed, 14 insertions, 7 deletions

diff --git a/module/plugins/crypter/Movie2kTo.py b/module/plugins/crypter/Movie2kTo.py
index f2c5ece55..097cb702e 100644
--- a/module/plugins/crypter/Movie2kTo.py
+++ b/module/plugins/crypter/Movie2kTo.py
@@ -9,7 +9,7 @@ class Movie2kTo(Crypter):
 	__name__ = 'Movie2kTo'
 	__type__ = 'container'
 	__pattern__ = r'http://(?:www\.)?movie2k\.to/(.*)\.html'
-	__version__ = '0.4'
+	__version__ = '0.5'
 	__config__ = [('accepted_hosters', 'str', 'List of accepted hosters', 'Xvidstage, Putlocker, '),
 				('dir_quality', 'bool', 'Show the quality of the footage in the folder name', 'True'),
 				('whole_season', 'bool', 'Download whole season', 'False'),
@@ -132,12 +132,19 @@ class Movie2kTo(Crypter):
 						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="(http://[^"]*?)"', self.html).group(1)
-						self.logDebug('id: %s, %s: %s' % (h_id, hoster, url))
-						links.append(url)
-					except:
-						self.logDebug('Failed to find the URL')
+					# The iframe tag must continue with a width. There where
+					# two iframes in the site and I try to make sure that it
+					# matches the right one. This is not (yet) nessesary
+					# because the right iframe happens to be the first iframe.
+					for pattern in (r'<a target="_blank" href="(http://[^"]*?)"', r'<iframe src="(http://[^"]*?)" width'):
+						try:
+							url = re.search(pattern, self.html).group(1)
+						except:
+							self.logDebug('Failed to find the URL (pattern %s)' % pattern)
+						else:
+							self.logDebug('id: %s, %s: %s' % (h_id, hoster, url))
+							links.append(url)
+							break
 			else:
 				self.logDebug('Not accepted: %s, ID: %s%s' % (hoster, h_id, q_s))
 		# self.logDebug(links)