From 8dead66b58921c0275b7085f2f2111fe07e83fb3 Mon Sep 17 00:00:00 2001 From: Ruud Date: Mon, 2 Jun 2014 12:59:21 +0200 Subject: [PATCH] Migration fixes --- couchpotato/core/database.py | 15 +++++++++------ couchpotato/core/media/movie/_base/main.py | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/couchpotato/core/database.py b/couchpotato/core/database.py index f9607137..40b29285 100644 --- a/couchpotato/core/database.py +++ b/couchpotato/core/database.py @@ -289,13 +289,16 @@ class Database(object): for profile_type in types: p_type = types[profile_type] if types[profile_type]['profile_id'] == p['id']: - new_profile['finish'].append(p_type['finish']) - new_profile['wait_for'].append(p_type['wait_for']) - new_profile['qualities'].append(migrate_data['quality'][p_type['quality_id']]['identifier']) + if p_type['quality_id']: + new_profile['finish'].append(p_type['finish']) + new_profile['wait_for'].append(p_type['wait_for']) + new_profile['qualities'].append(migrate_data['quality'][p_type['quality_id']]['identifier']) - new_profile.update(db.insert(new_profile)) - - profile_link[x] = new_profile.get('_id') + if len(new_profile['qualities']) > 0: + new_profile.update(db.insert(new_profile)) + profile_link[x] = new_profile.get('_id') + else: + log.error('Corrupt profile list for "%s", using default.', p.get('label')) # Qualities log.info('Importing quality sizes') diff --git a/couchpotato/core/media/movie/_base/main.py b/couchpotato/core/media/movie/_base/main.py index 860ec965..4c5c2f29 100644 --- a/couchpotato/core/media/movie/_base/main.py +++ b/couchpotato/core/media/movie/_base/main.py @@ -105,7 +105,7 @@ class MovieBase(MovieTypeBase): 'imdb': params.get('identifier') }, 'status': status if status else 'active', - 'profile_id': params.get('profile_id', default_profile.get('_id')), + 'profile_id': params.get('profile_id') or default_profile.get('_id'), 'category_id': cat_id if cat_id is not None and len(cat_id) > 0 and cat_id != '-1' else None, }