From bf2beb2530ab917c4babccd80aad925542c462da Mon Sep 17 00:00:00 2001 From: Ruud Date: Sat, 11 Jan 2014 20:46:01 +0100 Subject: [PATCH] Don't fire async event inside an already async event --- couchpotato/core/media/__init__.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/couchpotato/core/media/__init__.py b/couchpotato/core/media/__init__.py index 1ba83863..88094890 100644 --- a/couchpotato/core/media/__init__.py +++ b/couchpotato/core/media/__init__.py @@ -28,9 +28,12 @@ class MediaBase(Plugin): def onComplete(): db = get_session() media = db.query(Media).filter_by(id = id).first() - fireEventAsync('%s.searcher.single' % media.type, media.to_dict(self.default_dict), on_complete = self.createNotifyFront(id)) + media_dict = media.to_dict(self.default_dict) + event_name = '%s.searcher.single' % media.type db.expire_all() + fireEvent(event_name, media_dict, on_complete = self.createNotifyFront(id)) + return onComplete def createNotifyFront(self, media_id): @@ -38,7 +41,10 @@ class MediaBase(Plugin): def notifyFront(): db = get_session() media = db.query(Media).filter_by(id = media_id).first() - fireEvent('notify.frontend', type = '%s.update' % media.type, data = media.to_dict(self.default_dict)) + media_dict = media.to_dict(self.default_dict) + event_name = '%s.update' % media.type db.expire_all() + fireEvent('notify.frontend', type = event_name, data = media_dict) + return notifyFront