diff --git a/gui/slick/views/config_providers.mako b/gui/slick/views/config_providers.mako index 9ae777244930abd0afe335fc702c0ba07b1f34c0..58190173ac4b71f2583a467ab7c276336c0c5500 100644 --- a/gui/slick/views/config_providers.mako +++ b/gui/slick/views/config_providers.mako @@ -180,7 +180,7 @@ <div class="col-lg-9 col-md-8 col-sm-7 col-xs-12 component-desc"> <input type="checkbox" name="${curNewznabProvider.get_id("_enable_daily")}" id="${curNewznabProvider.get_id("_enable_daily")}" - ${('', 'checked="checked"')[curNewznabProvider.enable_daily]} + ${('', 'checked="checked"')[curNewznabProvider.daily_enabled]} ${('disabled', '')[curNewznabProvider.can_daily]} /> <label for="${curNewznabProvider.get_id("_enable_daily")}">${_('enable provider to perform daily searches.')}</label> @@ -197,7 +197,7 @@ <div class="col-lg-9 col-md-8 col-sm-7 col-xs-12 component-desc"> <input type="checkbox" name="${curNewznabProvider.get_id("_enable_backlog")}" id="${curNewznabProvider.get_id("_enable_backlog")}" - ${('', 'checked="checked"')[curNewznabProvider.enable_backlog and curNewznabProvider.can_backlog]} + ${('', 'checked="checked"')[curNewznabProvider.backlog_enabled]} ${('disabled', '')[curNewznabProvider.can_backlog]} /> <label for="${curNewznabProvider.get_id("_enable_backlog")}">${_('enable provider to perform backlog searches.')}</label> @@ -244,7 +244,7 @@ </div> <div class="col-lg-9 col-md-8 col-sm-7 col-xs-12 component-desc"> <input type="checkbox" name="${curNewznabProvider.get_id("_search_fallback")}" - id="${curNewznabProvider.get_id("_search_fallback")}" ${('', 'checked="checked"')[curNewznabProvider.search_fallback]}/> + id="${curNewznabProvider.get_id("_search_fallback")}" ${('', 'checked="checked"')[curNewznabProvider.search_fallback_enabled]}/> <label for="${curNewznabProvider.get_id("_search_fallback")}">${_('when searching for a complete season depending on search mode you may return no results, this helps by restarting the search using the opposite search mode.')}</label> </div> </div> @@ -289,7 +289,7 @@ <div class="col-lg-9 col-md-8 col-sm-7 col-xs-12 component-desc"> <input type="checkbox" name="${curNzbProvider.get_id("_enable_daily")}" id="${curNzbProvider.get_id("_enable_daily")}" - ${('', 'checked="checked"')[curNzbProvider.enable_daily]} + ${('', 'checked="checked"')[curNzbProvider.daily_enabled]} ${('disabled', '')[curNzbProvider.can_daily]} /> <label for="${curNzbProvider.get_id("_enable_daily")}">${_('enable provider to perform daily searches.')}</label> @@ -306,7 +306,7 @@ <div class="col-lg-9 col-md-8 col-sm-7 col-xs-12 component-desc"> <input type="checkbox" name="${curNzbProvider.get_id("_enable_backlog")}" id="${curNzbProvider.get_id("_enable_backlog")}" - ${('', ' checked="checked"')[curNzbProvider.enable_backlog and curNzbProvider.can_backlog]} + ${('', ' checked="checked"')[curNzbProvider.backlog_enabled]} ${('disabled', ' ')[curNzbProvider.can_backlog]} /> <label for="${curNzbProvider.get_id("_enable_backlog")}">${_('enable provider to perform backlog searches.')}</label> @@ -353,7 +353,7 @@ </div> <div class="col-lg-9 col-md-8 col-sm-7 col-xs-12 component-desc"> <input type="checkbox" name="${curNzbProvider.get_id("_search_fallback")}" - id="${curNzbProvider.get_id("_search_fallback")}" ${('', 'checked="checked"')[curNzbProvider.search_fallback]}/> + id="${curNzbProvider.get_id("_search_fallback")}" ${('', 'checked="checked"')[curNzbProvider.search_fallback_enabled]}/> <label for="${curNzbProvider.get_id("_search_fallback")}">${_('when searching for a complete season depending on search mode you may return no results, this helps by restarting the search using the opposite search mode.')}</label> </div> </div> @@ -644,7 +644,7 @@ <div class="col-lg-9 col-md-8 col-sm-7 col-xs-12 component-desc"> <input type="checkbox" name="${curTorrentProvider.get_id("_enable_daily")}" id="${curTorrentProvider.get_id("_enable_daily")}" - ${('', 'checked="checked"')[curTorrentProvider.enable_daily]} + ${('', 'checked="checked"')[curTorrentProvider.daily_enabled]} ${('disabled', ' ')[curTorrentProvider.can_daily]} /> <label for="${curTorrentProvider.get_id("_enable_daily")}">${_('enable provider to perform daily searches.')}</label> @@ -661,7 +661,7 @@ <div class="col-lg-9 col-md-8 col-sm-7 col-xs-12 component-desc"> <input type="checkbox" name="${curTorrentProvider.get_id("_enable_backlog")}" id="${curTorrentProvider.get_id("_enable_backlog")}" - ${('', 'checked="checked"')[curTorrentProvider.enable_backlog and curTorrentProvider.can_backlog]} + ${('', 'checked="checked"')[curTorrentProvider.backlog_enabled]} ${('disabled', '')[curTorrentProvider.can_backlog]} /> @@ -709,7 +709,7 @@ </div> <div class="col-lg-9 col-md-8 col-sm-7 col-xs-12 component-desc"> <input type="checkbox" name="${curTorrentProvider.get_id("_search_fallback")}" - id="${curTorrentProvider.get_id("_search_fallback")}" ${('', 'checked="checked"')[curTorrentProvider.search_fallback]}/> + id="${curTorrentProvider.get_id("_search_fallback")}" ${('', 'checked="checked"')[curTorrentProvider.search_fallback_enabled]}/> <label for="${curTorrentProvider.get_id("_search_fallback")}">${_('when searching for a complete season depending on search mode you may return no results, this helps by restarting the search using the opposite search mode.')}</label> </div> </div> diff --git a/sickbeard/__init__.py b/sickbeard/__init__.py index f05317a4d1385ff12fb3a50ce1df4343aee5e55e..70b806cde44fb4c1df4d6441d53df639e76bc062 100644 --- a/sickbeard/__init__.py +++ b/sickbeard/__init__.py @@ -1450,10 +1450,10 @@ def initialize(consoleLogging=True): # pylint: disable=too-many-locals, too-man if hasattr(curProvider, 'search_fallback'): curProvider.search_fallback = check_setting_bool(CFG, curProvider.get_id().upper(), curProvider.get_id('_search_fallback')) if hasattr(curProvider, 'enable_daily'): - curProvider.enable_daily = curProvider.can_daily and check_setting_bool(CFG, curProvider.get_id().upper(), curProvider.get_id( + curProvider.enable_daily = curProvider.can_daily and check_setting_bool(CFG, curProvider.get_id().upper(), curProvider.get_id( '_enable_daily'), True) if hasattr(curProvider, 'enable_backlog'): - curProvider.enable_backlog = curProvider.can_backlog and check_setting_bool( + curProvider.enable_backlog = curProvider.can_backlog and check_setting_bool( CFG, curProvider.get_id().upper(), curProvider.get_id('_enable_backlog'), curProvider.can_backlog ) if hasattr(curProvider, 'cat'): diff --git a/sickrage/providers/GenericProvider.py b/sickrage/providers/GenericProvider.py index 434f412a2fca80db9457441487cba5c32a437a35..cc12d4c7edffbe3f5722077ee9e3b3407ec9e724 100644 --- a/sickrage/providers/GenericProvider.py +++ b/sickrage/providers/GenericProvider.py @@ -382,6 +382,18 @@ class GenericProvider(object): # pylint: disable=too-many-instance-attributes def is_enabled(self): return bool(self.enabled) + @property + def daily_enabled(self): + return int(self.enable_daily) + + @property + def backlog_enabled(self): + return int(self.enable_backlog) + + @property + def search_fallback_enabled(self): + return int(self.search_fallback) + @property def can_daily(self): return self.ability_status & self.PROVIDER_DAILY != 0