Browse Source

Make sure to safe size as int

pull/3000/head
Ruud 11 years ago
parent
commit
f734e27d23
  1. 6
      couchpotato/core/media/movie/searcher.py
  2. 8
      couchpotato/core/plugins/quality/main.py

6
couchpotato/core/media/movie/searcher.py

@ -8,7 +8,7 @@ from couchpotato import get_db
from couchpotato.api import addApiView from couchpotato.api import addApiView
from couchpotato.core.event import addEvent, fireEvent, fireEventAsync from couchpotato.core.event import addEvent, fireEvent, fireEventAsync
from couchpotato.core.helpers.encoding import simplifyString from couchpotato.core.helpers.encoding import simplifyString
from couchpotato.core.helpers.variable import getTitle, possibleTitles, getImdb, getIdentifier from couchpotato.core.helpers.variable import getTitle, possibleTitles, getImdb, getIdentifier, tryInt
from couchpotato.core.logger import CPLog from couchpotato.core.logger import CPLog
from couchpotato.core.media._base.searcher.base import SearcherBase from couchpotato.core.media._base.searcher.base import SearcherBase
from couchpotato.core.media.movie import MovieTypeBase from couchpotato.core.media.movie import MovieTypeBase
@ -232,12 +232,12 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
# File to small # File to small
if nzb['size'] and int(preferred_quality['size_min']) > int(nzb['size']): if nzb['size'] and tryInt(preferred_quality['size_min']) > tryInt(nzb['size']):
log.info2('Wrong: "%s" is too small to be %s. %sMB instead of the minimal of %sMB.', (nzb['name'], preferred_quality['label'], nzb['size'], preferred_quality['size_min'])) log.info2('Wrong: "%s" is too small to be %s. %sMB instead of the minimal of %sMB.', (nzb['name'], preferred_quality['label'], nzb['size'], preferred_quality['size_min']))
return False return False
# File to large # File to large
if nzb['size'] and int(preferred_quality['size_max']) < int(nzb['size']): if nzb['size'] and tryInt(preferred_quality['size_max']) < tryInt(nzb['size']):
log.info2('Wrong: "%s" is too large to be %s. %sMB instead of the maximum of %sMB.', (nzb['name'], preferred_quality['label'], nzb['size'], preferred_quality['size_max'])) log.info2('Wrong: "%s" is too large to be %s. %sMB instead of the maximum of %sMB.', (nzb['name'], preferred_quality['label'], nzb['size'], preferred_quality['size_max']))
return False return False

8
couchpotato/core/plugins/quality/main.py

@ -5,7 +5,7 @@ from couchpotato import get_db
from couchpotato.api import addApiView from couchpotato.api import addApiView
from couchpotato.core.event import addEvent from couchpotato.core.event import addEvent
from couchpotato.core.helpers.encoding import toUnicode, ss from couchpotato.core.helpers.encoding import toUnicode, ss
from couchpotato.core.helpers.variable import mergeDicts, getExt from couchpotato.core.helpers.variable import mergeDicts, getExt, tryInt
from couchpotato.core.logger import CPLog from couchpotato.core.logger import CPLog
from couchpotato.core.plugins.base import Plugin from couchpotato.core.plugins.base import Plugin
from couchpotato.core.plugins.quality.index import QualityIndex from couchpotato.core.plugins.quality.index import QualityIndex
@ -121,7 +121,7 @@ class QualityPlugin(Plugin):
quality = db.get('quality', kwargs.get('identifier'), with_doc = True) quality = db.get('quality', kwargs.get('identifier'), with_doc = True)
if quality: if quality:
quality['doc'][kwargs.get('value_type')] = kwargs.get('value') quality['doc'][kwargs.get('value_type')] = tryInt(kwargs.get('value'))
db.update(quality['doc']) db.update(quality['doc'])
self.cached_qualities = None self.cached_qualities = None
@ -148,8 +148,8 @@ class QualityPlugin(Plugin):
'_t': 'quality', '_t': 'quality',
'order': order, 'order': order,
'identifier': q.get('identifier'), 'identifier': q.get('identifier'),
'size_min': q.get('size')[0], 'size_min': tryInt(q.get('size')[0]),
'size_max': q.get('size')[1] 'size_max': tryInt(q.get('size')[1]),
}) })
log.info('Creating profile: %s', q.get('label')) log.info('Creating profile: %s', q.get('label'))

Loading…
Cancel
Save