From a82b76cf321ddd8f84584ad2b633fa874e2f161c Mon Sep 17 00:00:00 2001 From: Ruud Date: Sat, 1 Oct 2011 20:59:08 +0200 Subject: [PATCH] Don't merge movie search results twice --- couchpotato/core/plugins/movie/main.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/couchpotato/core/plugins/movie/main.py b/couchpotato/core/plugins/movie/main.py index b6f638b8..5f68955e 100644 --- a/couchpotato/core/plugins/movie/main.py +++ b/couchpotato/core/plugins/movie/main.py @@ -76,16 +76,10 @@ class MoviePlugin(Plugin): params = getParams() cache_key = '%s/%s' % (__name__, urlencode(params)) - movies = Env.get('cache').get(cache_key) + movies = None#Env.get('cache').get(cache_key) if not movies: - results = fireEvent('movie.search', q = params.get('q'), merge = True) - - # Combine movie results - movies = [] - for r in results: - movies += r - + movies = fireEvent('movie.search', q = params.get('q'), merge = True) Env.get('cache').set(cache_key, movies) return jsonified({