From e8cabe88bd4cfa13778b64a15268960194df15ff Mon Sep 17 00:00:00 2001
From: stef76 <chipie76710@gmail.com>
Date: Sat, 2 May 2015 17:13:37 +0200
Subject: [PATCH] Update xthor.py
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Mise à jour avec le nouveau CMS
---
 sickbeard/providers/xthor.py | 342 +++++++++++++++++------------------
 1 file changed, 170 insertions(+), 172 deletions(-)

diff --git a/sickbeard/providers/xthor.py b/sickbeard/providers/xthor.py
index b5fde78e4..e7bded7bd 100644
--- a/sickbeard/providers/xthor.py
+++ b/sickbeard/providers/xthor.py
@@ -31,178 +31,176 @@ import re
 
 class XTHORProvider(generic.TorrentProvider):
 
-    def __init__(self):
-        
-        generic.TorrentProvider.__init__(self, "XTHOR")
-
-        self.supportsBacklog = True
-        
-        self.cj = cookielib.CookieJar()
-        self.opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(self.cj))
-        
-        self.url = "https://xthor.bz"
-        
-        self.login_done = False
-        self.failed_login_logged = False
-        self.successful_login_logged = False
-        
-    def isEnabled(self):
-        return sickbeard.XTHOR
-    
-    def getSearchParams(self, searchString, audio_lang, french=None, fullSeason=False):
-        results = []    
-        if audio_lang == "en" and french==None:
-            results.append( urllib.urlencode( {
-                'keywords': searchString  ,                                                         
-            } ) + "&cid=43,69&[PARAMSTR]=" + searchString )
-        elif audio_lang == "fr" or french:
-            results.append( urllib.urlencode( {
-                'keywords': searchString
-            } ) + "&cid=42,41&[PARAMSTR]=" + searchString)
-        else:
-            results.append( urllib.urlencode( {
-                'keywords': searchString
-            } ) + "&cid=42,43,41,69&[PARAMSTR]=" + searchString)
-        #Désactivé car on ne peut pas savoir la langue
-        #if fullSeason:
-        #    results.append( urllib.urlencode( {
-        #        'keywords': searchString
-        #    } ) + "&cid=70&[PARAMSTR]=" + searchString)
-        return results
-        
-    def _get_season_search_strings(self, show, season):
-
-        showNam = show_name_helpers.allPossibleShowNames(show)
-        showNames = list(set(showNam))
-        results = []
-        for showName in showNames:
-            results.extend( self.getSearchParams(showName + " saison%d" % season, show.audio_lang, fullSeason=True))
-            results.extend( self.getSearchParams(showName + " season%d" % season, show.audio_lang, fullSeason=True))
-            results.extend( self.getSearchParams(showName + " saison %d" % season, show.audio_lang, fullSeason=True))
-            results.extend( self.getSearchParams(showName + " season %d" % season, show.audio_lang, fullSeason=True))
-            results.extend( self.getSearchParams(showName + " saison%02d" % season, show.audio_lang, fullSeason=True))
-            results.extend( self.getSearchParams(showName + " season%02d" % season, show.audio_lang, fullSeason=True))
-            results.extend( self.getSearchParams(showName + " saison %02d" % season, show.audio_lang, fullSeason=True))
-            results.extend( self.getSearchParams(showName + " season %02d" % season, show.audio_lang, fullSeason=True))
-            results.extend( self.getSearchParams(showName + ".S%02d." % season, show.audio_lang, fullSeason=True))
-        return results
-
-    def _get_episode_search_strings(self, ep_obj, french=None):
-
-        showNam = show_name_helpers.allPossibleShowNames(ep_obj.show)
-        showNames = list(set(showNam))
-        results = []
-        for showName in showNames:
-            results.extend( self.getSearchParams( "%s S%02dE%02d" % ( showName, ep_obj.scene_season, ep_obj.scene_episode), ep_obj.show.audio_lang, french ))
-            results.extend( self.getSearchParams( "%s %dx%02d" % ( showName, ep_obj.scene_season, ep_obj.scene_episode ), ep_obj.show.audio_lang, french ))
-        return results
-    
-    def _get_title_and_url(self, item):
-        return (item.title, item.url)
-    
-    def getQuality(self, item):
-        return item.getQuality()
-    
-    def _doLogin(self, login, password):
-
-        listeUserAgents = [ 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_5; fr-fr) AppleWebKit/525.18 (KHTML, like Gecko) Version/3.1.2 Safari/525.20.1',
-                                                'Mozilla/5.0 (Windows NT 6.1) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/14.0.835.186 Safari/535.1',
-                                                'Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US) AppleWebKit/525.13 (KHTML, like Gecko) Chrome/0.2.149.27 Safari/525.13',
-                                                'Mozilla/5.0 (X11; U; Linux x86_64; en-us) AppleWebKit/528.5+ (KHTML, like Gecko, Safari/528.5+) midori',
-                                                'Mozilla/5.0 (Windows NT 6.0) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.107 Safari/535.1',
-                                                'Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-us) AppleWebKit/312.1 (KHTML, like Gecko) Safari/312',
-                                                'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.12 Safari/535.11',
-                                                'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/535.8 (KHTML, like Gecko) Chrome/17.0.940.0 Safari/535.8' ]
-
-        self.opener.addheaders = [('User-agent', random.choice(listeUserAgents))] 
-                                              
-        data = urllib.urlencode({'action':'login','loginbox_membername': login, 'loginbox_password' : password, 'loginbox_remember' : 'true'})
-     
-        r = self.opener.open(self.url + '/ajax/login.php',data)
-        
-        for index, cookie in enumerate(self.cj):
-            if (cookie.name == "tsue_member"): self.login_done = True
-                                
-        if not self.login_done and not self.failed_login_logged:
-            logger.log(u"Unable to login to XTHOR. Please check username and password.", logger.WARNING) 
-            self.failed_login_logged = True
-        
-        if self.login_done and not self.successful_login_logged:
-            logger.log(u"Login to XTHOR successful", logger.MESSAGE) 
-            self.successful_login_logged = True        
-
-    def _doSearch(self, searchString, show=None, season=None, french=None):
-
-        
-        if not self.login_done:
-            self._doLogin( sickbeard.XTHOR_USERNAME, sickbeard.XTHOR_PASSWORD )
-
-        results = []
-       
-        searchUrl = self.url + '?p=torrents&pid=10&search_type=name&' + searchString.replace('!','')
- 
-        logger.log(u"Search string: " + searchUrl, logger.DEBUG)
-        
-        r = self.opener.open( searchUrl )
-
-        soup = BeautifulSoup( r)
-
-        resultsTable = soup.find("table", { "id" : "torrents_table_classic"  })
-        if resultsTable:
-
-            rows = resultsTable.findAll("tr")
-           
-            for row in rows:
-            
-                link = row.find("a",href=re.compile("action=details"))                                                           
-                                  
-                if link:               
-                    title = link.text
-                    recherched=searchUrl.split("&[PARAMSTR]=")[1]
-                    recherched=recherched.replace(" ","(.*)")
-                    logger.log(u"XTHOR TITLE : " + title, logger.DEBUG)
-                    logger.log(u"XTHOR CHECK MATCH : " + recherched, logger.DEBUG)                                        
-                    if re.match(recherched,title , re.IGNORECASE):                                        
-                        downloadURL =  row.find("a",href=re.compile("action=download"))['href']             
-                        logger.log(u"XTHOR DOWNLOAD URL : " + downloadURL, logger.DEBUG) 
-                    else:
-                        continue
-                    quality = Quality.nameQuality( title )
-                    if quality==Quality.UNKNOWN and title:
-                        if '720p' not in title.lower() and '1080p' not in title.lower():
-                            quality=Quality.SDTV
-                    if show and french==None:
-                        results.append( XTHORSearchResult( self.opener, title, downloadURL, quality, str(show.audio_lang) ) )
-                    elif show and french:
-                        results.append( XTHORSearchResult( self.opener, title, downloadURL, quality, 'fr' ) )
-                    else:
-                        results.append( XTHORSearchResult( self.opener, title, downloadURL, quality ) )
-        
-        return results
-    
-    def getResult(self, episodes):
-        """
-        Returns a result of the correct type for this provider
-        """
-        result = classes.TorrentDataSearchResult(episodes)
-        result.provider = self
-
-        return result    
-    
+	def __init__(self):
+		
+		generic.TorrentProvider.__init__(self, "XTHOR")
+		
+		self.supportsBacklog = True
+		
+		
+		self.cj = cookielib.CookieJar()
+		self.opener = urllib2.build_opener(urllib2.HTTPCookieProcessor(self.cj))
+		
+		self.url = "https://xthor.bz"
+		
+		self.login_done = False
+		self.failed_login_logged = False
+		self.successful_login_logged = False
+		
+	def isEnabled(self):
+		return sickbeard.XTHOR
+
+	def getSearchParams(self, searchString, audio_lang, french=None, fullSeason=False):
+		results = []
+		
+		if audio_lang == "en" and french==None:
+			results.append("c16=1&c17=1&searchin=title&search=" + searchString  )
+		elif audio_lang == "fr" or french:
+			results.append("c14=1&c15=1&searchin=title&search=" + searchString)
+		else:
+			results.append("c14=1&c15=1&c16=1&c17=1&searchin=title&search=" + searchString)
+		#Désactivé car on ne peut pas savoir la langue
+		#if fullSeason:
+		#    results.append( urllib.urlencode( {
+		#        'keywords': searchString
+		#    } ) + "&cid=70&[PARAMSTR]=" + searchString)
+		return results
+		
+	def _get_season_search_strings(self, show, season):
+
+		showNam = show_name_helpers.allPossibleShowNames(show)
+		showNames = list(set(showNam))
+		results = []
+		for showName in showNames:
+			results.extend( self.getSearchParams(showName + " saison%d" % season, show.audio_lang, fullSeason=True))
+			results.extend( self.getSearchParams(showName + " season%d" % season, show.audio_lang, fullSeason=True))
+			results.extend( self.getSearchParams(showName + " saison %d" % season, show.audio_lang, fullSeason=True))
+			results.extend( self.getSearchParams(showName + " season %d" % season, show.audio_lang, fullSeason=True))
+			results.extend( self.getSearchParams(showName + " saison%02d" % season, show.audio_lang, fullSeason=True))
+			results.extend( self.getSearchParams(showName + " season%02d" % season, show.audio_lang, fullSeason=True))
+			results.extend( self.getSearchParams(showName + " saison %02d" % season, show.audio_lang, fullSeason=True))
+			results.extend( self.getSearchParams(showName + " season %02d" % season, show.audio_lang, fullSeason=True))
+			results.extend( self.getSearchParams(showName + ".S%02d." % season, show.audio_lang, fullSeason=True)) 
+		return results
+
+	def _get_episode_search_strings(self, ep_obj, french=None):
+
+		showNam = show_name_helpers.allPossibleShowNames(ep_obj.show)
+		showNames = list(set(showNam))
+		results = []
+		for showName in showNames:
+			results.extend( self.getSearchParams( "%s S%02dE%02d" % ( showName, ep_obj.scene_season, ep_obj.scene_episode), ep_obj.show.audio_lang, french ))
+			results.extend( self.getSearchParams( "%s %dx%02d" % ( showName, ep_obj.scene_season, ep_obj.scene_episode ), ep_obj.show.audio_lang, french ))
+		return results
+
+	def _get_title_and_url(self, item):
+		return (item.title, item.url)
+
+	def getQuality(self, item):
+		return item.getQuality()
+
+	def _doLogin(self, login, password):
+
+		listeUserAgents = [ 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_5; fr-fr) AppleWebKit/525.18 (KHTML, like Gecko) Version/3.1.2 Safari/525.20.1',
+												'Mozilla/5.0 (Windows NT 6.1) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/14.0.835.186 Safari/535.1',
+												'Mozilla/5.0 (Windows; U; Windows NT 6.0; en-US) AppleWebKit/525.13 (KHTML, like Gecko) Chrome/0.2.149.27 Safari/525.13',
+												'Mozilla/5.0 (X11; U; Linux x86_64; en-us) AppleWebKit/528.5+ (KHTML, like Gecko, Safari/528.5+) midori',
+												'Mozilla/5.0 (Windows NT 6.0) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/13.0.782.107 Safari/535.1',
+												'Mozilla/5.0 (Macintosh; U; PPC Mac OS X; en-us) AppleWebKit/312.1 (KHTML, like Gecko) Safari/312',
+												'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.11 (KHTML, like Gecko) Chrome/17.0.963.12 Safari/535.11',
+												'Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/535.8 (KHTML, like Gecko) Chrome/17.0.940.0 Safari/535.8' ]
+
+		self.opener.addheaders = [('User-agent', random.choice(listeUserAgents))] 
+											  
+		data = urllib.urlencode({'action':'takelogin.php','username': login, 'password' : password, 'submitme' : 'X'})
+	 
+		r = self.opener.open(self.url + '/takelogin.php',data)
+		
+		for index, cookie in enumerate(self.cj):
+			if (cookie.name == "uid"): self.login_done = True
+								
+		if not self.login_done and not self.failed_login_logged:
+			logger.log(u"Unable to login to XTHOR. Please check username and password.", logger.WARNING) 
+			self.failed_login_logged = True
+		
+		if self.login_done and not self.successful_login_logged:
+			logger.log(u"Login to XTHOR successful", logger.MESSAGE) 
+			self.successful_login_logged = True        
+
+	def _doSearch(self, searchString, show=None, season=None, french=None):
+
+		
+		if not self.login_done:
+			self._doLogin( sickbeard.XTHOR_USERNAME, sickbeard.XTHOR_PASSWORD )
+
+		results = []
+	   
+		searchUrl = self.url + '/browse.php?' + searchString.replace('!','')
+
+		logger.log(u"Search string: " + searchUrl, logger.DEBUG)
+		
+		r = self.opener.open( searchUrl )
+
+		soup = BeautifulSoup( r)
+
+		resultsTable = soup.find("table", { "class" : "table2"  })
+		if resultsTable:
+
+			rows = resultsTable.findAll("tr")
+		   
+			for row in rows:
+			
+				link = row.find("a",href=re.compile("details.php"))                                                           
+								  
+				if link:               
+					title = link.text
+					recherched=searchUrl.split("&search=")[1]
+					recherched=recherched.replace(" ","(.*)")
+					recherched= recherched + "(.*)"
+					logger.log(u"XTHOR TITLE : " + title, logger.DEBUG)
+					logger.log(u"XTHOR CHECK MATCH : " + recherched, logger.DEBUG)                                        
+					if re.match(recherched,title , re.IGNORECASE):                                        
+						downloadURL =  row.find("a",href=re.compile("download.php"))['href']
+						downloadURL = self.url + '/'+ downloadURL
+						logger.log(u"XTHOR DOWNLOAD URL : " + downloadURL, logger.DEBUG) 
+					else:
+						continue
+					quality = Quality.nameQuality( title )
+					if quality==Quality.UNKNOWN and title:
+						if '720p' not in title.lower() and '1080p' not in title.lower():
+							quality=Quality.SDTV
+					if show and french==None:
+						results.append( XTHORSearchResult( self.opener, title, downloadURL, quality, str(show.audio_lang) ) )
+					elif show and french:
+						results.append( XTHORSearchResult( self.opener, title, downloadURL, quality, 'fr' ) )
+					else:
+						results.append( XTHORSearchResult( self.opener, title, downloadURL, quality ) )
+		
+		return results
+
+	def getResult(self, episodes):
+		"""
+		Returns a result of the correct type for this provider
+		"""
+		result = classes.TorrentDataSearchResult(episodes)
+		result.provider = self
+
+		return result    
+
 class XTHORSearchResult:
-    
-    def __init__(self, opener, title, url, quality, audio_langs=None):
-        self.opener = opener
-        self.title = title
-        self.url = url
-        self.quality = quality
-        self.audio_langs=audio_langs    
-
-    def getNZB(self):
-        logger.log(u"XTHOR GETNZB URL : " + self.url, logger.DEBUG) 
-        return self.opener.open( self.url , 'wb').read()             
-
-    def getQuality(self):
-        return self.quality
+
+	def __init__(self, opener, title, url, quality, audio_langs=None):
+		self.opener = opener
+		self.title = title
+		self.url = url
+		self.quality = quality
+		self.audio_langs=audio_langs    
+
+	def getNZB(self):
+		logger.log(u"XTHOR GETNZB URL : " + self.url, logger.DEBUG) 
+		return self.opener.open( self.url , 'wb').read()             
+
+	def getQuality(self):
+		return self.quality
 
 provider = XTHORProvider()
-- 
GitLab