Change refactor BTS to use torrent provider simplification and PEP8.

Change BTS login process to use General Config/Advanced/Proxy host setting.
This commit is contained in:
JackDandy 2015-06-22 01:02:07 +01:00
parent f9190ef51c
commit 0aadc7a73e
2 changed files with 74 additions and 190 deletions

View file

@ -22,11 +22,12 @@
* Change provider IPT login process to use General Config/Advanced/Proxy host setting * Change provider IPT login process to use General Config/Advanced/Proxy host setting
* Change provider TB PEP8 and code convention cleanup * Change provider TB PEP8 and code convention cleanup
* Change provider TB login process to use General Config/Advanced/Proxy host setting * Change provider TB login process to use General Config/Advanced/Proxy host setting
* Change provider TD login process to use General Config/Advanced/Proxy host setting
* Remove useless webproxies from provider TPB as they fail for one reason or another * 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 * Change provider TPB to use mediaExtensions from common instead of hard-coded private list
* Add new tld variants to provider TPB * Add new tld variants to provider TPB
* Add test for authenticity to provider TPB to notify of 3rd party block * Add test for authenticity to provider TPB to notify of 3rd party block
* Change provider TD login process to use General Config/Advanced/Proxy host setting
* Change provider BTS login process to use General Config/Advanced/Proxy host setting
* Change provider Womble's use SSL * Change provider Womble's use SSL
* Change provider KAT remove dead url * Change provider KAT remove dead url
* Change provider KAT to use mediaExtensions from common instead of private list * Change provider KAT to use mediaExtensions from common instead of private list
@ -38,6 +39,7 @@
* Change refactor TBP to use torrent provider simplification and PEP8 * Change refactor TBP to use torrent provider simplification and PEP8
* Change refactor TD to use torrent provider simplification and PEP8 * Change refactor TD to use torrent provider simplification and PEP8
* Change refactor TL to use torrent provider simplification and PEP8 * Change refactor TL to use torrent provider simplification and PEP8
* Change refactor BTS to use torrent provider simplification and PEP8
* Remove HDTorrents torrent provider * Remove HDTorrents torrent provider
* Remove NextGen torrent provider * Remove NextGen torrent provider
* Add Rarbg torrent provider * Add Rarbg torrent provider

View file

@ -1,5 +1,4 @@
# Author: Idan Gutman # coding=utf-8
# URL: http://code.google.com/p/sickbeard/
# #
# This file is part of SickGear. # This file is part of SickGear.
# #
@ -17,247 +16,130 @@
# along with SickGear. If not, see <http://www.gnu.org/licenses/>. # along with SickGear. If not, see <http://www.gnu.org/licenses/>.
import re import re
import traceback
import datetime import datetime
import traceback
import sickbeard from . import generic
import generic from sickbeard import logger, tvcache, helpers
import requests
import requests.exceptions
from sickbeard.common import Quality
from sickbeard import logger, tvcache, db, classes, helpers, show_name_helpers
from sickbeard.exceptions import ex, AuthException
from sickbeard.helpers import sanitizeSceneName
from sickbeard.bs4_parser import BS4Parser from sickbeard.bs4_parser import BS4Parser
from unidecode import unidecode from lib.unidecode import unidecode
class BitSoupProvider(generic.TorrentProvider): class BitSoupProvider(generic.TorrentProvider):
urls = {'base_url': 'https://www.bitsoup.me',
'login': 'https://www.bitsoup.me/takelogin.php',
'detail': 'https://www.bitsoup.me/details.php?id=%s',
'search': 'https://www.bitsoup.me/browse.php?search=%s%s',
'download': 'https://bitsoup.me/%s',
}
def __init__(self): def __init__(self):
generic.TorrentProvider.__init__(self, 'BitSoup', True, False) generic.TorrentProvider.__init__(self, 'BitSoup')
self.username = None
self.password = None self.url_base = 'https://www.bitsoup.me/'
self.ratio = None self.urls = {'config_provider_home_uri': self.url_base,
self.minseed = None 'login': self.url_base + 'takelogin.php',
self.minleech = None 'search': self.url_base + 'browse.php?search=%s%s',
'get': self.url_base + '%s'}
self.categories = '&c42=1&c45=1&c49=1&c7=1&incldead=0&blah=0'
self.url = self.urls['config_provider_home_uri']
self.username, self.password, self.minseed, self.minleech = 4 * [None]
self.cache = BitSoupCache(self) self.cache = BitSoupCache(self)
self.url = self.urls['base_url']
self.categories = '&c42=1&c45=1&c49=1&c7=1'
def getQuality(self, item, anime=False):
quality = Quality.sceneQuality(item[0], anime)
return quality
def _checkAuth(self):
if not self.username or not self.password:
raise AuthException("Your authentication credentials for " + self.name + " are missing, check your config.")
return True
def _doLogin(self): def _doLogin(self):
login_params = {'username': self.username, logged_in = lambda: 'uid' in self.session.cookies and 'pass' in self.session.cookies
'password': self.password, if logged_in():
'ssl': 'yes' return True
}
if not self.session: if self._checkAuth():
self.session = requests.session() login_params = {'username': self.username, 'password': self.password, 'ssl': 'yes'}
response = helpers.getURL(self.urls['login'], post_data=login_params, session=self.session)
if response and logged_in():
return True
try: msg = u'Failed to authenticate with %s, abort provider'
response = self.session.post(self.urls['login'], data=login_params, timeout=30, verify=False) if response and 'Username or password incorrect' in response:
except (requests.exceptions.ConnectionError, requests.exceptions.HTTPError) as e: msg = u'Invalid username or password for %s. Check settings'
logger.log(u'Unable to connect to ' + self.name + ' provider: ' + ex(e), logger.ERROR) logger.log(msg % self.name, logger.ERROR)
return False
if re.search('Username or password incorrect', response.text): return False
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]
def _doSearch(self, search_params, search_mode='eponly', epcount=0, age=0): def _doSearch(self, search_params, search_mode='eponly', epcount=0, age=0):
results = [] results = []
items = {'Season': [], 'Episode': [], 'RSS': []}
if not self._doLogin(): 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 mode in search_params.keys():
for search_string in search_params[mode]: for search_string in search_params[mode]:
if isinstance(search_string, unicode): if isinstance(search_string, unicode):
search_string = unidecode(search_string) search_string = unidecode(search_string)
searchURL = self.urls['search'] % (search_string, self.categories) search_url = self.urls['search'] % (search_string, self.categories)
html = self.getURL(search_url)
logger.log(u"Search string: " + searchURL, logger.DEBUG)
data = self.getURL(searchURL)
if not data:
continue
cnt = len(items[mode])
try: try:
with BS4Parser(data, "html.parser") as html: if not html or self._has_no_results(html):
torrent_table = html.find('table', attrs={'class': 'koptekst'}) raise generic.HaltParseException
torrent_rows = torrent_table.find_all('tr') if torrent_table else []
#Continue only if one Release is found with BS4Parser(html, 'html.parser') as soup:
if len(torrent_rows) < 2: torrent_table = soup.find('table', attrs={'class': 'koptekst'})
logger.log(u"The data returned from " + self.name + " does not contain any torrents", torrent_rows = [] if not torrent_table else torrent_table.find_all('tr')
logger.DEBUG)
continue
for result in torrent_rows[1:]: if 2 > len(torrent_rows):
cells = result.find_all('td') raise generic.HaltParseException
link = cells[1].find('a')
download_url = self.urls['download'] % cells[2].find('a')['href']
id = link['href']
id = id.replace('details.php?id=','')
id = id.replace('&hit=1', '')
for tr in torrent_rows[1:]:
try: try:
title = link.getText() seeders, leechers = [int(tr.find_all('td')[x].get_text().strip()) for x in (-3, -2)]
id = int(id) if 'Cache' != mode and (seeders < self.minseed or leechers < self.minleech):
seeders = int(cells[10].getText()) continue
leechers = int(cells[11].getText())
info = tr.find('a', href=rc['info'])
title = info.get_text().strip()
download_url = self.urls['get'] % str(tr.find('a', href=rc['get'])['href']).lstrip('/')
except (AttributeError, TypeError): except (AttributeError, TypeError):
continue continue
#Filter unseeded torrent if title and download_url:
if mode != 'RSS' and (seeders < self.minseed or leechers < self.minleech): items[mode].append((title, download_url, seeders))
continue
if not title or not download_url: except generic.HaltParseException:
continue pass
except Exception:
logger.log(u'Failed to parse. Traceback: %s' % traceback.format_exc(), logger.ERROR)
self._log_result(mode, len(items[mode]) - cnt, search_url)
item = title, download_url, id, seeders, leechers # for each search mode sort all the items by seeders
logger.log(u"Found result: " + title + "(" + searchURL + ")", logger.DEBUG) items[mode].sort(key=lambda tup: tup[2], reverse=True)
items[mode].append(item)
except Exception as e:
logger.log(u"Failed parsing " + self.name + " Traceback: " + traceback.format_exc(), logger.ERROR)
#For each search mode sort all the items by seeders
items[mode].sort(key=lambda tup: tup[3], reverse=True)
results += items[mode] results += items[mode]
return results return results
def _get_title_and_url(self, item):
title, url, id, seeders, leechers = item
if url:
url = str(url).replace('&amp;', '&')
return (title, url)
def findPropers(self, search_date=datetime.datetime.today()): def findPropers(self, search_date=datetime.datetime.today()):
results = [] return self._find_propers(search_date)
myDB = db.DBConnection() def _get_episode_search_strings(self, ep_obj, add_string='', **kwargs):
sqlResults = myDB.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]) + ')))'
)
if not sqlResults: return generic.TorrentProvider._get_episode_search_strings(self, ep_obj, add_string, sep_date='|', use_or=False)
return []
for sqlshow in sqlResults:
self.show = helpers.findCertainShow(sickbeard.showList, int(sqlshow["showid"]))
if self.show:
curEp = self.show.getEpisode(int(sqlshow["season"]), int(sqlshow["episode"]))
searchString = self._get_episode_search_strings(curEp, add_string='PROPER|REPACK')
for item in self._doSearch(searchString[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
class BitSoupCache(tvcache.TVCache): class BitSoupCache(tvcache.TVCache):
def __init__(self, provider):
tvcache.TVCache.__init__(self, provider) def __init__(self, this_provider):
tvcache.TVCache.__init__(self, this_provider)
# only poll TorrentBytes every 20 minutes max self.minTime = 20 # cache update frequency
self.minTime = 20
def _getRSSData(self): def _getRSSData(self):
search_params = {'RSS': ['']}
return self.provider._doSearch(search_params) return self.provider.get_cache_data()
provider = BitSoupProvider() provider = BitSoupProvider()