Browse Source

Add releases to media.get.

re-use where possible
pull/3000/head
Ruud 11 years ago
parent
commit
1224b98745
  1. 4
      couchpotato/core/media/_base/media/main.py
  2. 5
      couchpotato/core/media/movie/searcher.py
  3. 3
      couchpotato/core/plugins/manage.py

4
couchpotato/core/media/_base/media/main.py

@ -133,6 +133,8 @@ class MediaPlugin(MediaBase):
if media.get('category_id'):
media['category'] = db.get('id', media.get('category_id'))
media['releases'] = list(db.run('release', 'for_media', media['_id']))
return media
def getView(self, id = None, **kwargs):
@ -222,8 +224,6 @@ class MediaPlugin(MediaBase):
media = fireEvent('media.get', media_id, single = True)
media['releases'] = list(db.run('release', 'for_media', media_id))
# Merge releases with movie dict
medias.append(media)

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

@ -142,7 +142,6 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
profile = db.get('id', movie['profile_id'])
quality_order = fireEvent('quality.order', single = True)
media_releases = db.run('release', 'for_media', movie['_id'])
ret = False
@ -161,7 +160,7 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
has_better_quality = 0
# See if better quality is available
for release in media_releases:
for release in movie.get('releases', []):
if quality_order.index(release['quality']) <= quality_order.index(q_identifier) and release['status'] not in ['available', 'ignored', 'failed']:
has_better_quality += 1
@ -187,7 +186,7 @@ class MovieSearcher(SearcherBase, MovieTypeBase):
ret = True
# Remove releases that aren't found anymore
for release in db.run('release', 'for_media', movie['_id']):
for release in movie.get('releases', []):
if release.get('status') == 'available' and release.get('identifier') not in found_releases:
fireEvent('release.delete', release.get('_id'), single = True)

3
couchpotato/core/plugins/manage.py

@ -127,8 +127,7 @@ class Manage(Plugin):
fireEvent('media.delete', media_id = done_movie['_id'], delete_from = 'all')
else:
db = get_db()
releases = list(db.run('release', 'for_media', done_movie.get('_id')))
releases = done_movie.get('releases', [])
for release in releases:
if release.get('files'):

Loading…
Cancel
Save