diff --git a/couchpotato/core/providers/torrent/cPASbien/main.py b/couchpotato/core/providers/torrent/cPASbien/main.py index c57962132e1071023be0486c11bd6cf7d8c036e5..d54e8d404497a4ae33916c4e0e279a985ed6180b 100755 --- a/couchpotato/core/providers/torrent/cPASbien/main.py +++ b/couchpotato/core/providers/torrent/cPASbien/main.py @@ -50,7 +50,6 @@ class cPASbien(TorrentProvider): TitleStringReal = (getTitle(movie['library']) + ' ' + simplifyString(quality['identifier'] )).replace('-',' ').replace(' ',' ').replace(' ',' ').replace(' ',' ').encode("utf8") - #TitleStringReal = TitleStringReal.replace(' ','+') URL = (self.urls['search']).encode('UTF8') URL=unicodedata.normalize('NFD',unicode(URL,"utf8","replace")) @@ -75,8 +74,6 @@ class cPASbien(TorrentProvider): cat_ids = self.getCatId(quality['identifier']) table_order = ['name', 'size', None, 'age', 'seeds', 'leechers'] - - log.error('Il y a des donnee') try: html = BeautifulSoup(data) @@ -118,7 +115,6 @@ class cPASbien(TorrentProvider): size = result.find_all('td')[1].text - #age = result.find_all('td')[4].text seeder = result.find_all('td')[2].find_all('span')[0].text leecher = result.find_all('td')[3].text age = '0' @@ -135,15 +131,7 @@ class cPASbien(TorrentProvider): return True if add == 1: - - log.error(name) - log.error(url_download) - log.error(detail_url) - log.error(size) - #log.error(age) - log.error(seeder) - log.error(leecher) - + new['id'] = id new['name'] = name.strip() new['url'] = url_download @@ -195,8 +183,6 @@ class cPASbien(TorrentProvider): def login(self): - log.debug('Try login cPASbien') - cookieprocessor = urllib2.HTTPCookieProcessor(cookielib.CookieJar()) opener = urllib2.build_opener(cookieprocessor, cPASbien.PTPHTTPRedirectHandler()) opener.addheaders = [ @@ -250,7 +236,6 @@ class cPASbien(TorrentProvider): req = urllib2.Request(url, data_tmp ) try: - log.error('Failed downloading from %s', self.getName()) return urllib2.urlopen(req).read() except: log.error('Failed downloading from %s: %s', (self.getName(), traceback.format_exc())) diff --git a/couchpotato/core/providers/torrent/t411/main.py b/couchpotato/core/providers/torrent/t411/main.py index c641e9647540bb2b6885fe9c4c8eff94bf5174b7..f939556649f4a96cee33fb4d9104680a5de1017e 100644 --- a/couchpotato/core/providers/torrent/t411/main.py +++ b/couchpotato/core/providers/torrent/t411/main.py @@ -58,19 +58,13 @@ class t411(TorrentProvider): URL = urllib2.quote(URL.encode('utf8'), ":/?=") - - data = self.getHTMLData(URL , opener = self.login_opener) - - if data: cat_ids = self.getCatId(quality['identifier']) table_order = ['name', 'size', None, 'age', 'seeds', 'leechers'] - log.debug('Il y a des donnee') - try: html = BeautifulSoup(data) @@ -105,8 +99,6 @@ class t411(TorrentProvider): def extra_check(item): return True - log.debug(name) - new['id'] = id new['name'] = name + ' french' new['url'] = url @@ -150,8 +142,6 @@ class t411(TorrentProvider): def login(self): - log.debug('Try login T411') - cookieprocessor = urllib2.HTTPCookieProcessor(cookielib.CookieJar()) opener = urllib2.build_opener(cookieprocessor, t411.PTPHTTPRedirectHandler()) opener.addheaders = [ @@ -188,18 +178,13 @@ class t411(TorrentProvider): def download(self, url = '', nzb_id = ''): - if not self.login_opener and not self.login(): return - values = { - 'url' : '/' - } - data_tmp = urllib.urlencode(values) - req = urllib2.Request(url, data_tmp ) - try: - log.error('Failed downloading from %s', self.getName()) - return urllib2.urlopen(req).read() + return self.urlopen(url, opener = self.login_opener) except: - log.error('Failed downloading from %s: %s', (self.getName(), traceback.format_exc())) \ No newline at end of file + log.error('Failed getting nzb from %s: %s', (self.getName(), traceback.format_exc())) + + return 'try_next' + \ No newline at end of file