From 72826f6dd274c8e53434acadfef221acb190776c Mon Sep 17 00:00:00 2001 From: Giovanni Date: Wed, 18 Feb 2015 12:10:33 +0100 Subject: [PATCH] Removed 'page' parameter --- gui/slick/interfaces/default/config_providers.tmpl | 14 +------------- sickbeard/__init__.py | 6 ------ sickbeard/providers/tntvillage.py | 5 ++++- sickbeard/webserve.py | 6 ------ 4 files changed, 5 insertions(+), 26 deletions(-) diff --git a/gui/slick/interfaces/default/config_providers.tmpl b/gui/slick/interfaces/default/config_providers.tmpl index bc6f0204..938b506b 100644 --- a/gui/slick/interfaces/default/config_providers.tmpl +++ b/gui/slick/interfaces/default/config_providers.tmpl @@ -530,18 +530,6 @@ var show_nzb_providers = #if $sickbeard.USE_NZBS then "true" else "false"#; #end if - #if $hasattr($curTorrentProvider, 'page') and $curTorrentProvider.getID() == 'tntvillage': -
- -
- #end if - #if $hasattr($curTorrentProvider, 'cat') and $curTorrentProvider.getID() == 'tntvillage':
diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py index a20e4800..91f83b7b 100755 --- a/sickbeard/__init__.py +++ b/sickbeard/__init__.py @@ -1104,9 +1104,6 @@ def initialize(consoleLogging=True): curTorrentProvider.getID() + '_enable_backlog', 1)) - if hasattr(curTorrentProvider, 'page'): - curTorrentProvider.page = check_setting_int(CFG, curTorrentProvider.getID().upper(), - curTorrentProvider.getID() + '_page', 1) if hasattr(curTorrentProvider, 'cat'): curTorrentProvider.cat = check_setting_int(CFG, curTorrentProvider.getID().upper(), curTorrentProvider.getID() + '_cat', 0) @@ -1619,9 +1616,6 @@ def save_config(): if hasattr(curTorrentProvider, 'enable_backlog'): new_config[curTorrentProvider.getID().upper()][curTorrentProvider.getID() + '_enable_backlog'] = int( curTorrentProvider.enable_backlog) - if hasattr(curTorrentProvider, 'page'): - new_config[curTorrentProvider.getID().upper()][curTorrentProvider.getID() + '_page'] = int( - curTorrentProvider.page) if hasattr(curTorrentProvider, 'cat'): new_config[curTorrentProvider.getID().upper()][curTorrentProvider.getID() + '_cat'] = int( curTorrentProvider.cat) diff --git a/sickbeard/providers/tntvillage.py b/sickbeard/providers/tntvillage.py index 9b18dd89..b0b700c9 100644 --- a/sickbeard/providers/tntvillage.py +++ b/sickbeard/providers/tntvillage.py @@ -79,7 +79,7 @@ class TNTVillageProvider(generic.TorrentProvider): self.password = None self.ratio = None self.cat = None - self.page = None + self.page = 10 self.subtitle = None self.minseed = None self.minleech = None @@ -324,6 +324,9 @@ class TNTVillageProvider(generic.TorrentProvider): if isinstance(search_string, unicode): search_string = unidecode(search_string) + if mode = 'RSS': + self.page = 2 + last_page=0 y=int(self.page) diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py index bb158728..057777b4 100644 --- a/sickbeard/webserve.py +++ b/sickbeard/webserve.py @@ -4315,12 +4315,6 @@ class ConfigProviders(Config): except: curTorrentProvider.enable_backlog = 0 # these exceptions are actually catching unselected checkboxes - if hasattr(curTorrentProvider, 'page'): - try: - curTorrentProvider.page = int(str(kwargs[curTorrentProvider.getID() + '_page']).strip()) - except: - curTorrentProvider.page = 1 - if hasattr(curTorrentProvider, 'cat'): try: curTorrentProvider.cat = int(str(kwargs[curTorrentProvider.getID() + '_cat']).strip())