Don't merge movie search results twice

2011-10-01 20:59:08 +02:00
parent 876562c0fd
commit a82b76cf32
1 changed files with 2 additions and 8 deletions
@@ -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({