Some minor fixes and tweaks

[jamaendo] / jamaui / showartist.py

diff --git a/jamaui/showartist.py b/jamaui/showartist.py
index 6751b97..9b0e9ba 100644 (file)
--- a/jamaui/showartist.py
+++ b/jamaui/showartist.py
@@ -21,6 +21,7 @@
 #  Copyright (c) 2008-05-26 Thomas Perl <thpinfo.com>
 #  (based on http://pygstdocs.berlios.de/pygst-tutorial/seeking.html)
 #
+import os
 import gtk
 try:
     import hildon
@@ -29,26 +30,91 @@ except:
 import jamaendo
 from playerwindow import open_playerwindow
 from albumlist import AlbumList
+from postoffice import postoffice
+import util
+import gobject
+
+import logging
+
+log = logging.getLogger(__name__)
 
 class ShowArtist(hildon.StackableWindow):
+    ICON_SIZE = 200
+
     def __init__(self, artist):
         hildon.StackableWindow.__init__(self)
+        self.connect('destroy', self.on_destroy)
         self.set_title(artist.name)
         self.artist = artist
 
+        top_hbox = gtk.HBox()
+        self.image = gtk.Image()
+        self.default_pixbuf = util.find_resource('album.png')
+        self.image.set_from_pixbuf(self.get_default_pixbuf())
+
         self.panarea = hildon.PannableArea()
         vbox = gtk.VBox(False, 0)
 
         self.albums = AlbumList()
+        self.albums.loading_message = "No albums"
+        self.albums.empty_message = "No albums"
         self.albums.show_artist(False)
         self.albums.connect('row-activated', self.row_activated)
 
         self.panarea.add(self.albums)
         vbox.pack_start(self.panarea, True, True, 0)
-        self.add(vbox)
+        #self.add(vbox)
+
+        #imgalign = gtk.Alignment(xalign=0.2, yalign=0.4, xscale=1.0)
+        #alignment.add(bbox)
+
+        self.image.set_alignment(0.5, 0.0)
+
+        top_hbox.pack_start(self.image, False)
+        top_hbox.pack_start(vbox)
+
+        self.add(top_hbox)
+
+        try:
+            for album in jamaendo.get_albums(artist.ID):
+                self.albums.add_album(album)
+        except jamaendo.JamendoAPIException:
+            log.exception("Failed in get_albums(%s)"%(artist.ID))
+
+        postoffice.connect('images', self, self.on_images)
+
+        if self.artist.image:
+            postoffice.notify('request-images', [self.artist.image])
+
+    def get_pixbuf(self, img):
+        try:
+            return gtk.gdk.pixbuf_new_from_file_at_size(img,
+                                                        self.ICON_SIZE,
+                                                        self.ICON_SIZE)
+        except gobject.GError:
+            log.error("Broken image in cache: %s", img)
+            try:
+                os.unlink(img)
+            except OSError, e:
+                log.warning("Failed to unlink broken image.")
+            if img != self.default_pixbuf:
+                return self.get_default_pixbuf()
+            else:
+                return None
+
+    def get_default_pixbuf(self):
+        if self.default_pixbuf:
+            return self.get_pixbuf(self.default_pixbuf)
+
+    def on_images(self, images):
+        for url, image in images:
+            if url == self.artist.image:
+                pb = self.get_pixbuf(image)
+                if pb:
+                    self.image.set_from_pixbuf(pb)
 
-        for album in jamaendo.get_albums(artist.ID):
-            self.albums.add_album(album)
+    def on_destroy(self, wnd):
+        postoffice.disconnect('images', self)
 
     def row_activated(self, treeview, path, view_column):
         _id = self.albums.get_album_id(path)