Merge branch 'master' into develop

This commit is contained in:
JackDandy 2017-09-29 00:40:26 +01:00
commit b6806359cf
3 changed files with 23 additions and 3 deletions

View file

@ -128,6 +128,12 @@
* Fix article link color on some page were changed blue
### 0.12.30 (2017-09-29 00:20:00 UTC)
* Fix Media Providers/Custom Newznab tab action 'Delete' then 'Save Changes'
* Fix enforce value API expects for paused show flag
### 0.12.29 (2017-09-17 09:00:00 UTC)
* Fix provider nCore

View file

@ -150,7 +150,6 @@ class TVShow(object):
status = property(lambda self: self._status, dirty_setter('_status'))
airs = property(lambda self: self._airs, dirty_setter('_airs'))
startyear = property(lambda self: self._startyear, dirty_setter('_startyear'))
paused = property(lambda self: self._paused, dirty_setter('_paused'))
air_by_date = property(lambda self: self._air_by_date, dirty_setter('_air_by_date'))
subtitles = property(lambda self: self._subtitles, dirty_setter('_subtitles'))
dvdorder = property(lambda self: self._dvdorder, dirty_setter('_dvdorder'))
@ -223,6 +222,20 @@ class TVShow(object):
myDB.action('DELETE FROM tv_shows_not_found WHERE indexer = ? AND indexer_id = ?',
[self.indexer, self.indexerid])
@property
def paused(self):
return self._paused
@paused.setter
def paused(self, value):
if value != self._paused:
if isinstance(value, bool) or (isinstance(value, (int, long)) and value in [0, 1]):
self._paused = int(value)
self.dirty = True
else:
logger.log('tried to set paused property to invalid value: %s of type: %s' % (value, type(value)),
logger.ERROR)
@property
def ids(self):
if not self._mapped_ids:

View file

@ -1,4 +1,4 @@
# coding=utf-8
# coding=utf-8
# Author: Nic Wolfe <nic@wolfeden.ca>
# URL: http://code.google.com/p/sickbeard/
#
@ -5583,7 +5583,8 @@ class ConfigProviders(Config):
provider_list.append(src_name)
src_enabled = bool(config.to_int(src_enabled))
if '' != getattr(sources[src_name], 'enabled', '') and sources[src_name].is_enabled() != src_enabled:
if src_name in sources and '' != getattr(sources[src_name], 'enabled', '') \
and sources[src_name].is_enabled() != src_enabled:
if isinstance(sources[src_name], sickbeard.providers.newznab.NewznabProvider) and \
not sources[src_name].enabled and src_enabled:
reload_page = True