From 88506c12b6395c78339fd845a5aff6ef49b3499b Mon Sep 17 00:00:00 2001 From: Kfir Hadas <sharkykh@gmail.com> Date: Sun, 7 May 2017 02:55:13 +0300 Subject: [PATCH] Remove NyaaTorrents (#3717) * Remove old BitSnoop logo (provider removed in #3542) * Remove NyaaTorrents provider Closes #3704 * Remove Nyaa strings from parsing_tests.py --- gui/slick/images/providers/bitsnoop.png | Bin 323 -> 0 bytes gui/slick/images/providers/nyaatorrents.png | Bin 1949 -> 0 bytes sickbeard/providers/__init__.py | 4 +- sickbeard/providers/nyaatorrents.py | 124 ----------- .../torrent/cassettes/nyaatorrents.yaml | 207 ------------------ .../providers/torrent/parsing_tests.py | 1 - 6 files changed, 2 insertions(+), 334 deletions(-) delete mode 100644 gui/slick/images/providers/bitsnoop.png delete mode 100644 gui/slick/images/providers/nyaatorrents.png delete mode 100644 sickbeard/providers/nyaatorrents.py delete mode 100644 tests/sickrage_tests/providers/torrent/cassettes/nyaatorrents.yaml diff --git a/gui/slick/images/providers/bitsnoop.png b/gui/slick/images/providers/bitsnoop.png deleted file mode 100644 index 3feed89dc113d5399d304962afbe8ff81d870724..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 323 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7*pj^6T^Rm@;DWu&Co?cG z{P1*f46!)9bh2UgVFQsCdrhHb8JX7wI3inbul1f~=v-IC6=yxAOzT)S$CPy+7c~TQ zSTAAIUgiAy&a&foZSP*5{D56QpP%>tfy<BE83de<#0ndR+;N&KK4)@B>anuLi+`1f zZP<ByMsmpX=Z}(dg$xgrE!Moo_B>_3V`y570>gz}iTiFC$G^GwYl;zzV`$o6w!7!d zzW1oJADhf<_I-bmP_tg%d%wuncR7~+dcI~yLzVfW3N!I|$8X)L^^QkoopUm|uxr|l zYI)ZeMUyzpzSq=hISI5VRMhY7JP~Dn(P6T*L~+W_BG2jDJ{LWm<hrYB>iYjaZxdgX b|6{wNki=_zrg$m?0|SGntDnm{r-UW|_Ew9p diff --git a/gui/slick/images/providers/nyaatorrents.png b/gui/slick/images/providers/nyaatorrents.png deleted file mode 100644 index afa0b197e4a55ef0c94256c71bf1fa2b3b9a1fa4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1949 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 Z(BGA@>EXY3h71f044$rjF6*2UngGOxzP$hd diff --git a/sickbeard/providers/__init__.py b/sickbeard/providers/__init__.py index 8720f0fde..9c2820e8e 100644 --- a/sickbeard/providers/__init__.py +++ b/sickbeard/providers/__init__.py @@ -23,7 +23,7 @@ from random import shuffle import sickbeard from sickbeard.providers import btn, thepiratebay, torrentleech, iptorrents, torrentz, \ - omgwtfnzbs, scc, hdtorrents, torrentday, hdbits, hounddawgs, speedcd, nyaatorrents, xthor, abnormal, torrentbytes, cpasbien,\ + omgwtfnzbs, scc, hdtorrents, torrentday, hdbits, hounddawgs, speedcd, xthor, abnormal, torrentbytes, cpasbien,\ torrent9, freshontv, morethantv, t411, tokyotoshokan, shazbat, rarbg, alpharatio, tntvillage, binsearch, torrentproject, extratorrent, \ scenetime, transmitthenet, tvchaosuk, bitcannon, pretome, gftracker, hdspace, newpct, elitetorrent, danishbits, hd4free, limetorrents, \ norbits, horriblesubs, filelist, skytorrents, ncore, archetorrent, hdtorrents_it, immortalseed, ilcorsaronero @@ -31,7 +31,7 @@ from sickbeard.providers import btn, thepiratebay, torrentleech, iptorrents, tor __all__ = [ 'btn', 'thepiratebay', 'torrentleech', 'scc', 'hdtorrents', 'torrentday', 'hdbits', 'hounddawgs', 'iptorrents', 'omgwtfnzbs', - 'speedcd', 'nyaatorrents', 'torrentbytes', 'freshontv', 'cpasbien', + 'speedcd', 'torrentbytes', 'freshontv', 'cpasbien', 'torrent9','morethantv', 't411', 'tokyotoshokan', 'alpharatio', 'shazbat', 'rarbg', 'tntvillage', 'binsearch', 'xthor', 'abnormal', 'scenetime', 'transmitthenet', 'tvchaosuk', diff --git a/sickbeard/providers/nyaatorrents.py b/sickbeard/providers/nyaatorrents.py deleted file mode 100644 index ecb815f51..000000000 --- a/sickbeard/providers/nyaatorrents.py +++ /dev/null @@ -1,124 +0,0 @@ -# coding=utf-8 -# Author: Mr_Orange -# -# URL: https://sickrage.github.io -# -# This file is part of SickRage. -# -# SickRage 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. -# -# SickRage 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 SickRage. If not, see <http://www.gnu.org/licenses/>. - -from __future__ import print_function, unicode_literals - -import re - -from sickbeard import logger, tvcache - -from sickrage.helper.common import convert_size, try_int -from sickrage.providers.torrent.TorrentProvider import TorrentProvider - - -class NyaaProvider(TorrentProvider): # pylint: disable=too-many-instance-attributes - - def __init__(self): - - TorrentProvider.__init__(self, 'NyaaTorrents') - - self.public = True - self.supports_absolute_numbering = True - self.anime_only = True - - self.url = 'http://www.nyaa.se' - - self.minseed = 0 - self.minleech = 0 - self.confirmed = False - - self.regex = re.compile(r'(\d+) seeder\(s\), (\d+) leecher\(s\), \d+ download\(s\) - (\d+.?\d* [KMGT]iB)(.*)', re.DOTALL) - - self.cache = tvcache.TVCache(self, min_time=20) # only poll NyaaTorrents every 20 minutes max - - def search(self, search_strings, age=0, ep_obj=None): # pylint: disable=too-many-locals, too-many-branches - results = [] - if self.show and not self.show.is_anime: - return results - - for mode in search_strings: - items = [] - logger.log('Search Mode: {0}'.format(mode), logger.DEBUG) - for search_string in search_strings[mode]: - if mode != 'RSS': - logger.log('Search string: {0}'.format - (search_string.decode('utf-8')), logger.DEBUG) - - search_params = { - 'page': 'rss', - 'cats': '1_0', # All anime - 'sort': 2, # Sort Descending By Seeders - 'order': 1 - } - if mode != 'RSS': - search_params['term'] = search_string - - results = [] - data = self.cache.get_rss_feed(self.url, params=search_params)['entries'] - if not data: - logger.log('Data returned from provider does not contain any torrents', logger.DEBUG) - - for curItem in data: - try: - title = curItem['title'] - download_url = curItem['link'] - if not all([title, download_url]): - continue - - item_info = self.regex.search(curItem['summary']) - if not item_info: - logger.log('There was a problem parsing an item summary, skipping: {0}'.format - (title), logger.DEBUG) - continue - - seeders, leechers, torrent_size, verified = item_info.groups() - seeders = try_int(seeders) - leechers = try_int(leechers) - - if seeders < self.minseed or leechers < self.minleech: - if mode != 'RSS': - logger.log('Discarding torrent because it doesn\'t meet the' - ' minimum seeders or leechers: {0} (S:{1} L:{2})'.format - (title, seeders, leechers), logger.DEBUG) - continue - - if self.confirmed and not verified and mode != 'RSS': - logger.log('Found result {0} but that doesn\'t seem like a verified result so I\'m ignoring it'.format - (title), logger.DEBUG) - continue - - size = convert_size(torrent_size) or -1 - result = {'title': title, 'link': download_url, 'size': size, 'seeders': seeders, 'leechers': leechers, 'hash': ''} - if mode != 'RSS': - logger.log('Found result: {0} with {1} seeders and {2} leechers'.format - (title, seeders, leechers), logger.DEBUG) - - items.append(result) - except StandardError: - continue - - # For each search mode sort all the items by seeders if available - items.sort(key=lambda d: try_int(d.get('seeders', 0)), reverse=True) - results += items - - return results - - -provider = NyaaProvider() diff --git a/tests/sickrage_tests/providers/torrent/cassettes/nyaatorrents.yaml b/tests/sickrage_tests/providers/torrent/cassettes/nyaatorrents.yaml deleted file mode 100644 index 0e7e76456..000000000 --- a/tests/sickrage_tests/providers/torrent/cassettes/nyaatorrents.yaml +++ /dev/null @@ -1,207 +0,0 @@ -interactions: -- request: - body: null - headers: - Accept: ['*/*'] - Accept-Encoding: [!!python/unicode 'gzip,deflate'] - Connection: [keep-alive] - User-Agent: [!!python/unicode 'Mozilla/5.0 (Windows NT 6.2; WOW64) AppleWebKit/537.36 - (KHTML, like Gecko) Chrome/30.0.1599.17 Safari/537.36'] - method: GET - uri: http://www.nyaa.se/?sort=2&term=Fairy+Tail+S2&cats=1_0&page=rss&order=1 - response: - body: - string: !!binary | - H4sIAAAAAAAAA8VdbW8buRH+K1sfcGiRxuLb8GVPdpE2PRyuuPRD8i0ICsXes4VTZEOS48u/L+ml - kiy5YpYjhgrywXH82JGeDGfmmYez881223zsNtvl3frijJ2Ts+bPD6v1tl3s7j5cnN3udvftbPb4 - +Hj+yM/vNjczRgjMXti/PLucX90u1utudTnfLXer7vLVp8Xizd1m06132/ms/9x8tVz/cfnVt1nb - LzrfdrP57Olv5u7ntO7D5nbT/T74ifsv/cf94qa7sP/QH3/g+qerxW57Qf9Hnv6w6zYfLn5eLDef - nr1ZLFfPXrOnT2/vNrsLdtZsutXF2bZb/X7W7D7ddxdni/v71dJ+B/tqZ/YbPrOv9ayZXc6vu+3V - ZnnvPn85nw3+tNx1H/av8O0v9uUt36+61w/vt++apx/cuB/cvGbN84YS1rxVjNy/O//wx8fPb4H9 - ed3N3ebT5b/XN6vl9vb5brNYb1f2s9fNi/XyQzefff6Sg+9X/yZc3z2uV3eL6/7FL68vlFGEs/2b - efOwvD4M/rjsHiPgE2T4+v/y9l8vX7x58VZw3Wy77rrb/HX7t7830Ky67urW/4lR0KTZ/3vsp+zr - 50ye8+a35T/tx282D1v7At+9C9/P+4f3L+2rvXy92NnvIpvfFpuGESobwloCLYXmGbG/5rP9F85n - PQVZRND6RIB9ESgiemCCCGbgayLkkAjOlAmJ4OxcZRFBTUQEL0KEjQhKdPWQENiQEN9gghxmgjJJ - ZMAECHkOR4WEbpkuwgSpHxJMS0AR0QNTREj1NRFiGBKCgB4JCZ0XEiwKCVoqJET9iKDYiKBpIohO - RYTSKiCCCn1Oj4oI1gpZgAhj6geEPQk1iocemORBJAICFAt54Jxm5ggCQx5UC6wED7o6D1priooH - D0zwQOUgHljIg6IjB5PJiwfV/Ny9/8wDlYXiQdXnQRpJUDz0wBQPYA7zQDXlx/HwsHYl8JAH1fIy - xSs5Qc1kMy7uZOqBKSYEO3wyUaajDAEgMyMiSNWM2t8lIkLWjwhhGKqL8MAUD8N2jg9PJinJWETI - PB74ICKIaEWxdq56RNi2zGD7OZNmgplURLgmI4wIcy6O6eeYZUKViAhePSKUEkxhePDAJA/scI7g - VI/21XkRwXjz62L9JSLsyVQsImo3Efb/Na6b64EpIihJpggWHk0UaGYTEQocrEyydsVr7ZPJFaG4 - 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 - headers: - cf-ray: [28e66507c50c071f-SJC] - connection: [keep-alive] - content-encoding: [gzip] - content-type: [application/rss+xml; charset=utf-8] - date: ['Mon, 04 Apr 2016 17:14:05 GMT'] - server: [cloudflare-nginx] - set-cookie: ['__cfduid=d7fa3ab3905a87de761a23505c94be8391459790045; expires=Tue, - 04-Apr-17 17:14:05 GMT; path=/; domain=.nyaa.se; HttpOnly'] - vary: [Accept-Encoding] - status: {code: 200, message: OK} -- request: - body: null - headers: - Accept: ['*/*'] - Accept-Encoding: [!!python/unicode 'gzip,deflate'] - Connection: [keep-alive] - Cookie: [__cfduid=d7fa3ab3905a87de761a23505c94be8391459790045] - User-Agent: [!!python/unicode 'Mozilla/5.0 (Windows NT 6.2; WOW64) AppleWebKit/537.36 - (KHTML, like Gecko) Chrome/30.0.1599.17 Safari/537.36'] - method: GET - uri: http://www.nyaa.se/?sort=2&cats=1_0&page=rss&order=1 - response: - body: - string: !!binary | - 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 - 9c78P+tvOvj4nwAA - headers: - cf-ray: [28e6650b2ec52828-SJC] - connection: [keep-alive] - content-encoding: [gzip] - content-type: [application/rss+xml; charset=utf-8] - date: ['Mon, 04 Apr 2016 17:14:06 GMT'] - server: [cloudflare-nginx] - vary: [Accept-Encoding] - status: {code: 200, message: OK} -version: 1 diff --git a/tests/sickrage_tests/providers/torrent/parsing_tests.py b/tests/sickrage_tests/providers/torrent/parsing_tests.py index 5c216791e..45bd93e5e 100644 --- a/tests/sickrage_tests/providers/torrent/parsing_tests.py +++ b/tests/sickrage_tests/providers/torrent/parsing_tests.py @@ -61,7 +61,6 @@ disabled_provider_tests = { test_string_overrides = { 'Cpasbien': {'Episode': ['The 100 S02E16'], 'Season': ['The 100 S02']}, 'Torrent9': {'Episode': ['NCIS S14E09'], 'Season': ['NCIS S14']}, - 'NyaaTorrents': {'Episode': ['Fairy Tail S2'], 'Season': ['Fairy Tail S2']}, 'TokyoToshokan': {'Episode': ['Fairy Tail S2'], 'Season': ['Fairy Tail S2']}, 'HorribleSubs': {'Episode': ['Fairy Tail S2'], 'Season': ['Fairy Tail S2']}, } -- GitLab