X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=jamaui%2Ffeatured.py;h=b85ec5a02b0fcbba2fb77f679d64acc9541e73d0;hb=9d5deb2c08f1ad25f14d4355bc99b64c19c80104;hp=99a497704fa3fd3edf06afc7e4c19889c052d488;hpb=75215e5b54a5357384db5166fbecaa65164d8b94;p=jamaendo
diff --git a/jamaui/featured.py b/jamaui/featured.py
index 99a4977..b85ec5a 100644
--- a/jamaui/featured.py
+++ b/jamaui/featured.py
@@ -1,9 +1,41 @@
+#!/usr/bin/env python
+#
+# This file is part of Jamaendo.
+# Copyright (c) 2010 Kristoffer Gronlund
+#
+# Jamaendo is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Jamaendo is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Jamaendo. If not, see .
+#
+# Player code heavily based on http://thpinfo.com/2008/panucci/:
+# A resuming media player for Podcasts and Audiobooks
+# Copyright (c) 2008-05-26 Thomas Perl
+# (based on http://pygstdocs.berlios.de/pygst-tutorial/seeking.html)
+#
import gtk
-import hildon
+try:
+ import hildon
+except:
+ import helldon as hildon
import jamaendo
from playerwindow import open_playerwindow
from showartist import ShowArtist
from showalbum import ShowAlbum
+from albumlist import MusicList
+from player import Playlist
+from fetcher import Fetcher
+import logging
+
+log = logging.getLogger(__name__)
def _alist(l, match):
for key, value in l:
@@ -12,67 +44,82 @@ def _alist(l, match):
return None
class FeaturedWindow(hildon.StackableWindow):
- features = (("Albums of the week",jamaendo.albums_of_the_week),
- ("Tracks of the week",jamaendo.tracks_of_the_week),
- ("New releases",jamaendo.new_releases)
- )
+ features = (
+ ("New releases",jamaendo.new_releases),
+ ("Top albums today", lambda: jamaendo.top_albums(order='ratingday_desc')),
+ ("Top tracks today", lambda: jamaendo.top_tracks(order='ratingday_desc')),
+ ("Albums of the week",jamaendo.albums_of_the_week),
+ ("Tracks of the week",jamaendo.tracks_of_the_week),
+ ("Top 50 tags", lambda: jamaendo.top_tags(count=50)),
+ ("Top 50 artists", lambda: jamaendo.top_artists(count=50)),
+ ("Top 50 albums", lambda: jamaendo.top_albums(count=50)),
+ ("Top 50 tracks", lambda: jamaendo.top_tracks(count=50)),
+ )
def __init__(self, feature):
hildon.StackableWindow.__init__(self)
- self.set_title("Featured")
+ self.set_title(feature)
+ self.fetcher = None
+ self.connect('destroy', self.on_destroy)
self.featurefn = _alist(self.features, feature)
# Results list
self.panarea = hildon.PannableArea()
- self.result_store = gtk.ListStore(str, int)
- #self.result_store.append(['red'])
- self.result_view = gtk.TreeView(self.result_store)
- col = gtk.TreeViewColumn('Name')
- self.result_view.append_column(col)
- cell = gtk.CellRendererText()
- col.pack_start(cell, True)
- col.add_attribute(cell, 'text', 0)
- self.result_view.set_search_column(0)
- col.set_sort_column_id(0)
- self.result_view.connect('row-activated', self.row_activated)
-
- self.panarea.add(self.result_view)
+ self.musiclist = MusicList()
+ self.musiclist.connect('row-activated', self.row_activated)
+ self.panarea.add(self.musiclist)
self.idmap = {}
- for item in self.featurefn():
- self.idmap[item.ID] = item
- self.result_store.append([self.get_item_text(item), item.ID])
+ self.items = []
self.add(self.panarea)
- def get_item_text(self, item):
- if isinstance(item, jamaendo.Album):
- return "%s - %s" % (item.artist_name, item.name)
- elif isinstance(item, jamaendo.Track):
- return "%s - %s" % (item.artist_name, item.name)
- else:
- return item.name
+ self.create_menu()
+
+ self.start_feature_fetcher()
- def make_button(self, text, subtext, callback):
- button = hildon.Button(gtk.HILDON_SIZE_FINGER_HEIGHT,
- hildon.BUTTON_ARRANGEMENT_VERTICAL)
- button.set_text(text, subtext)
+ def start_feature_fetcher(self):
+ if self.fetcher:
+ self.fetcher.stop()
+ self.fetcher = None
+ self.fetcher = Fetcher(self.featurefn, self,
+ on_item = self.on_feature_result,
+ on_ok = self.on_feature_complete,
+ on_fail = self.on_feature_complete)
+ self.fetcher.start()
- if callback:
- button.connect('clicked', callback)
+ def on_feature_result(self, wnd, item):
+ if wnd is self:
+ self.musiclist.add_items([item])
+ self.idmap[item.ID] = item
+ self.items.append(item)
- #image = gtk.image_new_from_stock(gtk.STOCK_INFO, gtk.ICON_SIZE_BUTTON)
- #button.set_image(image)
- #button.set_image_position(gtk.POS_RIGHT)
+ def on_feature_complete(self, wnd, error=None):
+ if wnd is self:
+ self.fetcher.stop()
+ self.fetcher = None
- return button
+ def create_menu(self):
+ def on_player(*args):
+ from playerwindow import open_playerwindow
+ open_playerwindow()
+ self.menu = hildon.AppMenu()
+ player = hildon.GtkButton(gtk.HILDON_SIZE_AUTO)
+ player.set_label("Open player")
+ player.connect("clicked", on_player)
+ self.menu.append(player)
+ self.menu.show_all()
+ self.set_app_menu(self.menu)
+
+ def on_destroy(self, wnd):
+ if self.fetcher:
+ self.fetcher.stop()
+ self.fetcher = None
def row_activated(self, treeview, path, view_column):
- treeiter = self.result_store.get_iter(path)
- title, _id = self.result_store.get(treeiter, 0, 1)
+ _id = self.musiclist.get_item_id(path)
item = self.idmap[_id]
- print _id, item
self.open_item(item)
def open_item(self, item):
@@ -83,5 +130,34 @@ class FeaturedWindow(hildon.StackableWindow):
wnd = ShowArtist(item)
wnd.show_all()
elif isinstance(item, jamaendo.Track):
+ playlist = Playlist(self.items)
+ playlist.jump_to(item.ID)
wnd = open_playerwindow()
- wnd.play_tracks([item])
+ wnd.play_tracks(playlist)
+ elif isinstance(item, jamaendo.Tag):
+ self.start_tag_fetcher(item.ID)
+
+ def start_tag_fetcher(self, item_id):
+ if self.fetcher:
+ self.fetcher.stop()
+ self.fetcher = None
+ self.fetcher = Fetcher(lambda: jamaendo.get_tag_tracks(item_id),
+ self,
+ on_item = self.on_tag_result,
+ on_ok = self.on_tag_complete,
+ on_fail = self.on_tag_complete)
+ self.fetcher.taglist = []
+ self.fetcher.start()
+
+ def on_tag_result(self, wnd, item):
+ if wnd is self and hasattr(self.fetcher, 'taglist'):
+ self.fetcher.taglist.append(item)
+
+ def on_tag_complete(self, wnd, error=None):
+ if wnd is self:
+ self.fetcher.stop()
+ if error is not None and hasattr(self.fetcher, 'taglist'):
+ wnd = open_playerwindow()
+ wnd.play_tracks(self.fetcher.taglist)
+ self.fetcher = None
+