diff --git a/gui/slick/images/providers/freshontv.png b/gui/slick/images/providers/freshontv.png
deleted file mode 100644
index 089d3479baac284e422f703cafdd3492746d6586..0000000000000000000000000000000000000000
Binary files a/gui/slick/images/providers/freshontv.png and /dev/null differ
diff --git a/sickbeard/providers/__init__.py b/sickbeard/providers/__init__.py
index e300a14a3ecf59a1ff9edde6f0c0de1adc67f00d..015b9c948d54b229066caf4bb59a02cf18ff7a97 100644
--- a/sickbeard/providers/__init__.py
+++ b/sickbeard/providers/__init__.py
@@ -24,14 +24,14 @@ from random import shuffle
import sickbeard
from sickbeard.providers import btn, thepiratebay, torrentleech, iptorrents, torrentz, \
omgwtfnzbs, scc, hdtorrents, torrentday, hdbits, hounddawgs, speedcd, nyaa, xthor, abnormal, torrentbytes, cpasbien, \
- torrent9, freshontv, morethantv, t411, tokyotoshokan, shazbat, rarbg, alpharatio, tntvillage, binsearch, torrentproject, \
+ torrent9, morethantv, t411, tokyotoshokan, shazbat, rarbg, alpharatio, tntvillage, binsearch, torrentproject, \
scenetime, nebulance, tvchaosuk, bitcannon, pretome, gftracker, hdspace, newpct, elitetorrent, danishbits, hd4free, limetorrents, \
norbits, horriblesubs, filelist, skytorrents, ncore, archetorrent, hdtorrents_it, immortalseed, ilcorsaronero
__all__ = [
'btn', 'thepiratebay', 'torrentleech', 'scc', 'hdtorrents',
'torrentday', 'hdbits', 'hounddawgs', 'iptorrents', 'omgwtfnzbs',
- 'speedcd', 'nyaa', 'torrentbytes', 'freshontv', 'cpasbien',
+ 'speedcd', 'nyaa', 'torrentbytes', 'cpasbien',
'torrent9','morethantv', 't411', 'tokyotoshokan', 'alpharatio',
'shazbat', 'rarbg', 'tntvillage', 'binsearch',
'xthor', 'abnormal', 'scenetime', 'nebulance', 'tvchaosuk',
diff --git a/sickbeard/providers/freshontv.py b/sickbeard/providers/freshontv.py
deleted file mode 100644
index 1c029bbc5ff44b4c4786e603acd259c7d0326f75..0000000000000000000000000000000000000000
--- a/sickbeard/providers/freshontv.py
+++ /dev/null
@@ -1,233 +0,0 @@
-# coding=utf-8
-# Author: Idan Gutman
-#
-# 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 requests.utils import add_dict_to_cookiejar, dict_from_cookiejar
-import time
-import traceback
-
-from sickbeard import logger, tvcache
-from sickbeard.bs4_parser import BS4Parser
-
-from sickrage.helper.common import convert_size, try_int
-from sickrage.providers.torrent.TorrentProvider import TorrentProvider
-
-
-class FreshOnTVProvider(TorrentProvider): # pylint: disable=too-many-instance-attributes
-
- def __init__(self):
-
- TorrentProvider.__init__(self, "FreshOnTV")
-
- self._uid = None
- self._hash = None
- self.username = None
- self.password = None
- self.minseed = None
- self.minleech = None
- self.freeleech = False
-
- self.cache = tvcache.TVCache(self)
-
- self.urls = {'base_url': 'https://freshon.tv/',
- 'login': 'https://freshon.tv/login.php?action=makelogin',
- 'detail': 'https://freshon.tv/details.php?id=%s',
- 'search': 'https://freshon.tv/browse.php?incldead=%s&words=0&cat=0&search=%s',
- 'download': 'https://freshon.tv/download.php?id=%s&type=torrent'}
-
- self.url = self.urls['base_url']
-
- self._cookies = None
-
- def _check_auth(self):
-
- if not self.username or not self.password:
- logger.log("Invalid username or password. Check your settings", logger.WARNING)
-
- return True
-
- def login(self):
- if any(dict_from_cookiejar(self.session.cookies).values()):
- return True
-
- if self._uid and self._hash:
- add_dict_to_cookiejar(self.session.cookies, self._cookies)
- else:
- login_params = {'username': self.username,
- 'password': self.password,
- 'login': 'submit'}
-
- response = self.get_url(self.urls['login'], post_data=login_params, returns='text')
- if not response:
- logger.log("Unable to connect to provider", logger.WARNING)
- return False
-
- if re.search('/logout.php', response):
-
- try:
- if dict_from_cookiejar(self.session.cookies)['uid'] and dict_from_cookiejar(self.session.cookies)['pass']:
- self._uid = dict_from_cookiejar(self.session.cookies)['uid']
- self._hash = dict_from_cookiejar(self.session.cookies)['pass']
-
- self._cookies = {'uid': self._uid,
- 'pass': self._hash}
- return True
- except Exception:
- logger.log("Unable to login to provider (cookie)", logger.WARNING)
- return False
-
- else:
- if re.search('Username does not exist in the userbase or the account is not confirmed yet.', response):
- logger.log("Invalid username or password. Check your settings", logger.WARNING)
-
- if re.search('DDoS protection by CloudFlare', response):
- logger.log("Unable to login to provider due to CloudFlare DDoS javascript check", logger.WARNING)
-
- return False
-
- def search(self, search_params, age=0, ep_obj=None): # pylint: disable=too-many-locals, too-many-branches, too-many-statements
- results = []
- if not self.login():
- return results
-
- freeleech = '3' if self.freeleech else '0'
-
- for mode in search_params:
- items = []
- logger.log("Search Mode: {0}".format(mode), logger.DEBUG)
- for search_string in search_params[mode]:
-
- if mode != 'RSS':
- logger.log("Search string: {0}".format
- (search_string.decode("utf-8")), logger.DEBUG)
-
- search_url = self.urls['search'] % (freeleech, search_string)
- init_html = self.get_url(search_url, returns='text')
- max_page_number = 0
-
- if not init_html:
- logger.log("No data returned from provider", logger.DEBUG)
- continue
-
- try:
- with BS4Parser(init_html, 'html5lib') as init_soup:
-
- # Check to see if there is more than 1 page of results
- pager = init_soup.find('div', {'class': 'pager'})
- page_links = pager('a', href=True) if pager else []
-
- for lnk in page_links:
- link_text = lnk.text.strip()
- if link_text.isdigit():
- page_int = int(link_text)
- if page_int > max_page_number:
- max_page_number = page_int
-
- # limit page number to 15 just in case something goes wrong
- if max_page_number > 15:
- max_page_number = 15
- # limit RSS search
- if max_page_number > 3 and mode == 'RSS':
- max_page_number = 3
- except Exception:
- logger.log("Failed parsing provider. Traceback: {0}".format(traceback.format_exc()), logger.ERROR)
- continue
-
- data_response_list = [init_html]
-
- # Freshon starts counting pages from zero, even though it displays numbers from 1
- if max_page_number > 1:
- for i in range(1, max_page_number):
-
- time.sleep(1)
- page_search_url = search_url + '&page=' + str(i)
- # '.log(u"Search string: " + page_search_url, logger.DEBUG)
- page_html = self.get_url(page_search_url, returns='text')
-
- if not page_html:
- continue
-
- data_response_list.append(page_html)
-
- try:
-
- for data_response in data_response_list:
-
- with BS4Parser(data_response, 'html5lib') as html:
-
- torrent_rows = html("tr", class_=re.compile('torrent_[0-9]*'))
-
- # Continue only if a Release is found
- if not torrent_rows:
- logger.log("Data returned from provider does not contain any torrents", logger.DEBUG)
- continue
-
- for individual_torrent in torrent_rows:
-
- # skip if torrent has been nuked due to poor quality
- if individual_torrent.find('img', alt='Nuked') is not None:
- continue
-
- try:
- title = individual_torrent.find('a', {'class': 'torrent_name_link'})['title']
- except Exception:
- logger.log("Unable to parse torrent title. Traceback: {0} ".format(traceback.format_exc()), logger.WARNING)
- continue
-
- try:
- details_url = individual_torrent.find('a', {'class': 'torrent_name_link'})['href']
- torrent_id = int((re.match('.*?([0-9]+)$', details_url).group(1)).strip())
- download_url = self.urls['download'] % (str(torrent_id))
- seeders = try_int(individual_torrent.find('td', {'class': 'table_seeders'}).find('span').text.strip(), 1)
- leechers = try_int(individual_torrent.find('td', {'class': 'table_leechers'}).find('a').text.strip(), 0)
- torrent_size = individual_torrent.find('td', {'class': 'table_size'}).get_text()
- size = convert_size(torrent_size) or -1
- except Exception:
- continue
-
- if not all([title, download_url]):
- continue
-
- # Filter unseeded torrent
- 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
-
- item = {'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(item)
-
- except Exception:
- logger.log("Failed parsing provider. Traceback: {0}".format(traceback.format_exc()), logger.ERROR)
-
- # 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 = FreshOnTVProvider()