#end if
-
- #if $hasattr($curTorrentProvider, 'ratio'):
+ #if $hasattr($curTorrentProvider, '_seed_ratio') and 'blackhole' != $sickbeard.TORRENT_METHOD:
+ #set $torrent_method_text = {'blackhole': 'Black hole', 'utorrent': 'uTorrent', 'transmission': 'Transmission', 'deluge': 'Deluge', 'download_station': 'Synology DS', 'rtorrent': 'rTorrent'}
-
+
+
Proxy URL:
-
+
#for $i in $curTorrentProvider.proxy.urls.keys():
>$i
#end for
@@ -485,85 +467,71 @@
#end if
#end if
-
#if $hasattr($curTorrentProvider, 'confirmed'):
#end if
-
#if $hasattr($curTorrentProvider, 'freeleech'):
#end if
-
- #if $hasattr($curTorrentProvider, 'enable_recentsearch'):
+ #if $hasattr($curTorrentProvider, 'enable_recentsearch') and $curTorrentProvider.supportsBacklog:
#end if
-
- #if $hasattr($curTorrentProvider, 'enable_backlog'):
+ #if $hasattr($curTorrentProvider, 'enable_backlog') and $curTorrentProvider.supportsBacklog:
#end if
-
- #if $hasattr($curTorrentProvider, 'search_fallback'):
+ #if $hasattr($curTorrentProvider, 'search_mode') and $curTorrentProvider.supportsBacklog:
#end if
-
- #if $hasattr($curTorrentProvider, 'search_mode'):
+ #if $hasattr($curTorrentProvider, 'search_fallback') and $curTorrentProvider.supportsBacklog:
diff --git a/gui/slick/interfaces/default/history.tmpl b/gui/slick/interfaces/default/history.tmpl
index d83e2fcc..db0d835c 100644
--- a/gui/slick/interfaces/default/history.tmpl
+++ b/gui/slick/interfaces/default/history.tmpl
@@ -139,9 +139,9 @@
#else
#if 0 < $hItem['provider']
#if $curStatus in [SNATCHED, FAILED]
- #set $provider = $providers.getProviderClass($generic.GenericProvider.makeID($hItem['provider']))
+ #set $provider = $providers.getProviderClass($generic.GenericProvider.make_id($hItem['provider']))
#if None is not $provider
- $provider.name
+ $provider.name
#else
Missing Provider
#end if
@@ -186,10 +186,10 @@
#set $curStatus, $curQuality = $Quality.splitCompositeStatus(int($action['action']))
#set $basename = $os.path.basename($action['resource'])
#if $curStatus in [SNATCHED, FAILED]
- #set $provider = $providers.getProviderClass($generic.GenericProvider.makeID($action['provider']))
+ #set $provider = $providers.getProviderClass($generic.GenericProvider.make_id($action['provider']))
#if None is not $provider
#set $prov_list += ['
#echo re.sub('"', '', $hItem['release'])#
#echo ($hItem['size'], '?')[-1 == $hItem['size']]#
- #set $provider = $providers.getProviderClass($generic.GenericProvider.makeID($hItem['provider']))
+ #set $provider = $providers.getProviderClass($generic.GenericProvider.make_id($hItem['provider']))
#if None is not $provider:
- - tag of the RSS feed
-
- Returns: A tuple containing two strings representing title and URL respectively
- """
-
- title = item.title if item.title else None
- if title:
- title = u'' + title
- title = title.replace(' ', '.')
-
- url = item.link if item.link else None
- if url:
- url = url.replace('&', '&')
-
- return (title, url)
-
def _getRSSData(self):
- params = {'user': provider.username,
- 'api': provider.api_key,
- 'eng': 1,
- 'catid': '19,20'} # SD,HD
- rss_url = 'https://rss.omgwtfnzbs.org/rss-download.php?' + urllib.urlencode(params)
-
- logger.log(self.provider.name + u" cache update URL: " + rss_url, logger.DEBUG)
-
- data = self.getRSSFeed(rss_url)
-
- if data and 'entries' in data:
- return data.entries
- else:
- return []
+ return self.provider.get_cache_data()
provider = OmgwtfnzbsProvider()
diff --git a/sickbeard/providers/pisexy.py b/sickbeard/providers/pisexy.py
index 40d7cc4f..5f4ff62f 100644
--- a/sickbeard/providers/pisexy.py
+++ b/sickbeard/providers/pisexy.py
@@ -39,14 +39,14 @@ class PiSexyProvider(generic.TorrentProvider):
self.username, self.password, self.minseed, self.minleech = 4 * [None]
self.cache = PiSexyCache(self)
- def _doLogin(self):
+ def _do_login(self):
logged_in = lambda: 'uid' in self.session.cookies and 'pass' in self.session.cookies and\
'pcode' in self.session.cookies and 'pisexy' in self.session.cookies
if logged_in():
return True
- if self._checkAuth():
+ if self._check_auth():
login_params = {'username': self.username, 'password': self.password}
response = helpers.getURL(self.urls['login'], post_data=login_params, session=self.session)
if response and logged_in():
@@ -59,24 +59,24 @@ class PiSexyProvider(generic.TorrentProvider):
return False
- def _doSearch(self, search_params, search_mode='eponly', epcount=0, age=0):
+ def _do_search(self, search_params, search_mode='eponly', epcount=0, age=0):
results = []
- if not self._doLogin():
+ if not self._do_login():
return results
items = {'Season': [], 'Episode': [], 'Cache': []}
rc = dict((k, re.compile('(?i)' + v))
for (k, v) in {'info': 'download', 'get': 'download', 'valid_cat': 'cat=(?:0|50[12])',
- 'title': 'Download\s([^\s]+).*', 'seeders': '(^\d+)', 'leechers': '(\d+)$'}.items())
+ 'title': r'Download\s([^\s]+).*', 'seeders': r'(^\d+)', 'leechers': r'(\d+)$'}.items())
for mode in search_params.keys():
for search_string in search_params[mode]:
if isinstance(search_string, unicode):
search_string = unidecode(search_string)
search_url = self.urls['search'] % search_string
- html = self.getURL(search_url)
+ html = self.get_url(search_url)
cnt = len(items[mode])
try:
@@ -129,7 +129,7 @@ class PiSexyProvider(generic.TorrentProvider):
return results
- def findPropers(self, search_date=datetime.datetime.today()):
+ def find_propers(self, search_date=datetime.datetime.today()):
return self._find_propers(search_date)
diff --git a/sickbeard/providers/rarbg.py b/sickbeard/providers/rarbg.py
index ea10b6dd..eef91bef 100644
--- a/sickbeard/providers/rarbg.py
+++ b/sickbeard/providers/rarbg.py
@@ -55,7 +55,7 @@ class RarbgProvider(generic.TorrentProvider):
self.request_throttle = datetime.datetime.now()
self.cache = RarbgCache(self)
- def _doLogin(self, reset=False):
+ def _do_login(self, reset=False):
if not reset and self.token and self.token_expiry and datetime.datetime.now() < self.token_expiry:
return True
@@ -69,10 +69,10 @@ class RarbgProvider(generic.TorrentProvider):
logger.log(u'No usable API token returned from: %s' % self.urls['api_token'], logger.ERROR)
return False
- def _doSearch(self, search_params, search_mode='eponly', epcount=0, age=0):
+ def _do_search(self, search_params, search_mode='eponly', epcount=0, age=0):
results = []
- if not self._doLogin(reset=True):
+ if not self._do_login(reset=True):
return results
items = {'Season': [], 'Episode': [], 'Cache': []}
@@ -122,7 +122,7 @@ class RarbgProvider(generic.TorrentProvider):
time_out += 1
time.sleep(1)
- data = self.getURL(search_url % {'ranked': int(self.confirmed), 'token': self.token}, json=True)
+ data = self.get_url(search_url % {'ranked': int(self.confirmed), 'token': self.token}, json=True)
self.token_expiry = datetime.datetime.now() + datetime.timedelta(minutes=14)
self.request_throttle = datetime.datetime.now() + datetime.timedelta(seconds=3)
@@ -131,7 +131,7 @@ class RarbgProvider(generic.TorrentProvider):
continue
elif 2 == data['error_code']: # Invalid token set
- if self._doLogin(reset=True):
+ if self._do_login(reset=True):
continue
self._log_result(mode_base, len(items[mode_base]) - cnt, search_url)
return results
@@ -160,7 +160,7 @@ class RarbgProvider(generic.TorrentProvider):
return results
- def findPropers(self, search_date=datetime.datetime.today()):
+ def find_propers(self, search_date=datetime.datetime.today()):
return self._find_propers(search_date, '{{.proper.|.repack.}}')
diff --git a/sickbeard/providers/rsstorrent.py b/sickbeard/providers/rsstorrent.py
index 23752fc4..b0fde0c2 100644
--- a/sickbeard/providers/rsstorrent.py
+++ b/sickbeard/providers/rsstorrent.py
@@ -41,9 +41,9 @@ class TorrentRssProvider(generic.TorrentProvider):
self.feeder = RSSFeeds(self)
self.cache = TorrentRssCache(self)
- def imageName(self):
+ def image_name(self):
- return generic.GenericProvider.imageName(self, 'torrentrss')
+ return generic.GenericProvider.image_name(self, 'torrentrss')
def config_str(self):
return '%s|%s|%s|%d|%s|%d|%d|%d' % (self.name or '',
@@ -81,9 +81,9 @@ class TorrentRssProvider(generic.TorrentProvider):
def validate_feed(self):
- succ, err_msg = self.feeder.check_cookie()
- if not succ:
- return succ, err_msg
+ success, err_msg = self._check_cookie()
+ if not success:
+ return success, err_msg
try:
items = self.get_cache_data()
@@ -96,7 +96,7 @@ class TorrentRssProvider(generic.TorrentProvider):
if re.search('urn:btih:([0-9a-f]{32,40})', url):
break
else:
- torrent_file = self.getURL(url)
+ torrent_file = self.get_url(url)
try:
bdecode(torrent_file)
break
diff --git a/sickbeard/providers/scc.py b/sickbeard/providers/scc.py
index 7a5cc2ee..3bb3bf98 100644
--- a/sickbeard/providers/scc.py
+++ b/sickbeard/providers/scc.py
@@ -44,13 +44,13 @@ class SCCProvider(generic.TorrentProvider):
self.username, self.password, self.minseed, self.minleech = 4 * [None]
self.cache = SCCCache(self)
- def _doLogin(self):
+ def _do_login(self):
logged_in = lambda: 'uid' in self.session.cookies and 'pass' in self.session.cookies
if logged_in():
return True
- if self._checkAuth():
+ if self._check_auth():
login_params = {'username': self.username, 'password': self.password, 'submit': 'come on in'}
response = helpers.getURL(self.urls['login'], post_data=login_params, session=self.session)
@@ -61,12 +61,12 @@ class SCCProvider(generic.TorrentProvider):
return False
- def _doSearch(self, search_params, search_mode='eponly', epcount=0, age=0):
+ def _do_search(self, search_params, search_mode='eponly', epcount=0, age=0):
results = []
items = {'Season': [], 'Episode': [], 'Cache': []}
- if not self._doLogin():
+ if not self._do_login():
return results
rc = dict((k, re.compile('(?i)' + v)) for (k, v) in {'info': 'detail', 'get': 'download'}.items())
@@ -83,7 +83,7 @@ class SCCProvider(generic.TorrentProvider):
self.urls['nonscene'] % search_string]
for search_url in searches:
- html = self.getURL(search_url)
+ html = self.get_url(search_url)
cnt = len(items[mode])
try:
@@ -128,7 +128,7 @@ class SCCProvider(generic.TorrentProvider):
return results
- def findPropers(self, search_date=datetime.datetime.today()):
+ def find_propers(self, search_date=datetime.datetime.today()):
return self._find_propers(search_date)
diff --git a/sickbeard/providers/speedcd.py b/sickbeard/providers/speedcd.py
index a0f33c56..539fba48 100644
--- a/sickbeard/providers/speedcd.py
+++ b/sickbeard/providers/speedcd.py
@@ -44,13 +44,13 @@ class SpeedCDProvider(generic.TorrentProvider):
self.freeleech = False
self.cache = SpeedCDCache(self)
- def _doLogin(self):
+ def _do_login(self):
logged_in = lambda: 'inSpeed_speedian' in self.session.cookies
if logged_in():
return True
- if self._checkAuth():
+ if self._check_auth():
login_params = {'username': self.username, 'password': self.password}
response = helpers.getURL(self.urls['login'], post_data=login_params, session=self.session)
if response and logged_in():
@@ -63,10 +63,10 @@ class SpeedCDProvider(generic.TorrentProvider):
return False
- def _doSearch(self, search_params, search_mode='eponly', epcount=0, age=0):
+ def _do_search(self, search_params, search_mode='eponly', epcount=0, age=0):
results = []
- if not self._doLogin():
+ if not self._do_login():
return results
items = {'Season': [], 'Episode': [], 'Cache': []}
@@ -78,7 +78,7 @@ class SpeedCDProvider(generic.TorrentProvider):
post_data = dict({'/browse.php?': None, 'cata': 'yes', 'jxt': 4, 'jxw': 'b', 'search': search_string},
**self.categories[mode])
- data_json = self.getURL(self.urls['search'], post_data=post_data, json=True)
+ data_json = self.get_url(self.urls['search'], post_data=post_data, json=True)
cnt = len(items[mode])
try:
if not data_json:
@@ -111,7 +111,7 @@ class SpeedCDProvider(generic.TorrentProvider):
return results
- def findPropers(self, search_date=datetime.datetime.today()):
+ def find_propers(self, search_date=datetime.datetime.today()):
return self._find_propers(search_date)
diff --git a/sickbeard/providers/strike.py b/sickbeard/providers/strike.py
index 8b6dd6e9..e62129dd 100644
--- a/sickbeard/providers/strike.py
+++ b/sickbeard/providers/strike.py
@@ -15,6 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with SickGear. If not, see
The\sPirate\sBay', data[33:200:]):
has_signature = True
break
@@ -144,13 +144,13 @@ class ThePirateBayProvider(generic.TorrentProvider):
return [{'Episode': self._build_search_strings(ep_detail, append=(add_string, '')[self.show.anime])}]
- def _doSearch(self, search_params, search_mode='eponly', epcount=0, age=0):
+ def _do_search(self, search_params, search_mode='eponly', epcount=0, age=0):
results = []
items = {'Season': [], 'Episode': [], 'Cache': []}
rc = dict((k, re.compile('(?i)' + v))
- for (k, v) in {'info': 'detail', 'get': 'download[^"]+magnet', 'tid': '.*/(\d{5,}).*',
+ for (k, v) in {'info': 'detail', 'get': 'download[^"]+magnet', 'tid': r'.*/(\d{5,}).*',
'verify': '(?:helper|moderator|trusted|vip)'}.items())
has_signature = False
for mode in search_params.keys():
@@ -165,7 +165,7 @@ class ThePirateBayProvider(generic.TorrentProvider):
log_url = u'(%s/%s): %s' % (idx + 1, len(self.urls['config_provider_home_uri']), search_url)
- html = self.getURL(search_url)
+ html = self.get_url(search_url)
if html and re.search(r'Pirate\sBay', html[33:7632:]):
has_signature = True
break
@@ -227,7 +227,7 @@ class ThePirateBayProvider(generic.TorrentProvider):
return results
- def findPropers(self, search_date=datetime.datetime.today()):
+ def find_propers(self, search_date=datetime.datetime.today()):
return self._find_propers(search_date, '')
diff --git a/sickbeard/providers/tokyotoshokan.py b/sickbeard/providers/tokyotoshokan.py
index 9a061216..13c9881b 100644
--- a/sickbeard/providers/tokyotoshokan.py
+++ b/sickbeard/providers/tokyotoshokan.py
@@ -16,140 +16,86 @@
# You should have received a copy of the GNU General Public License
# along with SickGear. If not, see <http://www.gnu.org/licenses/>.
-import urllib
import traceback
+import urllib
-import generic
+from . import generic
from sickbeard import logger, tvcache, show_name_helpers
-from sickbeard.common import Quality
from sickbeard.bs4_parser import BS4Parser
class TokyoToshokanProvider(generic.TorrentProvider):
+
def __init__(self):
- generic.TorrentProvider.__init__(self, 'TokyoToshokan', True, True)
- self.ratio = None
- self.cache = TokyoToshokanCache(self)
+ generic.TorrentProvider.__init__(self, 'TokyoToshokan', anime_only=True)
+
self.url = 'http://tokyotosho.info/'
- def _get_title_and_url(self, item):
+ self.cache = TokyoToshokanCache(self)
- title, url = item
-
- if title:
- title = u'' + title
- title = title.replace(' ', '.')
-
- if url:
- url = url.replace('&', '&')
-
- return (title, url)
-
- def seedRatio(self):
- return self.ratio
-
- def getQuality(self, item, anime=False):
- quality = Quality.sceneQuality(item[0], anime)
- return quality
-
- def findSearchResults(self, show, episodes, search_mode, manualSearch=False):
- return generic.TorrentProvider.findSearchResults(self, show, episodes, search_mode, manualSearch)
-
- def _get_season_search_strings(self, ep_obj):
- return [x.replace('.', ' ') for x in show_name_helpers.makeSceneSeasonSearchString(self.show, ep_obj)]
-
- def _get_episode_search_strings(self, ep_obj, add_string=''):
- return [x.replace('.', ' ') for x in show_name_helpers.makeSceneSearchString(self.show, ep_obj)]
-
- def _doSearch(self, search_string, search_mode='eponly', epcount=0, age=0):
- if self.show and not self.show.is_anime:
- logger.log(u"" + str(self.show.name) + " is not an anime skipping " + str(self.name))
- return []
-
- params = {
- "terms": search_string.encode('utf-8'),
- "type": 1, # get anime types
- }
-
- searchURL = self.url + 'search.php?' + urllib.urlencode(params)
-
- data = self.getURL(searchURL)
-
- logger.log(u"Search string: " + searchURL, logger.DEBUG)
-
- if not data:
- return []
+ def _do_search(self, search_string, search_mode='eponly', epcount=0, age=0):
results = []
- try:
- with BS4Parser(data, features=["html5lib", "permissive"]) as soup:
- torrent_table = soup.find('table', attrs={'class': 'listing'})
- torrent_rows = torrent_table.find_all('tr') if torrent_table else []
- if torrent_rows:
- if torrent_rows[0].find('td', attrs={'class': 'centertext'}):
- a = 1
- else:
- a = 0
+ if self.show and not self.show.is_anime:
+ return results
- for top, bottom in zip(torrent_rows[a::2], torrent_rows[a::2]):
- title = top.find('td', attrs={'class': 'desc-top'}).text
- url = top.find('td', attrs={'class': 'desc-top'}).find('a')['href']
+ params = {'terms': search_string.encode('utf-8'),
+ 'type': 1} # get anime types
- if not title or not url:
- continue
+ search_url = self.url + 'search.php?' + urllib.urlencode(params)
+ logger.log(u'Search string: ' + search_url, logger.DEBUG)
- item = title.lstrip(), url
- results.append(item)
+ html = self.get_url(search_url)
+ if html:
+ try:
+ with BS4Parser(html, features=['html5lib', 'permissive']) as soup:
+ torrent_table = soup.find('table', attrs={'class': 'listing'})
+ torrent_rows = torrent_table.find_all('tr') if torrent_table else []
+ if torrent_rows:
+ a = (0, 1)[torrent_rows[0].find('td', attrs={'class': 'centertext'})]
- except Exception as e:
- logger.log(u"Failed to parsing " + self.name + " Traceback: " + traceback.format_exc(), logger.ERROR)
+ for top, bottom in zip(torrent_rows[a::2], torrent_rows[a::2]):
+ title = top.find('td', attrs={'class': 'desc-top'}).text
+ url = top.find('td', attrs={'class': 'desc-top'}).find('a')['href']
+ if title and url:
+ results.append((title.lstrip(), url))
+
+ except Exception:
+ logger.log(u'Failed to parsing ' + self.name + ' Traceback: ' + traceback.format_exc(), logger.ERROR)
return results
+ def find_search_results(self, show, episodes, search_mode, manual_search=False):
+
+ return generic.TorrentProvider.find_search_results(self, show, episodes, search_mode, manual_search)
+
+ def _get_season_search_strings(self, ep_obj, **kwargs):
+
+ return [x.replace('.', ' ') for x in show_name_helpers.makeSceneSeasonSearchString(self.show, ep_obj)]
+
+ def _get_episode_search_strings(self, ep_obj, **kwargs):
+
+ return [x.replace('.', ' ') for x in show_name_helpers.makeSceneSearchString(self.show, ep_obj)]
+
class TokyoToshokanCache(tvcache.TVCache):
- def __init__(self, provider):
- tvcache.TVCache.__init__(self, provider)
- # only poll NyaaTorrents every 15 minutes max
- self.minTime = 15
+ def __init__(self, this_provider):
+ tvcache.TVCache.__init__(self, this_provider)
- def _get_title_and_url(self, item):
- """
- Retrieves the title and URL data from the item XML node
-
- item: An elementtree.ElementTree element representing the <item> tag of the RSS feed
-
- Returns: A tuple containing two strings representing title and URL respectively
- """
-
- title = item.title if item.title else None
- if title:
- title = u'' + title
- title = title.replace(' ', '.')
-
- url = item.link if item.link else None
- if url:
- url = url.replace('&', '&')
-
- return (title, url)
+ self.minTime = 15 # cache update frequency
def _getRSSData(self):
- params = {
- "filter": '1',
- }
+ params = {'filter': '1'}
url = self.provider.url + 'rss.php?' + urllib.urlencode(params)
-
- logger.log(u"TokyoToshokan cache update URL: " + url, logger.DEBUG)
+ logger.log(u'TokyoToshokan cache update URL: ' + url, logger.DEBUG)
data = self.getRSSFeed(url)
-
if data and 'entries' in data:
return data.entries
- else:
- return []
+ return []
provider = TokyoToshokanProvider()
diff --git a/sickbeard/providers/torrentbytes.py b/sickbeard/providers/torrentbytes.py
index d61a41f5..c6985932 100644
--- a/sickbeard/providers/torrentbytes.py
+++ b/sickbeard/providers/torrentbytes.py
@@ -43,13 +43,13 @@ class TorrentBytesProvider(generic.TorrentProvider):
self.username, self.password, self.minseed, self.minleech = 4 * [None]
self.cache = TorrentBytesCache(self)
- def _doLogin(self):
+ def _do_login(self):
logged_in = lambda: 'uid' in self.session.cookies and 'pass' in self.session.cookies
if logged_in():
return True
- if self._checkAuth():
+ if self._check_auth():
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():
@@ -62,10 +62,10 @@ class TorrentBytesProvider(generic.TorrentProvider):
return False
- def _doSearch(self, search_params, search_mode='eponly', epcount=0, age=0):
+ def _do_search(self, search_params, search_mode='eponly', epcount=0, age=0):
results = []
- if not self._doLogin():
+ if not self._do_login():
return results
items = {'Season': [], 'Episode': [], 'Cache': []}
@@ -77,7 +77,7 @@ class TorrentBytesProvider(generic.TorrentProvider):
search_string = unidecode(search_string)
search_url = self.urls['search'] % (search_string, self.categories)
- html = self.getURL(search_url)
+ html = self.get_url(search_url)
cnt = len(items[mode])
try:
@@ -121,7 +121,7 @@ class TorrentBytesProvider(generic.TorrentProvider):
return results
- def findPropers(self, search_date=datetime.datetime.today()):
+ def find_propers(self, search_date=datetime.datetime.today()):
return self._find_propers(search_date)
diff --git a/sickbeard/providers/torrentday.py b/sickbeard/providers/torrentday.py
index 094015d9..9ee79bad 100644
--- a/sickbeard/providers/torrentday.py
+++ b/sickbeard/providers/torrentday.py
@@ -44,13 +44,13 @@ class TorrentDayProvider(generic.TorrentProvider):
self.freeleech = False
self.cache = TorrentDayCache(self)
- def _doLogin(self):
+ def _do_login(self):
logged_in = lambda: 'uid' in self.session.cookies and 'pass' in self.session.cookies
if logged_in():
return True
- if self._checkAuth():
+ if self._check_auth():
login_params = {'username': self.username, 'password': self.password, 'submit.x': 0, 'submit.y': 0}
response = helpers.getURL(self.urls['login'], post_data=login_params, session=self.session)
if response and logged_in():
@@ -63,10 +63,10 @@ class TorrentDayProvider(generic.TorrentProvider):
return False
- def _doSearch(self, search_params, search_mode='eponly', epcount=0, age=0):
+ def _do_search(self, search_params, search_mode='eponly', epcount=0, age=0):
results = []
- if not self._doLogin():
+ if not self._do_login():
return results
items = {'Season': [], 'Episode': [], 'Cache': []}
@@ -80,7 +80,7 @@ class TorrentDayProvider(generic.TorrentProvider):
if self.freeleech:
post_data.update({'free': 'on'})
- data_json = self.getURL(self.urls['search'], post_data=post_data, json=True)
+ data_json = self.get_url(self.urls['search'], post_data=post_data, json=True)
cnt = len(items[mode])
try:
if not data_json:
@@ -111,7 +111,7 @@ class TorrentDayProvider(generic.TorrentProvider):
return results
- def findPropers(self, search_date=datetime.datetime.today()):
+ def find_propers(self, search_date=datetime.datetime.today()):
return self._find_propers(search_date, '')
diff --git a/sickbeard/providers/torrentleech.py b/sickbeard/providers/torrentleech.py
index 7d9dd2db..f1291ae2 100644
--- a/sickbeard/providers/torrentleech.py
+++ b/sickbeard/providers/torrentleech.py
@@ -44,13 +44,13 @@ class TorrentLeechProvider(generic.TorrentProvider):
self.username, self.password, self.minseed, self.minleech = 4 * [None]
self.cache = TorrentLeechCache(self)
- def _doLogin(self):
+ def _do_login(self):
logged_in = lambda: 'tluid' in self.session.cookies and 'tlpass' in self.session.cookies
if logged_in():
return True
- if self._checkAuth():
+ if self._check_auth():
login_params = {'username': self.username, 'password': self.password, 'remember_me': 'on', 'login': 'submit'}
response = helpers.getURL(self.urls['login'], post_data=login_params, session=self.session)
if response and logged_in():
@@ -60,10 +60,10 @@ class TorrentLeechProvider(generic.TorrentProvider):
return False
- def _doSearch(self, search_params, search_mode='eponly', epcount=0, age=0):
+ def _do_search(self, search_params, search_mode='eponly', epcount=0, age=0):
results = []
- if not self._doLogin():
+ if not self._do_login():
return results
items = {'Season': [], 'Episode': [], 'Cache': []}
@@ -80,7 +80,7 @@ class TorrentLeechProvider(generic.TorrentProvider):
else:
search_url = self.urls['search'] % (search_string, self.categories)
- html = self.getURL(search_url)
+ html = self.get_url(search_url)
cnt = len(items[mode])
try:
@@ -123,7 +123,7 @@ class TorrentLeechProvider(generic.TorrentProvider):
return results
- def findPropers(self, search_date=datetime.datetime.today()):
+ def find_propers(self, search_date=datetime.datetime.today()):
return self._find_propers(search_date)
diff --git a/sickbeard/providers/torrentshack.py b/sickbeard/providers/torrentshack.py
index 6ba2bc59..61be8df6 100644
--- a/sickbeard/providers/torrentshack.py
+++ b/sickbeard/providers/torrentshack.py
@@ -46,13 +46,13 @@ class TorrentShackProvider(generic.TorrentProvider):
self.username, self.password, self.minseed, self.minleech = 4 * [None]
self.cache = TorrentShackCache(self)
- def _doLogin(self):
+ def _do_login(self):
logged_in = lambda: 'session' in self.session.cookies
if logged_in():
return True
- if self._checkAuth():
+ if self._check_auth():
login_params = {'username': self.username, 'password': self.password, 'keeplogged': '1', 'login': 'Login'}
response = helpers.getURL(self.urls['login'], post_data=login_params, session=self.session)
if response and logged_in():
@@ -65,10 +65,10 @@ class TorrentShackProvider(generic.TorrentProvider):
return False
- def _doSearch(self, search_params, search_mode='eponly', epcount=0, age=0):
+ def _do_search(self, search_params, search_mode='eponly', epcount=0, age=0):
results = []
- if not self._doLogin():
+ if not self._do_login():
return results
items = {'Season': [], 'Episode': [], 'Cache': []}
@@ -83,7 +83,7 @@ class TorrentShackProvider(generic.TorrentProvider):
# fetch 15 results by default, and up to 100 if allowed in user profile
search_url = self.urls['search'] % search_string
- html = self.getURL(search_url)
+ html = self.get_url(search_url)
cnt = len(items[mode])
try:
@@ -128,7 +128,7 @@ class TorrentShackProvider(generic.TorrentProvider):
return results
- def findPropers(self, search_date=datetime.datetime.today()):
+ def find_propers(self, search_date=datetime.datetime.today()):
return self._find_propers(search_date)
diff --git a/sickbeard/providers/totv.py b/sickbeard/providers/totv.py
index a270ebff..a96de4eb 100644
--- a/sickbeard/providers/totv.py
+++ b/sickbeard/providers/totv.py
@@ -48,9 +48,9 @@ class ToTVProvider(generic.TorrentProvider):
logger.DEBUG)
raise AuthException('Your authentication credentials for %s are incorrect, check your config.' % self.name)
- def _doSearch(self, search_params, mode='eponly', epcount=0, age=0):
+ def _do_search(self, search_params, mode='eponly', epcount=0, age=0):
- self._checkAuth()
+ self._check_auth()
self.headers.update({'X-Authorization': self.api_key})
results = []
params = {'limit': 100}
@@ -62,7 +62,7 @@ class ToTVProvider(generic.TorrentProvider):
search_url = self.urls['search'] % urllib.urlencode(params)
- data_json = self.getURL(search_url, json=True)
+ data_json = self.get_url(search_url, json=True)
cnt = len(results)
if data_json and 'results' in data_json and self._check_auth_from_data(data_json):
@@ -82,7 +82,7 @@ class ToTVProvider(generic.TorrentProvider):
self._log_result(mode, len(results) - cnt, search_url)
return results
- def findPropers(self, search_date=datetime.datetime.today()):
+ def find_propers(self, search_date=datetime.datetime.today()):
return self._find_propers(search_date)
@@ -113,7 +113,7 @@ class ToTVProvider(generic.TorrentProvider):
def get_cache_data(self, *args, **kwargs):
- return self._doSearch({})
+ return self._do_search({})
class ToTVCache(tvcache.TVCache):
diff --git a/sickbeard/providers/womble.py b/sickbeard/providers/womble.py
index cc4d34d4..b0b4f106 100644
--- a/sickbeard/providers/womble.py
+++ b/sickbeard/providers/womble.py
@@ -66,7 +66,7 @@ class WombleCache(tvcache.TVCache):
cl.append(ci)
if 0 < len(cl):
- my_db = self._getDB()
+ my_db = self.get_db()
my_db.mass_action(cl)
# set last updated
diff --git a/sickbeard/rssfeeds.py b/sickbeard/rssfeeds.py
index e99a03b7..ac0a5d35 100644
--- a/sickbeard/rssfeeds.py
+++ b/sickbeard/rssfeeds.py
@@ -3,9 +3,6 @@
# This file is part of SickGear.
#
-import re
-import requests
-import requests.cookies
from feedparser import feedparser
from sickbeard import helpers, logger
@@ -20,28 +17,10 @@ class RSSFeeds:
def _check_auth_cookie(self):
- if self.provider and hasattr(self.provider, 'cookies'):
- cookies = self.provider.cookies
-
- if not re.match('^(\w+=\w+[;\s]*)+$', cookies):
- return False
-
- cj = requests.utils.add_dict_to_cookiejar(self.provider.session.cookies,
- dict([x.strip().split('=') for x in cookies.split(';')
- if x != ''])),
- for item in cj:
- if not isinstance(item, requests.cookies.RequestsCookieJar):
- return False
-
+ if self.provider:
+ return self.provider.check_auth_cookie()
return True
- def check_cookie(self):
-
- if self._check_auth_cookie():
- return True, None
-
- return False, 'Cookies not correctly formatted key=value pairs e.g. uid=xx;pass=yy): ' + self.provider.cookies
-
def get_feed(self, url, request_headers=None):
if not self._check_auth_cookie():
diff --git a/sickbeard/sab.py b/sickbeard/sab.py
index 3ff5f0eb..30086904 100644
--- a/sickbeard/sab.py
+++ b/sickbeard/sab.py
@@ -59,17 +59,8 @@ def sendNZB(nzb):
# if it's a normal result we just pass SAB the URL
if nzb.resultType == "nzb":
- # for newzbin results send the ID to sab specifically
- if nzb.provider.getID() == 'newzbin':
- id = nzb.provider.getIDFromURL(nzb.url)
- if not id:
- logger.log("Unable to send NZB to SABnzbd, can't find ID in URL " + str(nzb.url), logger.ERROR)
- return False
- params['mode'] = 'addid'
- params['name'] = id
- else:
- params['mode'] = 'addurl'
- params['name'] = nzb.url
+ params['mode'] = 'addurl'
+ params['name'] = nzb.url
# if we get a raw data result we want to upload it to SAB
elif nzb.resultType == "nzbdata":
diff --git a/sickbeard/search.py b/sickbeard/search.py
index 2743b1bd..c52a2a68 100644
--- a/sickbeard/search.py
+++ b/sickbeard/search.py
@@ -60,7 +60,7 @@ def _downloadResult(result):
# nzbs with an URL can just be downloaded from the provider
if result.resultType == "nzb":
- newResult = resProvider.downloadResult(result)
+ newResult = resProvider.download_result(result)
# if it's an nzb data result
elif result.resultType == "nzbdata":
@@ -82,7 +82,7 @@ def _downloadResult(result):
logger.log(u"Error trying to save NZB to black hole: " + ex(e), logger.ERROR)
newResult = False
elif resProvider.providerType == "torrent":
- newResult = resProvider.downloadResult(result)
+ newResult = resProvider.download_result(result)
else:
logger.log(u"Invalid provider type - this is a coding error, report it please", logger.ERROR)
newResult = False
@@ -134,7 +134,7 @@ def snatchEpisode(result, endStatus=SNATCHED):
else:
# make sure we have the torrent file content
if not result.content and not result.url.startswith('magnet'):
- result.content = result.provider.getURL(result.url)
+ result.content = result.provider.get_url(result.url)
if not result.content:
logger.log(u'Torrent content failed to download from ' + result.url, logger.ERROR)
return False
@@ -401,12 +401,12 @@ def searchForNeededEpisodes(episodes):
origThreadName = threading.currentThread().name
- providers = [x for x in sickbeard.providers.sortedProviderList() if x.isActive() and x.enable_recentsearch]
+ providers = [x for x in sickbeard.providers.sortedProviderList() if x.is_active() and x.enable_recentsearch]
for curProvider in providers:
threading.currentThread().name = origThreadName + " :: [" + curProvider.name + "]"
- curFoundResults = curProvider.searchRSS(episodes)
+ curFoundResults = curProvider.search_rss(episodes)
didSearch = True
@@ -435,7 +435,7 @@ def searchForNeededEpisodes(episodes):
if bestResult.resultType == "torrent" and sickbeard.TORRENT_METHOD != "blackhole":
bestResult.content = None
if not bestResult.url.startswith('magnet'):
- bestResult.content = bestResult.provider.getURL(bestResult.url)
+ bestResult.content = bestResult.provider.get_url(bestResult.url)
if not bestResult.content:
continue
@@ -451,7 +451,7 @@ def searchForNeededEpisodes(episodes):
return foundResults.values()
-def searchProviders(show, episodes, manualSearch=False):
+def searchProviders(show, episodes, manual_search=False):
foundResults = {}
finalResults = []
@@ -459,7 +459,7 @@ def searchProviders(show, episodes, manualSearch=False):
origThreadName = threading.currentThread().name
- providers = [x for x in sickbeard.providers.sortedProviderList() if x.isActive() and x.enable_backlog]
+ providers = [x for x in sickbeard.providers.sortedProviderList() if x.is_active() and x.enable_backlog]
for providerNum, curProvider in enumerate(providers):
if curProvider.anime_only and not show.is_anime:
logger.log(u"" + str(show.name) + " is not an anime, skipping", logger.DEBUG)
@@ -482,7 +482,7 @@ def searchProviders(show, episodes, manualSearch=False):
try:
curProvider.cache._clearCache()
- searchResults = curProvider.findSearchResults(show, episodes, search_mode, manualSearch)
+ searchResults = curProvider.find_search_results(show, episodes, search_mode, manual_search)
except exceptions.AuthException as e:
logger.log(u"Authentication error: " + ex(e), logger.ERROR)
break
@@ -703,7 +703,7 @@ def searchProviders(show, episodes, manualSearch=False):
if bestResult.resultType == "torrent" and sickbeard.TORRENT_METHOD != "blackhole":
bestResult.content = None
if not bestResult.url.startswith('magnet'):
- bestResult.content = bestResult.provider.getURL(bestResult.url)
+ bestResult.content = bestResult.provider.get_url(bestResult.url)
if not bestResult.content:
continue
diff --git a/sickbeard/search_queue.py b/sickbeard/search_queue.py
index 53d719b2..1c461470 100644
--- a/sickbeard/search_queue.py
+++ b/sickbeard/search_queue.py
@@ -291,7 +291,7 @@ class RecentSearchQueueItem(generic_queue.QueueItem):
logger.log('Updating provider caches with recent upload data')
- providers = [x for x in sickbeard.providers.sortedProviderList() if x.isActive() and x.enable_recentsearch]
+ providers = [x for x in sickbeard.providers.sortedProviderList() if x.is_active() and x.enable_recentsearch]
for curProvider in providers:
# spawn separate threads for each provider so we don't need to wait for providers with slow network operation
threads.append(threading.Thread(target=curProvider.cache.updateCache, name=origThreadName +
diff --git a/sickbeard/tvcache.py b/sickbeard/tvcache.py
index 86c1e913..7c60daf6 100644
--- a/sickbeard/tvcache.py
+++ b/sickbeard/tvcache.py
@@ -48,16 +48,16 @@ class TVCache:
def __init__(self, provider):
self.provider = provider
- self.providerID = self.provider.getID()
+ self.providerID = self.provider.get_id()
self.providerDB = None
self.minTime = 10
- def _getDB(self):
+ def get_db(self):
return CacheDBConnection(self.providerID)
def _clearCache(self):
if self.shouldClearCache():
- myDB = self._getDB()
+ myDB = self.get_db()
myDB.action('DELETE FROM provider_cache WHERE provider = ?', [self.providerID])
def _get_title_and_url(self, item):
@@ -69,7 +69,7 @@ class TVCache:
return data
def _checkAuth(self):
- return self.provider._checkAuth()
+ return self.provider._check_auth()
def _checkItemAuth(self, title, url):
return True
@@ -102,7 +102,7 @@ class TVCache:
cl.append(ci)
if len(cl) > 0:
- myDB = self._getDB()
+ myDB = self.get_db()
myDB.mass_action(cl)
return []
@@ -125,7 +125,7 @@ class TVCache:
url = self._translateLinkURL(url)
logger.log(u'Attempting to add item to cache: ' + title, logger.DEBUG)
- return self._addCacheEntry(title, url)
+ return self.add_cache_entry(title, url)
else:
logger.log(
@@ -134,7 +134,7 @@ class TVCache:
return None
def _getLastUpdate(self):
- myDB = self._getDB()
+ myDB = self.get_db()
sqlResults = myDB.select('SELECT time FROM lastUpdate WHERE provider = ?', [self.providerID])
if sqlResults:
@@ -147,7 +147,7 @@ class TVCache:
return datetime.datetime.fromtimestamp(lastTime)
def _getLastSearch(self):
- myDB = self._getDB()
+ myDB = self.get_db()
sqlResults = myDB.select('SELECT time FROM lastSearch WHERE provider = ?', [self.providerID])
if sqlResults:
@@ -163,7 +163,7 @@ class TVCache:
if not toDate:
toDate = datetime.datetime.today()
- myDB = self._getDB()
+ myDB = self.get_db()
myDB.upsert('lastUpdate',
{'time': int(time.mktime(toDate.timetuple()))},
{'provider': self.providerID})
@@ -172,7 +172,7 @@ class TVCache:
if not toDate:
toDate = datetime.datetime.today()
- myDB = self._getDB()
+ myDB = self.get_db()
myDB.upsert('lastSearch',
{'time': int(time.mktime(toDate.timetuple()))},
{'provider': self.providerID})
@@ -196,7 +196,7 @@ class TVCache:
return True
- def _addCacheEntry(self, name, url, parse_result=None, indexer_id=0):
+ def add_cache_entry(self, name, url, parse_result=None, indexer_id=0):
# check if we passed in a parsed result or should we try and create one
if not parse_result:
@@ -256,7 +256,7 @@ class TVCache:
return []
def listPropers(self, date=None, delimiter='.'):
- myDB = self._getDB()
+ myDB = self.get_db()
sql = "SELECT * FROM provider_cache WHERE name LIKE '%.PROPER.%' OR name LIKE '%.REPACK.%' AND provider = ?"
if date != None:
@@ -268,7 +268,7 @@ class TVCache:
neededEps = {}
cl = []
- myDB = self._getDB()
+ myDB = self.get_db()
if type(episode) != list:
sqlResults = myDB.select(
'SELECT * FROM provider_cache WHERE provider = ? AND indexerid = ? AND season = ? AND episodes LIKE ?',
@@ -331,9 +331,10 @@ class TVCache:
logger.log(u'Found result ' + title + ' at ' + url)
- result = self.provider.getResult([epObj])
+ result = self.provider.get_result([epObj], url)
+ if None is result:
+ continue
result.show = showObj
- result.url = url
result.name = title
result.quality = curQuality
result.release_group = curReleaseGroup
diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index 81716633..b7d8c0ec 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -3914,14 +3914,14 @@ class ConfigProviders(Config):
if not name:
return json.dumps({'error': 'No Provider Name specified'})
- providerDict = dict(zip([x.getID() for x in sickbeard.newznabProviderList], sickbeard.newznabProviderList))
+ providerDict = dict(zip([x.get_id() for x in sickbeard.newznabProviderList], sickbeard.newznabProviderList))
tempProvider = newznab.NewznabProvider(name, '')
- if tempProvider.getID() in providerDict:
- return json.dumps({'error': 'Provider Name already exists as ' + providerDict[tempProvider.getID()].name})
+ if tempProvider.get_id() in providerDict:
+ return json.dumps({'error': 'Provider Name already exists as ' + providerDict[tempProvider.get_id()].name})
else:
- return json.dumps({'success': tempProvider.getID()})
+ return json.dumps({'success': tempProvider.get_id()})
def saveNewznabProvider(self, name, url, key=''):
@@ -3942,12 +3942,12 @@ class ConfigProviders(Config):
else:
providerDict[name].needs_auth = True
- return providerDict[name].getID() + '|' + providerDict[name].config_str()
+ return providerDict[name].get_id() + '|' + providerDict[name].config_str()
else:
newProvider = newznab.NewznabProvider(name, url, key=key)
sickbeard.newznabProviderList.append(newProvider)
- return newProvider.getID() + '|' + newProvider.config_str()
+ return newProvider.get_id() + '|' + newProvider.config_str()
def getNewznabCategories(self, name, url, key):
'''
@@ -3969,7 +3969,7 @@ class ConfigProviders(Config):
return json.dumps({'success' : False, 'error': error})
#Get list with Newznabproviders
- #providerDict = dict(zip([x.getID() for x in sickbeard.newznabProviderList], sickbeard.newznabProviderList))
+ #providerDict = dict(zip([x.get_id() for x in sickbeard.newznabProviderList], sickbeard.newznabProviderList))
#Get newznabprovider obj with provided name
tempProvider= newznab.NewznabProvider(name, url, key)
@@ -3980,7 +3980,7 @@ class ConfigProviders(Config):
def deleteNewznabProvider(self, nnid):
- providerDict = dict(zip([x.getID() for x in sickbeard.newznabProviderList], sickbeard.newznabProviderList))
+ providerDict = dict(zip([x.get_id() for x in sickbeard.newznabProviderList], sickbeard.newznabProviderList))
if nnid not in providerDict or providerDict[nnid].default:
return '0'
@@ -3999,16 +3999,16 @@ class ConfigProviders(Config):
return json.dumps({'error': 'Invalid name specified'})
providerDict = dict(
- zip([x.getID() for x in sickbeard.torrentRssProviderList], sickbeard.torrentRssProviderList))
+ zip([x.get_id() for x in sickbeard.torrentRssProviderList], sickbeard.torrentRssProviderList))
tempProvider = rsstorrent.TorrentRssProvider(name, url, cookies)
- if tempProvider.getID() in providerDict:
- return json.dumps({'error': 'Exists as ' + providerDict[tempProvider.getID()].name})
+ if tempProvider.get_id() in providerDict:
+ return json.dumps({'error': 'Exists as ' + providerDict[tempProvider.get_id()].name})
else:
(succ, errMsg) = tempProvider.validate_feed()
if succ:
- return json.dumps({'success': tempProvider.getID()})
+ return json.dumps({'success': tempProvider.get_id()})
else:
return json.dumps({'error': errMsg})
@@ -4024,17 +4024,17 @@ class ConfigProviders(Config):
providerDict[name].url = config.clean_url(url)
providerDict[name].cookies = cookies
- return providerDict[name].getID() + '|' + providerDict[name].config_str()
+ return providerDict[name].get_id() + '|' + providerDict[name].config_str()
else:
newProvider = rsstorrent.TorrentRssProvider(name, url, cookies)
sickbeard.torrentRssProviderList.append(newProvider)
- return newProvider.getID() + '|' + newProvider.config_str()
+ return newProvider.get_id() + '|' + newProvider.config_str()
def deleteTorrentRssProvider(self, id):
providerDict = dict(
- zip([x.getID() for x in sickbeard.torrentRssProviderList], sickbeard.torrentRssProviderList))
+ zip([x.get_id() for x in sickbeard.torrentRssProviderList], sickbeard.torrentRssProviderList))
if id not in providerDict:
return '0'
@@ -4055,7 +4055,7 @@ class ConfigProviders(Config):
provider_list = []
newznabProviderDict = dict(
- zip([x.getID() for x in sickbeard.newznabProviderList], sickbeard.newznabProviderList))
+ zip([x.get_id() for x in sickbeard.newznabProviderList], sickbeard.newznabProviderList))
finishedNames = []
@@ -4074,7 +4074,7 @@ class ConfigProviders(Config):
newProvider = newznab.NewznabProvider(cur_name, cur_url, key=cur_key)
- cur_id = newProvider.getID()
+ cur_id = newProvider.get_id()
# if it already exists then update it
if cur_id in newznabProviderDict:
@@ -4118,11 +4118,11 @@ class ConfigProviders(Config):
# delete anything that is missing
for curProvider in sickbeard.newznabProviderList:
- if curProvider.getID() not in finishedNames:
+ if curProvider.get_id() not in finishedNames:
sickbeard.newznabProviderList.remove(curProvider)
torrentRssProviderDict = dict(
- zip([x.getID() for x in sickbeard.torrentRssProviderList], sickbeard.torrentRssProviderList))
+ zip([x.get_id() for x in sickbeard.torrentRssProviderList], sickbeard.torrentRssProviderList))
finishedNames = []
if torrentrss_string:
@@ -4139,7 +4139,7 @@ class ConfigProviders(Config):
newProvider = rsstorrent.TorrentRssProvider(curName, curURL, curCookies)
- curID = newProvider.getID()
+ curID = newProvider.get_id()
# if it already exists then update it
if curID in torrentRssProviderDict:
@@ -4154,7 +4154,7 @@ class ConfigProviders(Config):
# delete anything that is missing
for curProvider in sickbeard.torrentRssProviderList:
- if curProvider.getID() not in finishedNames:
+ if curProvider.get_id() not in finishedNames:
sickbeard.torrentRssProviderList.remove(curProvider)
# do the enable/disable
@@ -4163,7 +4163,7 @@ class ConfigProviders(Config):
curEnabled = config.to_int(curEnabled)
curProvObj = [x for x in sickbeard.providers.sortedProviderList() if
- x.getID() == curProvider and hasattr(x, 'enabled')]
+ x.get_id() == curProvider and hasattr(x, 'enabled')]
if curProvObj:
curProvObj[0].enabled = bool(curEnabled)
@@ -4179,31 +4179,31 @@ class ConfigProviders(Config):
if hasattr(curTorrentProvider, 'minseed'):
try:
- curTorrentProvider.minseed = int(str(kwargs[curTorrentProvider.getID() + '_minseed']).strip())
+ curTorrentProvider.minseed = int(str(kwargs[curTorrentProvider.get_id() + '_minseed']).strip())
except:
curTorrentProvider.minseed = 0
if hasattr(curTorrentProvider, 'minleech'):
try:
- curTorrentProvider.minleech = int(str(kwargs[curTorrentProvider.getID() + '_minleech']).strip())
+ curTorrentProvider.minleech = int(str(kwargs[curTorrentProvider.get_id() + '_minleech']).strip())
except:
curTorrentProvider.minleech = 0
if hasattr(curTorrentProvider, 'ratio'):
try:
- curTorrentProvider.ratio = str(kwargs[curTorrentProvider.getID() + '_ratio']).strip()
+ curTorrentProvider.ratio = str(kwargs[curTorrentProvider.get_id() + '_ratio']).strip()
except:
curTorrentProvider.ratio = None
if hasattr(curTorrentProvider, 'digest'):
try:
- curTorrentProvider.digest = str(kwargs[curTorrentProvider.getID() + '_digest']).strip()
+ curTorrentProvider.digest = str(kwargs[curTorrentProvider.get_id() + '_digest']).strip()
except:
curTorrentProvider.digest = None
if hasattr(curTorrentProvider, 'hash'):
try:
- key = str(kwargs[curTorrentProvider.getID() + '_hash']).strip()
+ key = str(kwargs[curTorrentProvider.get_id() + '_hash']).strip()
if not starify(key, True):
curTorrentProvider.hash = key
except:
@@ -4211,7 +4211,7 @@ class ConfigProviders(Config):
if hasattr(curTorrentProvider, 'api_key'):
try:
- key = str(kwargs[curTorrentProvider.getID() + '_api_key']).strip()
+ key = str(kwargs[curTorrentProvider.get_id() + '_api_key']).strip()
if not starify(key, True):
curTorrentProvider.api_key = key
except:
@@ -4219,13 +4219,13 @@ class ConfigProviders(Config):
if hasattr(curTorrentProvider, 'username'):
try:
- curTorrentProvider.username = str(kwargs[curTorrentProvider.getID() + '_username']).strip()
+ curTorrentProvider.username = str(kwargs[curTorrentProvider.get_id() + '_username']).strip()
except:
curTorrentProvider.username = None
if hasattr(curTorrentProvider, 'password'):
try:
- key = str(kwargs[curTorrentProvider.getID() + '_password']).strip()
+ key = str(kwargs[curTorrentProvider.get_id() + '_password']).strip()
if set('*') != set(key):
curTorrentProvider.password = key
except:
@@ -4233,7 +4233,7 @@ class ConfigProviders(Config):
if hasattr(curTorrentProvider, 'passkey'):
try:
- key = str(kwargs[curTorrentProvider.getID() + '_passkey']).strip()
+ key = str(kwargs[curTorrentProvider.get_id() + '_passkey']).strip()
if not starify(key, True):
curTorrentProvider.passkey = key
except:
@@ -4242,54 +4242,54 @@ class ConfigProviders(Config):
if hasattr(curTorrentProvider, 'confirmed'):
try:
curTorrentProvider.confirmed = config.checkbox_to_value(
- kwargs[curTorrentProvider.getID() + '_confirmed'])
+ kwargs[curTorrentProvider.get_id() + '_confirmed'])
except:
curTorrentProvider.confirmed = 0
if hasattr(curTorrentProvider, 'proxy'):
try:
curTorrentProvider.proxy.enabled = config.checkbox_to_value(
- kwargs[curTorrentProvider.getID() + '_proxy'])
+ kwargs[curTorrentProvider.get_id() + '_proxy'])
except:
curTorrentProvider.proxy.enabled = 0
if hasattr(curTorrentProvider.proxy, 'url'):
try:
- curTorrentProvider.proxy.url = str(kwargs[curTorrentProvider.getID() + '_proxy_url']).strip()
+ curTorrentProvider.proxy.url = str(kwargs[curTorrentProvider.get_id() + '_proxy_url']).strip()
except:
curTorrentProvider.proxy.url = None
if hasattr(curTorrentProvider, 'freeleech'):
try:
curTorrentProvider.freeleech = config.checkbox_to_value(
- kwargs[curTorrentProvider.getID() + '_freeleech'])
+ kwargs[curTorrentProvider.get_id() + '_freeleech'])
except:
curTorrentProvider.freeleech = 0
if hasattr(curTorrentProvider, 'search_mode'):
try:
- curTorrentProvider.search_mode = str(kwargs[curTorrentProvider.getID() + '_search_mode']).strip()
+ curTorrentProvider.search_mode = str(kwargs[curTorrentProvider.get_id() + '_search_mode']).strip()
except:
curTorrentProvider.search_mode = 'eponly'
if hasattr(curTorrentProvider, 'search_fallback'):
try:
curTorrentProvider.search_fallback = config.checkbox_to_value(
- kwargs[curTorrentProvider.getID() + '_search_fallback'])
+ kwargs[curTorrentProvider.get_id() + '_search_fallback'])
except:
curTorrentProvider.search_fallback = 0 # these exceptions are catching unselected checkboxes
if hasattr(curTorrentProvider, 'enable_recentsearch'):
try:
curTorrentProvider.enable_recentsearch = config.checkbox_to_value(
- kwargs[curTorrentProvider.getID() + '_enable_recentsearch'])
+ kwargs[curTorrentProvider.get_id() + '_enable_recentsearch'])
except:
curTorrentProvider.enable_recentsearch = 0 # these exceptions are actually catching unselected checkboxes
if hasattr(curTorrentProvider, 'enable_backlog'):
try:
curTorrentProvider.enable_backlog = config.checkbox_to_value(
- kwargs[curTorrentProvider.getID() + '_enable_backlog'])
+ kwargs[curTorrentProvider.get_id() + '_enable_backlog'])
except:
curTorrentProvider.enable_backlog = 0 # these exceptions are actually catching unselected checkboxes
@@ -4298,7 +4298,7 @@ class ConfigProviders(Config):
if hasattr(curNzbProvider, 'api_key'):
try:
- key = str(kwargs[curNzbProvider.getID() + '_api_key']).strip()
+ key = str(kwargs[curNzbProvider.get_id() + '_api_key']).strip()
if not starify(key, True):
curNzbProvider.api_key = key
except:
@@ -4306,34 +4306,34 @@ class ConfigProviders(Config):
if hasattr(curNzbProvider, 'username'):
try:
- curNzbProvider.username = str(kwargs[curNzbProvider.getID() + '_username']).strip()
+ curNzbProvider.username = str(kwargs[curNzbProvider.get_id() + '_username']).strip()
except:
curNzbProvider.username = None
if hasattr(curNzbProvider, 'search_mode'):
try:
- curNzbProvider.search_mode = str(kwargs[curNzbProvider.getID() + '_search_mode']).strip()
+ curNzbProvider.search_mode = str(kwargs[curNzbProvider.get_id() + '_search_mode']).strip()
except:
curNzbProvider.search_mode = 'eponly'
if hasattr(curNzbProvider, 'search_fallback'):
try:
curNzbProvider.search_fallback = config.checkbox_to_value(
- kwargs[curNzbProvider.getID() + '_search_fallback'])
+ kwargs[curNzbProvider.get_id() + '_search_fallback'])
except:
curNzbProvider.search_fallback = 0 # these exceptions are actually catching unselected checkboxes
if hasattr(curNzbProvider, 'enable_recentsearch'):
try:
curNzbProvider.enable_recentsearch = config.checkbox_to_value(
- kwargs[curNzbProvider.getID() + '_enable_recentsearch'])
+ kwargs[curNzbProvider.get_id() + '_enable_recentsearch'])
except:
curNzbProvider.enable_recentsearch = 0 # these exceptions are actually catching unselected checkboxes
if hasattr(curNzbProvider, 'enable_backlog'):
try:
curNzbProvider.enable_backlog = config.checkbox_to_value(
- kwargs[curNzbProvider.getID() + '_enable_backlog'])
+ kwargs[curNzbProvider.get_id() + '_enable_backlog'])
except:
curNzbProvider.enable_backlog = 0 # these exceptions are actually catching unselected checkboxes
diff --git a/tests/snatch_tests.py b/tests/snatch_tests.py
index aa8446b6..3fecfe00 100644
--- a/tests/snatch_tests.py
+++ b/tests/snatch_tests.py
@@ -59,7 +59,7 @@ class SearchTest(test.SickbeardTestDBCase):
def __init__(self, something):
for provider in sickbeard.providers.sortedProviderList():
- provider.getURL = self._fake_getURL
+ provider.get_url = self._fake_getURL
#provider.isActive = self._fake_isActive
super(SearchTest, self).__init__(something)
 "$curProvider.name"){kind=small}
- $curProvider.name
+ />
+  "$curProvider.name"){kind=small}
+ $curProvider.name
<%= '*' if not curProvider.supportsBacklog else '' %>