diff --git a/CHANGES.md b/CHANGES.md index a5a841f4..5574cd88 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -21,6 +21,7 @@ * Change provider IPT only decode unicode search strings * Change provider IPT login process to use General Config/Advanced/Proxy host setting * Change provider TB PEP8 and code convention cleanup +* Change provider TB login process to use General Config/Advanced/Proxy host setting * Remove useless webproxies from provider TPB as they fail for one reason or another * Change provider TPB to use mediaExtensions from common instead of hard-coded private list * Add new tld variants to provider TPB @@ -32,6 +33,7 @@ * Change refactor and code simplification for torrent providers * Change refactor SCC to use torrent provider simplification and PEP8 * Change refactor SCD to use torrent provider simplification +* Change refactor TB to use torrent provider simplification and PEP8 * Remove HDTorrents torrent provider * Remove NextGen torrent provider * Add Rarbg torrent provider diff --git a/sickbeard/providers/torrentbytes.py b/sickbeard/providers/torrentbytes.py index 4d9c1470..fce0b307 100644 --- a/sickbeard/providers/torrentbytes.py +++ b/sickbeard/providers/torrentbytes.py @@ -1,5 +1,4 @@ -# Author: Idan Gutman -# URL: http://code.google.com/p/sickbeard/ +# coding=utf-8 # # This file is part of SickGear. # @@ -17,181 +16,103 @@ # along with SickGear. If not, see . import re -import traceback import datetime +import traceback -import sickbeard -import generic -from sickbeard.common import Quality -from sickbeard import logger, tvcache, db, classes, helpers, show_name_helpers -from sickbeard.exceptions import ex -from lib import requests -from lib.requests import exceptions +from . import generic +from sickbeard import logger, tvcache, helpers from sickbeard.bs4_parser import BS4Parser from lib.unidecode import unidecode -from sickbeard.helpers import sanitizeSceneName class TorrentBytesProvider(generic.TorrentProvider): - urls = {'base_url': 'https://www.torrentbytes.net', - 'login': 'https://www.torrentbytes.net/takelogin.php', - 'detail': 'https://www.torrentbytes.net/details.php?id=%s', - 'search': 'https://www.torrentbytes.net/browse.php?search=%s%s', - 'download': 'https://www.torrentbytes.net/download.php?id=%s&SSL=1&name=%s'} def __init__(self): - generic.TorrentProvider.__init__(self, 'TorrentBytes', True, False) - self.username = None - self.password = None - self.ratio = None - self.minseed = None - self.minleech = None - self.cache = TorrentBytesCache(self) - self.url = self.urls['base_url'] + generic.TorrentProvider.__init__(self, 'TorrentBytes') + + self.url_base = 'https://www.torrentbytes.net/' + self.urls = {'config_provider_home_uri': self.url_base, + 'login': self.url_base + 'takelogin.php', + 'search': self.url_base + 'browse.php?search=%s%s', + 'get': self.url_base + '%s'} + self.categories = '&c41=1&c33=1&c38=1&c32=1&c37=1' - def getQuality(self, item, anime=False): + self.url = self.urls['config_provider_home_uri'] - quality = Quality.sceneQuality(item[0], anime) - return quality + self.username, self.password, self.minseed, self.minleech = 4 * [None] + self.cache = TorrentBytesCache(self) def _doLogin(self): - login_params = {'username': self.username, - 'password': self.password, - 'login': 'Log in!'} + logged_in = lambda: 'uid' in self.session.cookies and 'pass' in self.session.cookies + if logged_in(): + return True - self.session = requests.Session() + if self._checkAuth(): + login_params = {'username': self.username, 'password': self.password, 'login': 'Log in!'} + response = helpers.getURL(self.urls['login'], post_data=login_params, session=self.session) + if response and logged_in(): + return True - try: - response = self.session.post(self.urls['login'], data=login_params, timeout=30, verify=False) - except (requests.exceptions.ConnectionError, requests.exceptions.HTTPError) as e: - logger.log(u'Unable to connect to ' + self.name + ' provider: ' + ex(e), logger.ERROR) - return False + msg = u'Failed to authenticate with %s, abort provider' + if response and 'Username or password incorrect' in response: + msg = u'Invalid username or password for %s. Check settings' + logger.log(msg % self.name, logger.ERROR) - if re.search('Username or password incorrect', response.text): - logger.log(u'Your authentication credentials for ' + self.name + ' are incorrect, check your config.', logger.ERROR) - return False - - return True - - def _get_season_search_strings(self, ep_obj): - - search_string = {'Season': []} - for show_name in set(show_name_helpers.allPossibleShowNames(self.show)): - if ep_obj.show.air_by_date or ep_obj.show.sports: - ep_string = show_name + '.' + str(ep_obj.airdate).split('-')[0] - elif ep_obj.show.anime: - ep_string = show_name + '.' + '%d' % ep_obj.scene_absolute_number - else: - ep_string = show_name + '.S%02d' % int(ep_obj.scene_season) # 1) showName SXX - - search_string['Season'].append(ep_string) - - return [search_string] - - def _get_episode_search_strings(self, ep_obj, add_string=''): - - search_string = {'Episode': []} - - if not ep_obj: - return [] - - if self.show.air_by_date: - for show_name in set(show_name_helpers.allPossibleShowNames(self.show)): - ep_string = sanitizeSceneName(show_name) + ' ' + \ - str(ep_obj.airdate).replace('-', '|') - search_string['Episode'].append(ep_string) - elif self.show.sports: - for show_name in set(show_name_helpers.allPossibleShowNames(self.show)): - ep_string = sanitizeSceneName(show_name) + ' ' + \ - str(ep_obj.airdate).replace('-', '|') + '|' + \ - ep_obj.airdate.strftime('%b') - search_string['Episode'].append(ep_string) - elif self.show.anime: - for show_name in set(show_name_helpers.allPossibleShowNames(self.show)): - ep_string = sanitizeSceneName(show_name) + ' ' + \ - '%i' % int(ep_obj.scene_absolute_number) - search_string['Episode'].append(ep_string) - else: - for show_name in set(show_name_helpers.allPossibleShowNames(self.show)): - ep_string = show_name_helpers.sanitizeSceneName(show_name) + ' ' + \ - sickbeard.config.naming_ep_type[2] % {'seasonnumber': ep_obj.scene_season, - 'episodenumber': ep_obj.scene_episode} - - search_string['Episode'].append(re.sub('\s+', ' ', ep_string)) - - return [search_string] + return False def _doSearch(self, search_params, search_mode='eponly', epcount=0, age=0): results = [] - items = {'Season': [], 'Episode': [], 'RSS': []} - if not self._doLogin(): - return [] + return results + items = {'Season': [], 'Episode': [], 'Cache': []} + + rc = dict((k, re.compile('(?i)' + v)) for (k, v) in {'info': 'detail', 'get': 'download'}.items()) for mode in search_params.keys(): for search_string in search_params[mode]: - search_string, url = self._get_title_and_url([search_string, self.urls['search'], '', '', '']) if isinstance(search_string, unicode): search_string = unidecode(search_string) search_url = self.urls['search'] % (search_string, self.categories) - - logger.log(u'Search string: ' + search_url, logger.DEBUG) - html = self.getURL(search_url) - if not html: - continue + cnt = len(items[mode]) try: + if not html or self._has_no_results(html): + raise generic.HaltParseException + with BS4Parser(html, features=['html5lib', 'permissive']) as soup: torrent_table = soup.find('table', attrs={'border': '1'}) - torrent_rows = [] - if torrent_table: - torrent_rows = torrent_table.find_all('tr') + torrent_rows = [] if not torrent_table else torrent_table.find_all('tr') - # Continue only if one Release is found if 2 > len(torrent_rows): - logger.log(u'The data returned from ' + self.name + ' does not contain any torrents', - logger.DEBUG) - continue + raise generic.HaltParseException for tr in torrent_rows[1:]: - cells = tr.find_all('td') - - link = cells[1].find('a', attrs={'class': 'index'}) - - full_id = link['href'].replace('details.php?id=', '') - torrent_id = full_id.split('&')[0] - try: - if 'title' in link: - title = cells[1].find('a', {'class': 'index'})['title'] - else: - title = link.contents[0] - download_url = self.urls['download'] % (torrent_id, link.contents[0]) - tid = int(torrent_id) - seeders = int(cells[8].find('span').contents[0]) - leechers = int(cells[9].find('span').contents[0]) + seeders, leechers = [int(tr.find_all('td')[x].get_text().strip()) for x in (-2, -1)] + if 'Cache' != mode and (seeders < self.minseed or leechers < self.minleech): + continue + + info = tr.find('a', href=rc['info']) + title = 'title' in info.attrs and info.attrs['title'] or info.get_text().strip() + + download_url = self.urls['get'] % str(tr.find('a', href=rc['get'])['href']).lstrip('/') except (AttributeError, TypeError): continue - # Filter unseeded torrent - if 'RSS' != mode and (seeders < self.minseed or leechers < self.minleech): - continue - - if not title or not download_url: - continue - - item = title, download_url, tid, seeders, leechers - logger.log(u'Found result: ' + title + '(' + search_url + ')', logger.DEBUG) - - items[mode].append(item) + if title and download_url: + items[mode].append((title, download_url)) + except generic.HaltParseException: + pass except Exception: - logger.log(u'Failed parsing ' + self.name + ' Traceback: ' + traceback.format_exc(), logger.ERROR) + logger.log(u'Failed to parse. Traceback: %s' % traceback.format_exc(), logger.ERROR) + + self._log_result(mode, len(items[mode]) - cnt, search_url) # For each search mode sort all the items by seeders items[mode].sort(key=lambda tup: tup[3], reverse=True) @@ -200,52 +121,13 @@ class TorrentBytesProvider(generic.TorrentProvider): return results - def _get_title_and_url(self, item): - - title, url, tid, seeders, leechers = item - - if title: - title += u'' - title = re.sub(r'\s+', '.', title) - title = title.replace(u'\xa0', '') - - if url: - url = url.replace(u'\xa0', '') - url = str(url).replace('&', '&') - - return title, url - def findPropers(self, search_date=datetime.datetime.today()): - results = [] + return self._find_propers(search_date) - my_db = db.DBConnection() - sql_results = my_db.select( - 'SELECT s.show_name, e.showid, e.season, e.episode, e.status, e.airdate FROM tv_episodes AS e' + - ' INNER JOIN tv_shows AS s ON (e.showid = s.indexer_id)' + - ' WHERE e.airdate >= ' + str(search_date.toordinal()) + - ' AND (e.status IN (' + ','.join([str(x) for x in Quality.DOWNLOADED]) + ')' + - ' OR (e.status IN (' + ','.join([str(x) for x in Quality.SNATCHED]) + ')))' - ) + def _get_episode_search_strings(self, ep_obj, add_string='', **kwargs): - if not sql_results: - return [] - - for sqlshow in sql_results: - self.show = helpers.findCertainShow(sickbeard.showList, int(sqlshow['showid'])) - if self.show: - cur_ep = self.show.getEpisode(int(sqlshow['season']), int(sqlshow['episode'])) - - search_string = self._get_episode_search_strings(cur_ep, add_string='PROPER|REPACK') - - for item in self._doSearch(search_string[0]): - title, url = self._get_title_and_url(item) - results.append(classes.Proper(title, url, datetime.datetime.today(), self.show)) - - return results - - def seedRatio(self): - return self.ratio + return generic.TorrentProvider._get_episode_search_strings(self, ep_obj, add_string, use_or=False) class TorrentBytesCache(tvcache.TVCache): @@ -257,8 +139,7 @@ class TorrentBytesCache(tvcache.TVCache): def _getRSSData(self): - search_params = {'RSS': ['']} - return self.provider._doSearch(search_params) + return self.provider.get_cache_data() provider = TorrentBytesProvider()