Browse Source

Clean-up

pull/3341/head
mano3m 11 years ago
parent
commit
424a3cd892
  1. 2
      couchpotato/core/media/movie/_base/main.py
  2. 13
      couchpotato/core/media/movie/searcher.py
  3. 3
      couchpotato/core/plugins/quality/main.py
  4. 2
      couchpotato/core/plugins/release/main.py
  5. 5
      couchpotato/core/plugins/renamer.py

2
couchpotato/core/media/movie/_base/main.py

@ -236,7 +236,7 @@ class MovieBase(MovieTypeBase):
db.update(m)
fireEvent('media.restatus', m['_id'])
fireEvent('media.restatus', m['_id'], single = True)
m = db.get('id', media_id)

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

@ -1,5 +1,4 @@
from datetime import date, timedelta
from operator import itemgetter
from datetime import date
import random
import re
import time
@ -121,7 +120,7 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
if not movie['profile_id'] or (movie['status'] == 'done' and not manual):
log.debug('Movie doesn\'t have a profile or already done, assuming in manage tab.')
fireEvent('media.restatus', movie['_id'])
fireEvent('media.restatus', movie['_id'], single = True)
return
default_title = getTitle(movie)
@ -145,9 +144,6 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
ignore_eta = manual
total_result_count = 0
db = get_db()
profile = db.get('id', movie['profile_id'])
fireEvent('notify.frontend', type = 'movie.searcher.started', data = {'_id': movie['_id']}, message = 'Searching for "%s"' % default_title)
# Ignore eta once every 7 days
@ -158,6 +154,9 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
ignore_eta = True
Env.prop(prop_name, value = time.time())
db = get_db()
profile = db.get('id', movie['profile_id'])
ret = False
for index, q_identifier in enumerate(profile.get('qualities', [])):
@ -192,7 +191,7 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
# Don't search for quality lower then already available.
if has_better_quality > 0:
log.info('Better quality (%s) already available or snatched for %s', (q_identifier, default_title))
fireEvent('media.restatus', movie['_id'])
fireEvent('media.restatus', movie['_id'], single = True)
break
quality = fireEvent('quality.single', identifier = q_identifier, single = True)

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

@ -381,7 +381,8 @@ class QualityPlugin(Plugin):
def isFinish(self, quality, profile, release_age = 0):
if not isinstance(profile, dict) or not profile.get('qualities'):
profile = fireEvent('profile.default', single = True)
# No profile so anything (scanned) is good enough
return True
try:
index = [i for i, identifier in enumerate(profile['qualities']) if identifier == quality['identifier'] and bool(profile['3d'][i] if profile.get('3d') else False) == bool(quality.get('is_3d', False))][0]

2
couchpotato/core/plugins/release/main.py

@ -164,7 +164,7 @@ class Release(Plugin):
release['files'] = dict((k, [toUnicode(x) for x in v]) for k, v in group['files'].items() if v)
db.update(release)
fireEvent('media.restatus', media['_id'])
fireEvent('media.restatus', media['_id'], single = True)
return True
except:

5
couchpotato/core/plugins/renamer.py

@ -453,8 +453,9 @@ class Renamer(Plugin):
profile = db.get('id', media['profile_id'])
except:
# Set profile to None as it does not exist anymore
media['profile_id'] = None
db.update(media)
mdia = db.get('id', media['_id'])
mdia['profile_id'] = None
db.update(mdia)
log.error('Error getting quality profile for %s: %s', (media_title, traceback.format_exc()))
else:
log.debug('Media has no quality profile: %s', media_title)

Loading…
Cancel
Save