diff --git a/gui/slick/images/providers/tvtorrents.png b/gui/slick/images/providers/tvtorrents.png deleted file mode 100644 index bca30aa9..00000000 Binary files a/gui/slick/images/providers/tvtorrents.png and /dev/null differ diff --git a/gui/slick/interfaces/default/config_providers.tmpl b/gui/slick/interfaces/default/config_providers.tmpl index 666f2ce8..35d38946 100644 --- a/gui/slick/interfaces/default/config_providers.tmpl +++ b/gui/slick/interfaces/default/config_providers.tmpl @@ -530,39 +530,6 @@ var show_nzb_providers = #if $sickbeard.USE_NZBS then "true" else "false"#; #end if - #if $hasattr($curTorrentProvider, 'options'): -
- -
- Advanced options -
- -
-
- -
-
- -
-
-
- #end if - #end for diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py index 1676a853..531ac5bb 100755 --- a/sickbeard/__init__.py +++ b/sickbeard/__init__.py @@ -32,7 +32,7 @@ from github import Github from sickbeard import providers, metadata, config, webserveInit from sickbeard.providers.generic import GenericProvider -from providers import ezrss, tvtorrents, btn, newznab, womble, thepiratebay, torrentleech, kat, iptorrents, \ +from providers import ezrss, btn, newznab, womble, thepiratebay, torrentleech, kat, iptorrents, \ omgwtfnzbs, scc, hdtorrents, torrentday, hdbits, nextgen, speedcd, nyaatorrents, fanzub, torrentbytes, animezb, \ freshontv, bitsoup, t411, tokyotoshokan from sickbeard.config import CheckSection, check_setting_int, check_setting_str, check_setting_float, ConfigMigrator, \ diff --git a/sickbeard/providers/__init__.py b/sickbeard/providers/__init__.py index 50af6be7..b4f9df82 100755 --- a/sickbeard/providers/__init__.py +++ b/sickbeard/providers/__init__.py @@ -17,7 +17,6 @@ # along with SickRage. If not, see . __all__ = ['ezrss', - 'tvtorrents', 'womble', 'btn', 'thepiratebay', diff --git a/sickbeard/providers/tvtorrents.py b/sickbeard/providers/tvtorrents.py deleted file mode 100644 index 7a4b66b4..00000000 --- a/sickbeard/providers/tvtorrents.py +++ /dev/null @@ -1,103 +0,0 @@ -# Author: Nic Wolfe -# URL: http://code.google.com/p/sickbeard/ -# -# 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 . - -try: - import xml.etree.cElementTree as etree -except ImportError: - import elementtree.ElementTree as etree - -import sickbeard -import generic - -from sickbeard.exceptions import ex, AuthException -from sickbeard import helpers -from sickbeard import logger -from sickbeard import tvcache - - -class TvTorrentsProvider(generic.TorrentProvider): - def __init__(self): - - generic.TorrentProvider.__init__(self, "TvTorrents") - - self.supportsBacklog = False - - self.enabled = False - self.hash = None - self.digest = None - self.ratio = None - self.options = None - - self.cache = TvTorrentsCache(self) - - self.urls = {'base_url': 'https://www.tvtorrents.com/'} - self.url = self.urls['base_url'] - - def isEnabled(self): - return self.enabled - - def imageName(self): - return 'tvtorrents.png' - - def _checkAuth(self): - if not self.digest or not self.hash: - raise AuthException("Your authentication credentials for " + self.name + " are missing, check your config.") - - return True - - def _checkAuthFromData(self, data): - if not (data['entries'] and data['feed']): - return self._checkAuth() - - try: - title = data['feed']['title'] - except: - return False - - if title and ("User can't be found" in title or "Invalid Hash" in title): - logger.log(u"Incorrect authentication credentials for " + self.name + " : " + str(title), - logger.DEBUG) - raise AuthException( - u"Your authentication credentials for " + self.name + " are incorrect, check your config") - - return True - - def seedRatio(self): - return self.ratio - - -class TvTorrentsCache(tvcache.TVCache): - def __init__(self, provider): - tvcache.TVCache.__init__(self, provider) - - # only poll TvTorrents every 15 minutes max - self.minTime = 15 - - def _getRSSData(self): - # These will be ignored on the serverside. - ignore_regex = "all.month|month.of|season[\s\d]*complete" - - rss_url = self.provider.url + 'RssServlet?digest=' + provider.digest + '&hash=' + provider.hash + '&fname=true&exclude=(' + ignore_regex + ')' - logger.log(self.provider.name + u" cache update URL: " + rss_url, logger.DEBUG) - - return self.getRSSFeed(rss_url) - - def _checkAuth(self, data): - return self.provider._checkAuthFromData(data) - -provider = TvTorrentsProvider()