Initial support for multiple query services

[maevies] / ui / maeviesui / util / moviemanager.py

diff --git a/ui/maeviesui/util/moviemanager.py b/ui/maeviesui/util/moviemanager.py
index 8cfc617..23fbcd6 100644 (file)
--- a/ui/maeviesui/util/moviemanager.py
+++ b/ui/maeviesui/util/moviemanager.py
@@ -29,7 +29,7 @@ glib.init_threads()
 
 MINFO_PROVIDER_INTERFACE = 'com.simonpena.maevies.minfoprovider'
 MINFO_PROVIDER_BUS_NAME = 'com.simonpena.maevies.minfoprovider'
-TMDB_MOVIE_INTERFACE = 'com.simonpena.maevies.movie'
+TMDB_MOVIE_INTERFACE = 'com.simonpena.maevies.tmdbmovie'
 TMDB_MOVIE_BUS_NAME = 'com.simonpena.maevies.tmdbmovie'
 TMDB = 0
 WATC = 1
@@ -63,10 +63,14 @@ class MovieManager:
         except DBusException:
             self._on_response_received([])
 
-    def _on_response_received(self, object_paths):
+    def _on_response_received(self, interface, object_paths):
         movies = []
-        for path in object_paths:
-            movies.append(MovieProxy(self._bus, path))
+
+        if interface == TMDB_MOVIE_INTERFACE:
+            for path in object_paths:
+                movies.append(MovieProxy(self._bus, path))
+        else:
+            pass
 
         if self.response_received_cb:
             self.response_received_cb(movies)
@@ -87,6 +91,12 @@ class MovieImage:
     def get_type(self):
         return self._type
 
+    def __str__(self):
+        str = ''
+        for field in [self._id, self._url, self._type, self._size]:
+            str += '\t%s\n' % field
+        return str
+
 class MovieProxy:
 
     def __init__(self, bus, object_path):
@@ -103,10 +113,13 @@ class MovieProxy:
         return interface
 
     def _retrieve_images(self):
-        images = []
+        images = { }
         dbus_images = self.interface.GetImages()
-        for image in dbus_images:
-            images.append(MovieImage(image))
+        for dbus_image in dbus_images:
+            image = MovieImage(dbus_image)
+            if not images.has_key(image.get_type()):
+                images[image.get_type()] = {}
+            images[image.get_type()][image.get_size()] = image
         return images
 
     def get_value(self, field):
@@ -130,8 +143,8 @@ class MovieProxy:
     def get_rating(self):
         return self.interface.GetRating()
 
-    def get_images(self):
-        return self._images
+    def get_image(self, type, size):
+        return self._images[type][size]
 
     def get_released(self):
         return self.interface.GetReleased()
@@ -148,7 +161,7 @@ class MovieProxy:
     def get_overview(self):
         return self.interface.GetOverview()
 
-    def get_image(self):
+    def get_placeholder_image(self):
         return self._get_placeholder_pixbuf()
 
     def _get_placeholder_pixbuf(self):