From f991bcb71eab2a58b17db72040a00b3f4754b27e Mon Sep 17 00:00:00 2001 From: sarakha63 <sarakha_ludovic@yahoo.fr> Date: Tue, 30 Dec 2014 18:40:24 +0100 Subject: [PATCH] corrected ftdb --- sickbeard/__init__.py | 3 +-- sickbeard/providers/ftdb.py | 2 +- sickbeard/providers/xthor.py | 42 +++++++++++++++++++----------------- 3 files changed, 24 insertions(+), 23 deletions(-) diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py index 636368906..2111be016 100644 --- a/sickbeard/__init__.py +++ b/sickbeard/__init__.py @@ -156,6 +156,7 @@ NZB_METHOD = None USENET_RETENTION = None TORRENT_METHOD = None TORRENT_DIR = None +NZB_DIR = None DOWNLOAD_PROPERS = None DOWNLOAD_FRENCH = None PREFERED_METHOD = None @@ -181,8 +182,6 @@ ETHOR_KEY = None BTN = False BTN_API_KEY = None -TORRENT_DIR = None - ADD_SHOWS_WO_DIR = None CREATE_MISSING_SHOW_DIRS = None RENAME_EPISODES = False diff --git a/sickbeard/providers/ftdb.py b/sickbeard/providers/ftdb.py index a7a95e351..a76095a35 100644 --- a/sickbeard/providers/ftdb.py +++ b/sickbeard/providers/ftdb.py @@ -167,7 +167,7 @@ class FTDBProvider(generic.TorrentProvider): link = row.find("a", title=True) title = link['title'] - autogetURL = self.url + (row.find("li", { "class" : "torrents_name"}).find('a')['href'][1:]).replace('#FTD_MENU','&menu=4') + autogetURL = self.url +'/'+ (row.find("li", { "class" : "torrents_name"}).find('a')['href'][1:]).replace('#FTD_MENU','&menu=4') r = self.opener.open(autogetURL,'wb').read() soup = BeautifulSoup( r) downloadURL = soup.find("div", { "class" : "autoget"}).find('a')['href'] diff --git a/sickbeard/providers/xthor.py b/sickbeard/providers/xthor.py index bdaac09fc..b5fde78e4 100644 --- a/sickbeard/providers/xthor.py +++ b/sickbeard/providers/xthor.py @@ -52,7 +52,7 @@ class XTHORProvider(generic.TorrentProvider): def getSearchParams(self, searchString, audio_lang, french=None, fullSeason=False): results = [] if audio_lang == "en" and french==None: - results.append( urllib.urlencode( { + results.append( urllib.urlencode( { 'keywords': searchString , } ) + "&cid=43,69&[PARAMSTR]=" + searchString ) elif audio_lang == "fr" or french: @@ -145,7 +145,7 @@ class XTHORProvider(generic.TorrentProvider): r = self.opener.open( searchUrl ) - soup = BeautifulSoup( r, "html.parser" ) + soup = BeautifulSoup( r) resultsTable = soup.find("table", { "id" : "torrents_table_classic" }) if resultsTable: @@ -157,24 +157,26 @@ class XTHORProvider(generic.TorrentProvider): 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) - 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 ) ) + 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 -- GitLab