Merge pull request #310 from raver2046/development

mise à jour du filtre de recherche libertalia pour moins d'erreurs

sickbeard/providers/libertalia.py

 # -*- coding: latin-1 -*-
-# Author: Raver2046 <raver2046@gmail.com>
+# Author: Raver2046 
 # based on tpi.py
 # URL: http://code.google.com/p/sickbeard/
 #
@@ -53,15 +53,15 @@ class LIBERTALIAProvider(generic.TorrentProvider):
         if audio_lang == "en" and french==None:
             results.append( urllib.urlencode( {
                 'name': searchString                            
-            } ) + "*VO*&cat%5B%5D=9" )
+            } ) + "*VO*&cat%5B%5D=9&[PARAMSTR]=" + searchString +" VO" )
         elif audio_lang == "fr" or french:
             results.append( urllib.urlencode( {
                 'name': searchString
-            } ) + "*FRENCH*&cat%5B%5D=9")
+            } ) + "*FRENCH*&cat%5B%5D=9&[PARAMSTR]=" + searchString +" FRENCH")
         else:
             results.append( urllib.urlencode( {
                 'name': searchString
-            } ) + "&cat%5B%5D=9")
+            } ) + "&cat%5B%5D=9&[PARAMSTR]=" + searchString )
         return results
         
     def _get_season_search_strings(self, show, season):
@@ -153,10 +153,13 @@ class LIBERTALIAProvider(generic.TorrentProvider):
                 link = columns.find("a",  href=re.compile("torrents"))                    
                 if link:               
                     title = link.text
-                    logger.log(u"LIBERTALIA TITLE TEMP: " + title, logger.DEBUG)                   
+                    recherched=searchUrl.split("&[PARAMSTR]=")[1]
+                    recherched=recherched.replace(" ","(.*)")
+                    logger.log(u"LIBERTALIA TITLE : " + title, logger.DEBUG)  
+                    logger.log(u"LIBERTALIA CHECK MATCH : " + recherched, logger.DEBUG)                                        
                     #downloadURL =  self.url + "/" + row.find("a",href=re.compile("torrent_pass"))['href']
+                    if re.match(recherched,title , re.IGNORECASE):              
                       downloadURL =  row.find("a",href=re.compile("torrent_pass"))['href']                
-                
                       quality = Quality.nameQuality( title )
                       if quality==Quality.UNKNOWN and title:
                           if '720p' not in title.lower() and '1080p' not in title.lower():

sickbeard/providers/thinkgeek.py

 # -*- coding: latin-1 -*-
-# Author: Raver2046 <raver2046@gmail.com>
+# Author: Raver2046 
 # based on tpi.py
 # URL: http://code.google.com/p/sickbeard/
 #
@@ -89,7 +89,6 @@ class THINKGEEKProvider(generic.TorrentProvider):
         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):