diff --git a/CHANGES.md b/CHANGES.md index 8a44b2dd..c49af16d 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -11,6 +11,11 @@ * Add 'PB', 'EB', 'ZB', 'YB' to recognised output sizes +### 0.13.12 (2018-01-16 01:10:00 UTC) + +* Remove provider TorrentVault + + ### 0.13.11 (2018-01-15 17:35:00 UTC) * Fix issue fetching data in a rare case diff --git a/gui/slick/images/providers/torrentvault.png b/gui/slick/images/providers/torrentvault.png deleted file mode 100644 index 2d9ab670..00000000 Binary files a/gui/slick/images/providers/torrentvault.png and /dev/null differ diff --git a/sickbeard/providers/__init__.py b/sickbeard/providers/__init__.py index ba8e982f..d94233b3 100755 --- a/sickbeard/providers/__init__.py +++ b/sickbeard/providers/__init__.py @@ -31,7 +31,7 @@ from . import alpharatio, beyondhd, bithdtv, bitmetv, blutopia, btn, btscene, dh iptorrents, limetorrents, magnetdl, morethan, nebulance, ncore, nyaa, pisexy, potuk, pretome, privatehd, ptf, \ rarbg, revtt, scenehd, scenetime, shazbat, skytorrents, speedcd, \ thepiratebay, torlock, torrentbytes, torrentday, torrenting, torrentleech, \ - torrentvault, torrentz2, tvchaosuk, wop, zooqle + torrentz2, tvchaosuk, wop, zooqle # anime from . import anizb, tokyotoshokan # custom @@ -86,7 +86,6 @@ __all__ = ['omgwtfnzbs', 'torrentday', 'torrenting', 'torrentleech', - 'torrentvault', 'torrentz2', 'tvchaosuk', 'wop', diff --git a/sickbeard/providers/torrentvault.py b/sickbeard/providers/torrentvault.py deleted file mode 100644 index 8f396266..00000000 --- a/sickbeard/providers/torrentvault.py +++ /dev/null @@ -1,122 +0,0 @@ -# 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 . - -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 TorrentVaultProvider(generic.TorrentProvider): - - def __init__(self): - generic.TorrentProvider.__init__(self, 'TorrentVault', cache_update_freq=10) - - self.url_home = ['https://www.torrentvault.org/'] - - self.url_vars = {'login_action': 'login.php', 'search': 'torrents.php?%s' % '&'.join( - ['searchstr=%s', 'order_by=s3', 'order_way=desc', 'action=basic', '%s'])} - self.url_tmpl = {'config_provider_home_uri': '%(home)s', 'login_action': '%(home)s%(vars)s', - 'search': '%(home)s%(vars)s'} - - self.categories = {'Season': [7, 32], 'Episode': [4, 8, 9]} - self.categories['Cache'] = self.categories['Season'] + self.categories['Episode'] - - self.username, self.password, self.freeleech, self.minseed, self.minleech = 5 * [None] - - def _authorised(self, **kwargs): - - return super(TorrentVaultProvider, self)._authorised( - logged_in=(lambda y=None: self.has_all_cookies('keeplogged')), post_params={'form_tmpl': True}) - - @staticmethod - def _has_signature(data=None): - - return generic.TorrentProvider._has_signature(data) or (data and re.search(r'(?i) len(torrent_rows): - raise generic.HaltParseException - - head = None - for tr in torrent_rows[1:]: - cells = tr.find_all('td') - if 5 > len(cells): - continue - try: - head = head if None is not head else self._header_row(tr) - seeders, leechers, size = [tryInt(n, n) for n in [ - cells[head[x]].get_text().strip() for x in 'seed', 'leech', 'size']] - if (self.freeleech and not rc['filter'].search(cells[1].get_text())) \ - or self._peers_fail(mode, seeders, leechers): - continue - - info = tr.find('a', href=rc['info']) - title = (info.attrs.get('title') or info.get_text()).strip() - download_url = self._link(tr.find('a', href=rc['get'])['href']) - except (AttributeError, TypeError, ValueError, KeyError): - 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, search_url) - - results = self._sort_seeding(mode, results + items[mode]) - - return results - - def _episode_strings(self, ep_obj, **kwargs): - - return super(TorrentVaultProvider, self)._episode_strings(ep_obj, sep_date='.', **kwargs) - - -provider = TorrentVaultProvider()