diff --git a/CHANGES.md b/CHANGES.md
index 97cf26c5..3526bc27 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -51,6 +51,7 @@
* Add option to limit WebDL propers to original release group under Config/Search/Media Search
* Change add IPv4 config option when enabling IPv6.
* Add autoProcessTV/onTxComplete.bat to improve Windows clients Deluge, qBittorrent, Tranmission, and uTorrent
+* Add Blutopia torrent provider
* Add MagnetDL torrent provider
* Add SceneHD torrent provider
* Add Skytorrents torrent provider
diff --git a/gui/slick/images/providers/blutopia.png b/gui/slick/images/providers/blutopia.png
new file mode 100644
index 00000000..3abc97aa
Binary files /dev/null and b/gui/slick/images/providers/blutopia.png differ
diff --git a/sickbeard/providers/__init__.py b/sickbeard/providers/__init__.py
index 090bcafc..979ed703 100755
--- a/sickbeard/providers/__init__.py
+++ b/sickbeard/providers/__init__.py
@@ -26,7 +26,7 @@ from sickbeard import logger, encodingKludge as ek
# usenet
from . import newznab, omgwtfnzbs
# torrent
-from . import alpharatio, beyondhd, bithdtv, bitmetv, btn, btscene, dh, \
+from . import alpharatio, beyondhd, bithdtv, bitmetv, blutopia, btn, btscene, dh, \
fano, filelist, funfile, gftracker, grabtheinfo, hd4free, hdbits, hdspace, hdtorrents, \
iptorrents, limetorrents, magnetdl, morethan, nebulance, ncore, nyaa, pisexy, pretome, privatehd, ptf, \
rarbg, revtt, scenehd, scenetime, shazbat, skytorrents, speedcd, \
@@ -46,6 +46,7 @@ __all__ = ['omgwtfnzbs',
'beyondhd',
'bithdtv',
'bitmetv',
+ 'blutopia',
'btn',
'btscene',
'custom01',
diff --git a/sickbeard/providers/beyondhd.py b/sickbeard/providers/beyondhd.py
index f4c42f31..c06d555e 100644
--- a/sickbeard/providers/beyondhd.py
+++ b/sickbeard/providers/beyondhd.py
@@ -39,7 +39,7 @@ class BeyondHDProvider(generic.TorrentProvider):
self.url = self.urls['config_provider_home_uri']
- self.passkey, self.minseed, self.minleech = 3 * [None]
+ self.passkey, self.scene, self.minseed, self.minleech = 4 * [None]
def _check_auth_from_data(self, data_json):
@@ -92,9 +92,5 @@ class BeyondHDProvider(generic.TorrentProvider):
return results
- def _episode_strings(self, ep_obj, **kwargs):
-
- return generic.TorrentProvider._episode_strings(self, ep_obj, scene=False, **kwargs)
-
provider = BeyondHDProvider()
diff --git a/sickbeard/providers/blutopia.py b/sickbeard/providers/blutopia.py
new file mode 100644
index 00000000..bd60c9dc
--- /dev/null
+++ b/sickbeard/providers/blutopia.py
@@ -0,0 +1,169 @@
+# coding=utf-8
+#
+# This file is part of SickGear.
+#
+# SickGear is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# SickGear is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with SickGear. If not, see .
+
+try:
+ from collections import OrderedDict
+except ImportError:
+ from requests.compat import OrderedDict
+import re
+import traceback
+
+from . import generic
+from sickbeard import logger
+from sickbeard.bs4_parser import BS4Parser
+from sickbeard.helpers import tryInt
+from lib.unidecode import unidecode
+
+
+class BlutopiaProvider(generic.TorrentProvider):
+
+ def __init__(self):
+ generic.TorrentProvider.__init__(self, 'Blutopia')
+
+ self.url_base = 'https://blutopia.xyz/'
+ self.urls = {'config_provider_home_uri': self.url_base,
+ 'login': self.url_base + 'torrents',
+ 'search': self.url_base + 'filter?%s' % '&'.join(
+ ['_token=%s', 'search=%s', 'categories[]=%s', 'freeleech=%s', 'doubleupload=%s', 'featured=%s',
+ 'username=', 'imdb=', 'tvdb=', 'tmdb=', 'sorting=created_at', 'qty=50', 'direction=desc'])}
+
+ self.categories = {'Season': [2], 'Episode': [2], 'Cache': [2]}
+
+ self.url = self.urls['config_provider_home_uri']
+
+ self.filter = []
+ self.may_filter = OrderedDict([
+ ('f0', ('not marked', False)), ('free', ('free', True)),
+ ('double', ('2x up', True)), ('feat', ('featured', True))])
+ self.digest, self.token, self.resp, self.scene, self.minseed, self.minleech = 6 * [None]
+
+ def logged_in(self, resp):
+ try:
+ self.token = re.findall('csrf\s*=\s*"([^"]+)', resp)[0]
+ self.resp = re.findall('(?sim)()', resp)[0]
+ except (IndexError, TypeError):
+ return False
+ return self.has_all_cookies('XSRF-TOKEN')
+
+ def _authorised(self, **kwargs):
+
+ return super(BlutopiaProvider, self)._authorised(
+ logged_in=lambda y=None: self.logged_in(y))
+
+ def _search_provider(self, search_params, **kwargs):
+
+ results = []
+ if not self._authorised():
+ return results
+
+ items = {'Cache': [], 'Season': [], 'Episode': [], 'Propers': []}
+
+ rc = dict((k, re.compile('(?i)' + v))
+ for (k, v) in {'info': 'torrents', 'get': '(.*?download)_check(.*)'}.items())
+ log = ''
+ if self.filter:
+ non_marked = 'f0' in self.filter
+ # if search_any, use unselected to exclude, else use selected to keep
+ filters = ([f for f in self.may_filter if f in self.filter],
+ [f for f in self.may_filter if f not in self.filter])[non_marked]
+ filters += (((all([x in filters for x in 'free', 'double', 'feat']) and ['freedoublefeat'] or [])
+ + (all([x in filters for x in 'free', 'double']) and ['freedouble'] or [])
+ + (all([x in filters for x in 'feat', 'double']) and ['featdouble'] or [])),
+ ((not all([x not in filters for x in 'free', 'double', 'feat']) and ['freedoublefeat'] or [])
+ + (not all([x not in filters for x in 'free', 'double']) and ['freedouble'] or [])
+ + (not all([x not in filters for x in 'feat', 'double']) and ['featdouble'] or []))
+ )[non_marked]
+ rc['filter'] = re.compile('(?i)^(%s)$' % '|'.join(
+ ['%s' % f for f in filters if (f in self.may_filter and self.may_filter[f][1]) or f]))
+ log = '%sing (%s) ' % (('keep', 'skipp')[non_marked], ', '.join(
+ [f in self.may_filter and self.may_filter[f][0] or f for f in filters]))
+ for mode in search_params.keys():
+ if mode in ['Season', 'Episode']:
+ show_type = self.show.air_by_date and 'Air By Date' \
+ or self.show.is_sports and 'Sports' or None
+ if show_type:
+ logger.log(u'Provider does not carry shows of type: [%s], skipping' % show_type, logger.DEBUG)
+ return results
+
+ for search_string in search_params[mode]:
+ search_string = isinstance(search_string, unicode) and unidecode(search_string) or search_string
+ search_url = self.urls['search'] % (
+ self.token, '+'.join(search_string.split()), self._categories_string(mode, ''), '', '', '')
+
+ resp = self.get_url(search_url, json=True)
+
+ cnt = len(items[mode])
+ try:
+ if not resp or not resp.get('rows'):
+ raise generic.HaltParseException
+
+ html = '%s' % \
+ self.resp.replace('', '%s' % ''.join(resp.get('result', [])))
+ with BS4Parser(html, features=['html5lib', 'permissive']) as soup:
+ torrent_table = soup.find('table', class_='table')
+ torrent_rows = [] if not torrent_table else torrent_table.find_all('tr')
+
+ if 2 > len(torrent_rows):
+ raise generic.HaltParseException
+
+ head = None
+ for tr in torrent_rows[1:]:
+ cells = tr.find_all('td')
+ if 5 > len(cells):
+ continue
+ if any(self.filter):
+ marked = ','.join([x.attrs.get('data-original-title', '').lower() for x in tr.find_all(
+ 'i', attrs={'class': ['text-gold', 'fa-diamond', 'fa-certificate']})])
+ # noinspection PyTypeChecker
+ munged = ''.join(filter(marked.__contains__, ['free', 'double', 'feat']))
+ if ((non_marked and rc['filter'].search(munged)) or
+ (not non_marked and not rc['filter'].search(munged))):
+ continue
+ try:
+ head = head if None is not head else self._header_row(
+ tr, {'seed': r'circle-up', 'leech': r'circle-down', 'size': r'fa-file'})
+ seeders, leechers, size = [tryInt(n, n) for n in [
+ cells[head[x]].get_text().strip() for x in 'seed', 'leech', 'size']]
+ if self._peers_fail(mode, seeders, leechers):
+ continue
+
+ title = tr.find('a', href=rc['info'])['data-original-title']
+ download_url = self._link(rc['get'].sub(r'\1\2', tr.find('a', href=rc['get'])['href']))
+ except (AttributeError, TypeError, ValueError, IndexError):
+ continue
+
+ if title and download_url:
+ items[mode].append((title, download_url, seeders, self._bytesizer(size)))
+
+ except generic.HaltParseException:
+ pass
+ except (StandardError, Exception):
+ logger.log(u'Failed to parse. Traceback: %s' % traceback.format_exc(), logger.ERROR)
+
+ self._log_search(mode, len(items[mode]) - cnt, log + search_url)
+
+ results = self._sort_seeding(mode, results + items[mode])
+
+ return results
+
+ @staticmethod
+ def ui_string(key):
+
+ return 'blutopia_digest' == key and 'use... \'remember_web_xx=yy\'' or ''
+
+
+provider = BlutopiaProvider()
diff --git a/sickbeard/providers/btscene.py b/sickbeard/providers/btscene.py
index 0b5b0709..405af906 100644
--- a/sickbeard/providers/btscene.py
+++ b/sickbeard/providers/btscene.py
@@ -126,7 +126,7 @@ class BTSceneProvider(generic.TorrentProvider):
return results
def _episode_strings(self, ep_obj, **kwargs):
- return generic.TorrentProvider._episode_strings(self, ep_obj, sep_date='.', **kwargs)
+ return super(BTSceneProvider, self)._episode_strings(ep_obj, sep_date='.', **kwargs)
provider = BTSceneProvider()
diff --git a/sickbeard/providers/generic.py b/sickbeard/providers/generic.py
index a6dd5ec8..7339109a 100644
--- a/sickbeard/providers/generic.py
+++ b/sickbeard/providers/generic.py
@@ -953,7 +953,7 @@ class TorrentProvider(object, GenericProvider):
search_params = []
crop = re.compile(r'([.\s])(?:\1)+')
for name in set(allPossibleShowNames(self.show)):
- if process_name:
+ if process_name and getattr(self, 'scene', True):
name = helpers.sanitizeSceneName(name)
for detail in ep_detail:
search_params += [crop.sub(r'\1', '%s %s%s' % (name, x, detail)) for x in prefix]
diff --git a/sickbeard/providers/gftracker.py b/sickbeard/providers/gftracker.py
index a1adb1ad..88f44284 100644
--- a/sickbeard/providers/gftracker.py
+++ b/sickbeard/providers/gftracker.py
@@ -42,7 +42,7 @@ class GFTrackerProvider(generic.TorrentProvider):
self.url = self.urls['config_provider_home_uri']
- self.username, self.password, self.minseed, self.minleech = 4 * [None]
+ self.username, self.password, self.scene, self.minseed, self.minleech = 5 * [None]
def _authorised(self, **kwargs):
@@ -113,13 +113,5 @@ class GFTrackerProvider(generic.TorrentProvider):
return results
- def _season_strings(self, ep_obj, **kwargs):
-
- return generic.TorrentProvider._season_strings(self, ep_obj, scene=False)
-
- def _episode_strings(self, ep_obj, **kwargs):
-
- return generic.TorrentProvider._episode_strings(self, ep_obj, scene=False, **kwargs)
-
provider = GFTrackerProvider()
diff --git a/sickbeard/providers/grabtheinfo.py b/sickbeard/providers/grabtheinfo.py
index 2b76063d..f838dd6b 100644
--- a/sickbeard/providers/grabtheinfo.py
+++ b/sickbeard/providers/grabtheinfo.py
@@ -123,7 +123,7 @@ class GrabTheInfoProvider(generic.TorrentProvider):
def _episode_strings(self, ep_obj, **kwargs):
- return generic.TorrentProvider._episode_strings(self, ep_obj, sep_date='|', **kwargs)
+ return super(GrabTheInfoProvider, self)._episode_strings(ep_obj, sep_date='|', **kwargs)
provider = GrabTheInfoProvider()
diff --git a/sickbeard/providers/hdspace.py b/sickbeard/providers/hdspace.py
index c08c521b..12e76099 100644
--- a/sickbeard/providers/hdspace.py
+++ b/sickbeard/providers/hdspace.py
@@ -48,7 +48,7 @@ class HDSpaceProvider(generic.TorrentProvider):
self.filter = []
self.may_filter = OrderedDict([
('f0', ('not marked', False, '')), ('f25', ('FL', True, 'gold|sf')), ('f50', ('F/L', True, 'silver|sf'))])
- self.username, self.password, self.minseed, self.minleech = 4 * [None]
+ self.username, self.password, self.scene, self.minseed, self.minleech = 5 * [None]
def _authorised(self, **kwargs):
@@ -135,13 +135,5 @@ class HDSpaceProvider(generic.TorrentProvider):
return results
- def _season_strings(self, ep_obj, **kwargs):
-
- return generic.TorrentProvider._season_strings(self, ep_obj, scene=False)
-
- def _episode_strings(self, ep_obj, **kwargs):
-
- return generic.TorrentProvider._episode_strings(self, ep_obj, scene=False, **kwargs)
-
provider = HDSpaceProvider()
diff --git a/sickbeard/providers/hdtorrents.py b/sickbeard/providers/hdtorrents.py
index 7446ea90..f079e7d8 100644
--- a/sickbeard/providers/hdtorrents.py
+++ b/sickbeard/providers/hdtorrents.py
@@ -47,7 +47,7 @@ class HDTorrentsProvider(generic.TorrentProvider):
self.filter = []
self.may_filter = OrderedDict(
[('f0', ('not marked', False)), ('f25', ('-25%', True)), ('f50', ('-50%', True)), ('f75', ('-75%', True))])
- self.username, self.password, self.minseed, self.minleech = 4 * [None]
+ self.username, self.password, self.scene, self.minseed, self.minleech = 5 * [None]
def _authorised(self, **kwargs):
@@ -138,11 +138,5 @@ class HDTorrentsProvider(generic.TorrentProvider):
return results
- def _season_strings(self, ep_obj, **kwargs):
- return generic.TorrentProvider._season_strings(self, ep_obj, scene=False, **kwargs)
-
- def _episode_strings(self, ep_obj, **kwargs):
- return generic.TorrentProvider._episode_strings(self, ep_obj, scene=False, sep_date=' ', **kwargs)
-
provider = HDTorrentsProvider()
diff --git a/sickbeard/providers/nebulance.py b/sickbeard/providers/nebulance.py
index 5273d147..b6abcd87 100644
--- a/sickbeard/providers/nebulance.py
+++ b/sickbeard/providers/nebulance.py
@@ -42,7 +42,7 @@ class NebulanceProvider(generic.TorrentProvider):
self.user_authkey, self.user_passkey = 2 * [None]
self.chk_td = True
- self.username, self.password, self.freeleech, self.minseed, self.minleech = 5 * [None]
+ self.username, self.password, self.freeleech, self.scene, self.minseed, self.minleech = 6 * [None]
def _authorised(self, **kwargs):
@@ -157,13 +157,5 @@ class NebulanceProvider(generic.TorrentProvider):
title += + any(tags[4]) and ('.%s' % tags[4][0]) or ''
return title
- def _season_strings(self, ep_obj, **kwargs):
-
- return generic.TorrentProvider._season_strings(self, ep_obj, scene=False)
-
- def _episode_strings(self, ep_obj, **kwargs):
-
- return generic.TorrentProvider._episode_strings(self, ep_obj, scene=False, **kwargs)
-
provider = NebulanceProvider()
diff --git a/sickbeard/providers/rarbg.py b/sickbeard/providers/rarbg.py
index 61421b96..c3d98a47 100644
--- a/sickbeard/providers/rarbg.py
+++ b/sickbeard/providers/rarbg.py
@@ -168,7 +168,7 @@ class RarbgProvider(generic.TorrentProvider):
def _episode_strings(self, ep_obj, **kwargs):
- search_params = generic.TorrentProvider._episode_strings(self, ep_obj, detail_only=True, date_or=True, **kwargs)
+ search_params = super(RarbgProvider, self)._episode_strings(ep_obj, detail_only=True, date_or=True, **kwargs)
if self.show.air_by_date and self.show.is_sports:
for x, types in enumerate(search_params):
for y, ep_type in enumerate(types):
diff --git a/sickbeard/providers/shazbat.py b/sickbeard/providers/shazbat.py
index 9b1f4d51..e235b330 100644
--- a/sickbeard/providers/shazbat.py
+++ b/sickbeard/providers/shazbat.py
@@ -44,7 +44,7 @@ class ShazbatProvider(generic.TorrentProvider):
self.url = self.urls['config_provider_home_uri']
- self.username, self.password, self.minseed, self.minleech = 4 * [None]
+ self.username, self.password, self.scene, self.minseed, self.minleech = 5 * [None]
def _authorised(self, **kwargs):
@@ -137,11 +137,11 @@ class ShazbatProvider(generic.TorrentProvider):
def _season_strings(self, ep_obj, **kwargs):
- return generic.TorrentProvider._season_strings(self, ep_obj, detail_only=True, scene=False)
+ return super(ShazbatProvider, self)._season_strings(ep_obj, detail_only=True)
def _episode_strings(self, ep_obj, **kwargs):
- return generic.TorrentProvider._episode_strings(self, ep_obj, detail_only=True, scene=False, **kwargs)
+ return super(ShazbatProvider, self)._episode_strings(ep_obj, detail_only=True, **kwargs)
provider = ShazbatProvider()
diff --git a/sickbeard/providers/speedcd.py b/sickbeard/providers/speedcd.py
index 3eb696c6..c6f4d501 100644
--- a/sickbeard/providers/speedcd.py
+++ b/sickbeard/providers/speedcd.py
@@ -116,7 +116,7 @@ class SpeedCDProvider(generic.TorrentProvider):
def _episode_strings(self, ep_obj, **kwargs):
- return generic.TorrentProvider._episode_strings(self, ep_obj, scene=False, sep_date='.', **kwargs)
+ return super(SpeedCDProvider, self)._episode_strings(ep_obj, scene=False, sep_date='.', **kwargs)
@staticmethod
def ui_string(key):
diff --git a/sickbeard/providers/thepiratebay.py b/sickbeard/providers/thepiratebay.py
index f38ae0e5..db861e91 100644
--- a/sickbeard/providers/thepiratebay.py
+++ b/sickbeard/providers/thepiratebay.py
@@ -169,10 +169,10 @@ class ThePirateBayProvider(generic.TorrentProvider):
def _episode_strings(self, ep_obj, **kwargs):
- return generic.TorrentProvider._episode_strings(self, ep_obj, date_or=True,
- ep_detail=lambda x: '%s|%s' % (config.naming_ep_type[2] % x,
- config.naming_ep_type[0] % x),
- ep_detail_anime=lambda x: '%02i' % x, **kwargs)
+ return super(ThePirateBayProvider, self)._episode_strings(
+ ep_obj, date_or=True,
+ ep_detail=lambda x: '%s|%s' % (config.naming_ep_type[2] % x, config.naming_ep_type[0] % x),
+ ep_detail_anime=lambda x: '%02i' % x, **kwargs)
def _search_provider(self, search_params, search_mode='eponly', epcount=0, **kwargs):
diff --git a/sickbeard/providers/torrentday.py b/sickbeard/providers/torrentday.py
index 7c7c8e4a..7cda7d27 100644
--- a/sickbeard/providers/torrentday.py
+++ b/sickbeard/providers/torrentday.py
@@ -133,7 +133,7 @@ class TorrentDayProvider(generic.TorrentProvider):
def _episode_strings(self, ep_obj, **kwargs):
- return generic.TorrentProvider._episode_strings(self, ep_obj, sep_date='.', date_or=True, **kwargs)
+ return super(TorrentDayProvider, self)._episode_strings(ep_obj, sep_date='.', date_or=True, **kwargs)
def ui_string(self, key):
if 'torrentday_digest' == key and self._valid_home():
diff --git a/sickbeard/providers/torrentleech.py b/sickbeard/providers/torrentleech.py
index f5f9b043..fb4a31ba 100644
--- a/sickbeard/providers/torrentleech.py
+++ b/sickbeard/providers/torrentleech.py
@@ -109,7 +109,7 @@ class TorrentLeechProvider(generic.TorrentProvider):
def _episode_strings(self, ep_obj, **kwargs):
- return generic.TorrentProvider._episode_strings(self, ep_obj, sep_date='|', **kwargs)
+ return super(TorrentLeechProvider, self)._episode_strings(ep_obj, sep_date='|', **kwargs)
provider = TorrentLeechProvider()
diff --git a/sickbeard/providers/torrentvault.py b/sickbeard/providers/torrentvault.py
index ed8e24df..8f396266 100644
--- a/sickbeard/providers/torrentvault.py
+++ b/sickbeard/providers/torrentvault.py
@@ -116,7 +116,7 @@ class TorrentVaultProvider(generic.TorrentProvider):
def _episode_strings(self, ep_obj, **kwargs):
- return generic.TorrentProvider._episode_strings(self, ep_obj, sep_date='.', **kwargs)
+ return super(TorrentVaultProvider, self)._episode_strings(ep_obj, sep_date='.', **kwargs)
provider = TorrentVaultProvider()
diff --git a/sickbeard/providers/torrentz2.py b/sickbeard/providers/torrentz2.py
index 55d22cc6..a4902c57 100644
--- a/sickbeard/providers/torrentz2.py
+++ b/sickbeard/providers/torrentz2.py
@@ -138,8 +138,8 @@ class Torrentz2Provider(generic.TorrentProvider):
return results
def _episode_strings(self, ep_obj, **kwargs):
- return generic.TorrentProvider._episode_strings(
- self, ep_obj, date_detail=(lambda d: [x % str(d).replace('-', '.') for x in ('"%s"', '%s')]),
+ return super(Torrentz2Provider, self)._episode_strings(
+ ep_obj, date_detail=(lambda d: [x % str(d).replace('-', '.') for x in ('"%s"', '%s')]),
ep_detail=(lambda ep_dict: [x % (config.naming_ep_type[2] % ep_dict) for x in ('"%s"', '%s')]), **kwargs)
diff --git a/sickbeard/providers/tvchaosuk.py b/sickbeard/providers/tvchaosuk.py
index 0f96f197..146ad31a 100644
--- a/sickbeard/providers/tvchaosuk.py
+++ b/sickbeard/providers/tvchaosuk.py
@@ -248,7 +248,7 @@ class TVChaosUKProvider(generic.TorrentProvider):
def _episode_strings(self, ep_obj, **kwargs):
- return generic.TorrentProvider._episode_strings(self, ep_obj, scene=False, prefix='%', date_detail=(
+ return super(TVChaosUKProvider, self)._episode_strings(ep_obj, scene=False, prefix='%', date_detail=(
lambda d: [x.strip('0') for x in (
['{0} {1}% {2}'.format(d.strftime('%d')[-1], d.strftime('%b'), d.strftime('%Y'))] +
[d.strftime('%d %b %Y')] + ([d.strftime('%d %B %Y')], [])[d.strftime('%b') == d.strftime('%B')])]),
diff --git a/sickbeard/providers/wop.py b/sickbeard/providers/wop.py
index 67d0761a..0647cd92 100644
--- a/sickbeard/providers/wop.py
+++ b/sickbeard/providers/wop.py
@@ -118,11 +118,11 @@ class WOPProvider(generic.TorrentProvider):
def _season_strings(self, ep_obj, **kwargs):
- return self._search_params(generic.TorrentProvider._season_strings(self, ep_obj, **kwargs))
+ return self._search_params(super(WOPProvider, self)._season_strings(ep_obj, **kwargs))
def _episode_strings(self, ep_obj, **kwargs):
- return self._search_params(generic.TorrentProvider._episode_strings(self, ep_obj, **kwargs))
+ return self._search_params(super(WOPProvider, self)._episode_strings(ep_obj, **kwargs))
@staticmethod
def _search_params(search_params):
diff --git a/sickbeard/providers/zooqle.py b/sickbeard/providers/zooqle.py
index 67e313c5..bfd81253 100644
--- a/sickbeard/providers/zooqle.py
+++ b/sickbeard/providers/zooqle.py
@@ -107,9 +107,10 @@ class ZooqleProvider(generic.TorrentProvider):
return results
def _episode_strings(self, ep_obj, **kwargs):
- return generic.TorrentProvider._episode_strings(self, ep_obj, sep_date='.', **kwargs)
+ return super(ZooqleProvider, self)._episode_strings(ep_obj, sep_date='.', **kwargs)
def _cache_data(self, **kwargs):
return self._search_provider({'Cache': ['*']})
+
provider = ZooqleProvider()