From b62093f2cd7dba3bd607ca50826197f14b876f78 Mon Sep 17 00:00:00 2001 From: JackDandy Date: Thu, 21 Jul 2016 20:39:37 +0100 Subject: [PATCH] Remove KAT torrent provider. --- CHANGES.md | 7 +- .../images/providers/kickasstorrents.png | Bin 3515 -> 0 bytes sickbeard/providers/__init__.py | 3 +- sickbeard/providers/kat.py | 223 ------------------ 4 files changed, 7 insertions(+), 226 deletions(-) delete mode 100644 gui/slick/images/providers/kickasstorrents.png delete mode 100644 sickbeard/providers/kat.py diff --git a/CHANGES.md b/CHANGES.md index 5f583fd9..871681b8 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,9 @@ -### 0.11.12 (2016-06-20 02:20:00 UTC) +### 0.11.13 (2016-07-21 20:30:00 UTC) + +* Remove KAT torrent provider + + +### 0.11.12 (2016-06-20 02:20:00 UTC) * Change improve importing show list sickbeard.db files diff --git a/gui/slick/images/providers/kickasstorrents.png b/gui/slick/images/providers/kickasstorrents.png deleted file mode 100644 index 753974e508d70f1a3d62ed0228a5b9d2eff0b234..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3515 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 diff --git a/sickbeard/providers/__init__.py b/sickbeard/providers/__init__.py index 6e1eaad2..13163b1d 100755 --- a/sickbeard/providers/__init__.py +++ b/sickbeard/providers/__init__.py @@ -26,7 +26,7 @@ from sickbeard import logger from . import newznab, omgwtfnzbs, womble # torrent from . import alpharatio, beyondhd, bitmetv, bitsoup, btn, freshontv, funfile, gftracker, grabtheinfo, \ - hdbits, hdspace, iptorrents, kat, morethan, pisexy, pretome, rarbg, scc, scenetime, shazbat, speedcd, \ + hdbits, hdspace, iptorrents, morethan, pisexy, pretome, rarbg, scc, scenetime, shazbat, speedcd, \ thepiratebay, torrentbytes, torrentday, torrenting, torrentleech, torrentshack, transmithe_net, tvchaosuk # anime from . import nyaatorrents, tokyotoshokan @@ -45,7 +45,6 @@ __all__ = ['omgwtfnzbs', 'hdbits', 'hdspace', 'iptorrents', - 'kat', 'morethan', 'pisexy', 'pretome', diff --git a/sickbeard/providers/kat.py b/sickbeard/providers/kat.py deleted file mode 100644 index 97a418ed..00000000 --- a/sickbeard/providers/kat.py +++ /dev/null @@ -1,223 +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 . - -from __future__ import with_statement - -import os -import re -import traceback -import urllib - -from . import generic -from sickbeard import config, logger, show_name_helpers, tvcache -from sickbeard.bs4_parser import BS4Parser -from sickbeard.helpers import (has_anime, tryInt) -from sickbeard.common import Quality, mediaExtensions -from sickbeard.name_parser.parser import NameParser, InvalidNameException, InvalidShowException -from lib.unidecode import unidecode - - -class KATProvider(generic.TorrentProvider): - - def __init__(self): - generic.TorrentProvider.__init__(self, 'KickAssTorrents') - - self.url_base = 'https://kat.ph/' - self.urls = {'config_provider_home_uri': self.url_base, - 'base': [self.url_base, 'http://katproxy.com/'], - 'search': 'usearch/%s/', - 'sorted': '?field=time_add&sorder=desc'} - - self.proper_search_terms = None - self.url = self.urls['config_provider_home_uri'] - - self.minseed, self.minleech = 2 * [None] - self.confirmed = False - self.cache = KATCache(self) - - def _find_season_quality(self, title, torrent_link, ep_number): - """ Return the modified title of a Season Torrent with the quality found inspecting torrent file list """ - - quality = Quality.UNKNOWN - - file_name = None - - data = self.get_url(torrent_link) - if not data: - return None - - try: - with BS4Parser(data, features=['html5lib', 'permissive']) as soup: - file_table = soup.find('table', attrs={'class': 'torrentFileList'}) - - if not file_table: - return None - - files = [x.text for x in file_table.find_all('td', attrs={'class': 'torFileName'})] - video_files = filter(lambda i: i.rpartition('.')[2].lower() in mediaExtensions, files) - - # Filtering SingleEpisode/MultiSeason Torrent - if len(video_files) < ep_number or len(video_files) > float(ep_number * 1.1): - logger.log(u'Result %s lists %s episodes with %s episodes retrieved in torrent' - % (title, ep_number, len(video_files)), logger.DEBUG) - logger.log(u'Result %s seem to be a single episode or multi-season torrent, skipping result...' - % title, logger.DEBUG) - return None - - if Quality.UNKNOWN != Quality.sceneQuality(title): - return title - - for file_name in video_files: - quality = Quality.sceneQuality(os.path.basename(file_name)) - if Quality.UNKNOWN != quality: - break - - if None is not file_name and Quality.UNKNOWN == quality: - quality = Quality.assumeQuality(os.path.basename(file_name)) - - if Quality.UNKNOWN == quality: - logger.log(u'Unable to obtain a Season Quality for ' + title, logger.DEBUG) - return None - - try: - my_parser = NameParser(showObj=self.show) - parse_result = my_parser.parse(file_name) - except (InvalidNameException, InvalidShowException): - return None - - logger.log(u'Season quality for %s is %s' % (title, Quality.qualityStrings[quality]), logger.DEBUG) - - if parse_result.series_name and parse_result.season_number: - title = parse_result.series_name + ' S%02d %s' % (int(parse_result.season_number), - self._reverse_quality(quality)) - return title - - except Exception: - logger.log(u'Failed to quality parse ' + self.name + ' Traceback: ' + traceback.format_exc(), logger.ERROR) - - def _season_strings(self, ep_obj, **kwargs): - - if ep_obj.show.air_by_date or ep_obj.show.is_sports: - airdate = str(ep_obj.airdate).split('-')[0] - ep_detail = [airdate, 'Season ' + airdate] - elif ep_obj.show.is_anime: - ep_detail = '%02i' % ep_obj.scene_absolute_number - else: - season = (ep_obj.season, ep_obj.scene_season)[bool(ep_obj.show.is_scene)] - ep_detail = ['S%(s)02i -S%(s)02iE' % {'s': season}, 'Season %s -Ep*' % season] - - return [{'Season': self._build_search_strings(ep_detail)}] - - 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) - - def _search_provider(self, search_params, search_mode='eponly', epcount=0, **kwargs): - - results = [] - items = {'Cache': [], 'Season': [], 'Episode': [], 'Propers': []} - - rc = dict((k, re.compile('(?i)' + v)) for (k, v) in {'link': 'normal', 'get': '^magnet', 'verif': 'verif'}.items()) - url = 0 - for mode in search_params.keys(): - search_show = mode in ['Season', 'Episode'] - if not search_show and has_anime(): - search_params[mode] *= (1, 2)['Cache' == mode] - 'Propers' == mode and search_params[mode].append('v1|v2|v3|v4|v5') - - for enum, search_string in enumerate(search_params[mode]): - search_string = isinstance(search_string, unicode) and unidecode(search_string) or search_string - - self.url = self.urls['base'][url] - search_url = self.url + (self.urls['search'] % urllib.quote('%scategory:%s' % ( - ('', '%s ' % search_string)['Cache' != mode], - ('tv', 'anime')[(search_show and bool(self.show and self.show.is_anime)) or bool(enum)]))) - - self.session.headers.update({'Referer': search_url}) - html = self.get_url(search_url + self.urls['sorted']) - - cnt = len(items[mode]) - try: - if not html or 'kastatic' not in html or self._has_no_results(html) or re.search(r'(?is)<(?:h\d)[^>]*>.*?(?:did\snot\smatch)', html): - if html and 'kastatic' not in html: - url += (1, 0)[url == len(self.urls['base'])] - raise generic.HaltParseException - - with BS4Parser(html, features=['html5lib', 'permissive']) as soup: - torrent_table = soup.find('table', attrs={'class': 'data'}) - torrent_rows = [] if not torrent_table else torrent_table.find_all('tr') - - if 2 > len(torrent_rows): - raise generic.HaltParseException - - for tr in torrent_rows[1:]: - try: - seeders, leechers, size = [tryInt(n, n) for n in [ - tr.find_all('td')[x].get_text().strip() for x in (-2, -1, -5)]] - if self._peers_fail(mode, seeders, leechers): - continue - - info = tr.find('div', {'class': 'torrentname'}) - title = (info.find_all('a')[1].get_text() or info.find('a', 'cellMainLink').get_text())\ - .strip() - link = self.url + info.find('a', {'class': rc['link']})['href'].lstrip('/') - - download_magnet = tr.find('a', href=rc['get'])['href'] - except (AttributeError, TypeError, ValueError): - continue - - if self.confirmed and not (tr.find('a', title=rc['verif']) or tr.find('i', title=rc['verif'])): - logger.log(u'Skipping untrusted non-verified result: %s' % title, logger.DEBUG) - continue - - # Check number video files = episode in season and find the real Quality for full season torrent analyzing files in torrent - if 'Season' == mode and 'sponly' == search_mode: - ep_number = int(epcount / len(set(show_name_helpers.allPossibleShowNames(self.show)))) - title = self._find_season_quality(title, link, ep_number) - - if title and download_magnet: - items[mode].append((title, download_magnet, seeders, self._bytesizer(size))) - - except generic.HaltParseException: - pass - except Exception: - logger.log(u'Failed to parse. Traceback: %s' % traceback.format_exc(), logger.ERROR) - self._log_search(mode, len(items[mode]) - cnt, search_url) - - self._sort_seeders(mode, items) - - results = list(set(results + items[mode])) - - return results - - -class KATCache(tvcache.TVCache): - - def __init__(self, this_provider): - tvcache.TVCache.__init__(self, this_provider) - - self.update_freq = 20 # cache update frequency - - def _cache_data(self): - - return self.provider.cache_data() - - -provider = KATProvider()