From 636e9073ec6dd655f9f48be4254714e77425971d Mon Sep 17 00:00:00 2001 From: Abhinav Sarkar Date: Tue, 10 Mar 2009 06:09:11 +0000 Subject: [PATCH] * refactored the decorators to decorators module from base module * fixed a bug in authenticate decorator which gave the authenticated results for non-authenticated users * added documentation for decorators module * added authenticate decorator to the methods in taggable and sharable mixin modules * added set_secret and set_session_key methods in Api class --- docs/api-objects.txt | 93 +- docs/class-tree.html | 2 +- docs/help.html | 2 +- docs/identifier-index.html | 357 +-- docs/lastfm-module.html | 35 +- docs/lastfm-pysrc.html | 2 +- docs/lastfm.album-module.html | 18 +- docs/lastfm.album-pysrc.html | 877 +++--- docs/lastfm.album.Album-class.html | 78 +- docs/lastfm.api-module.html | 31 +- docs/lastfm.api-pysrc.html | 1833 ++++++------ docs/lastfm.api.Api-class.html | 66 +- docs/lastfm.artist-module.html | 24 +- docs/lastfm.artist-pysrc.html | 1189 ++++---- docs/lastfm.artist.Artist-class.html | 87 +- docs/lastfm.base-module.html | 7 +- docs/lastfm.base-pysrc.html | 125 +- docs/lastfm.base.LastfmBase-class.html | 68 +- docs/lastfm.decorators-module.html | 333 +++ docs/lastfm.decorators-pysrc.html | 261 ++ docs/lastfm.error-module.html | 2 +- docs/lastfm.error-pysrc.html | 2 +- ...error.AuthenticationFailedError-class.html | 2 +- ...lastfm.error.InvalidApiKeyError-class.html | 2 +- ...lastfm.error.InvalidFormatError-class.html | 2 +- ...lastfm.error.InvalidMethodError-class.html | 2 +- ...ror.InvalidMethodSignatureError-class.html | 2 +- ...fm.error.InvalidParametersError-class.html | 2 +- ...stfm.error.InvalidResourceError-class.html | 2 +- ...astfm.error.InvalidServiceError-class.html | 2 +- ...fm.error.InvalidSessionKeyError-class.html | 2 +- docs/lastfm.error.LastfmError-class.html | 2 +- ...stfm.error.OperationFailedError-class.html | 2 +- ...astfm.error.ServiceOfflineError-class.html | 2 +- ...stfm.error.SubscribersOnlyError-class.html | 2 +- .../lastfm.error.TokenExpiredError-class.html | 2 +- ...m.error.TokenNotAuthorizedError-class.html | 2 +- docs/lastfm.event-module.html | 17 +- docs/lastfm.event-pysrc.html | 468 +-- docs/lastfm.event.Event-class.html | 67 +- docs/lastfm.filecache-module.html | 8 +- docs/lastfm.filecache-pysrc.html | 2 +- docs/lastfm.filecache.FileCache-class.html | 2 +- ...astfm.filecache._FileCacheError-class.html | 2 +- docs/lastfm.geo-module.html | 15 +- docs/lastfm.geo-pysrc.html | 1187 ++++---- docs/lastfm.geo.Country-class.html | 56 +- docs/lastfm.geo.Geo-class.html | 2 +- docs/lastfm.geo.Location-class.html | 56 +- docs/lastfm.group-module.html | 16 +- docs/lastfm.group-pysrc.html | 382 +-- docs/lastfm.group.Group-class.html | 56 +- docs/lastfm.lazylist-module.html | 5 +- docs/lastfm.lazylist-pysrc.html | 2 +- docs/lastfm.lazylist.LazyList-class.html | 2 +- ...stfm.lazylist.RecursiveLazyList-class.html | 2 +- ...zylist.RecursiveLazyListFactory-class.html | 2 +- docs/lastfm.mixins-module.html | 9 +- docs/lastfm.mixins-pysrc.html | 2 +- docs/lastfm.mixins.cacheable-module.html | 5 +- docs/lastfm.mixins.cacheable-pysrc.html | 4 +- ...stfm.mixins.cacheable.Cacheable-class.html | 2 +- docs/lastfm.mixins.searchable-module.html | 5 +- docs/lastfm.mixins.searchable-pysrc.html | 2 +- ...fm.mixins.searchable.Searchable-class.html | 2 +- docs/lastfm.mixins.sharable-module.html | 7 +- docs/lastfm.mixins.sharable-pysrc.html | 55 +- ...lastfm.mixins.sharable.Sharable-class.html | 54 +- docs/lastfm.mixins.shoutable-module.html | 9 +- docs/lastfm.mixins.shoutable-pysrc.html | 79 +- ...stfm.mixins.shoutable.Shoutable-class.html | 2 +- docs/lastfm.mixins.taggable-module.html | 8 +- docs/lastfm.mixins.taggable-pysrc.html | 174 +- ...lastfm.mixins.taggable.Taggable-class.html | 85 +- docs/lastfm.objectcache-module.html | 20 +- docs/lastfm.objectcache-pysrc.html | 2 +- .../lastfm.objectcache.ObjectCache-class.html | 2 +- docs/lastfm.playlist-module.html | 12 +- docs/lastfm.playlist-pysrc.html | 149 +- docs/lastfm.playlist.Playlist-class.html | 56 +- docs/lastfm.safelist-module.html | 5 +- docs/lastfm.safelist-pysrc.html | 2 +- docs/lastfm.safelist.SafeList-class.html | 2 +- docs/lastfm.shout-module.html | 8 +- docs/lastfm.shout-pysrc.html | 124 +- docs/lastfm.shout.Shout-class.html | 56 +- docs/lastfm.stats-module.html | 2 +- docs/lastfm.stats-pysrc.html | 2 +- docs/lastfm.stats.Stats-class.html | 2 +- docs/lastfm.tag-module.html | 20 +- docs/lastfm.tag-pysrc.html | 712 ++--- docs/lastfm.tag.Tag-class.html | 56 +- docs/lastfm.tasteometer-module.html | 5 +- docs/lastfm.tasteometer-pysrc.html | 2 +- .../lastfm.tasteometer.Tasteometer-class.html | 2 +- docs/lastfm.track-module.html | 22 +- docs/lastfm.track-pysrc.html | 1095 +++---- docs/lastfm.track.Track-class.html | 81 +- docs/lastfm.user-module.html | 31 +- docs/lastfm.user-pysrc.html | 2556 +++++++++-------- docs/lastfm.user.User-class.html | 85 +- docs/lastfm.user.User.Library-class.html | 20 +- docs/lastfm.user.User.Playlist-class.html | 59 +- docs/lastfm.venue-module.html | 14 +- docs/lastfm.venue-pysrc.html | 340 +-- docs/lastfm.venue.Venue-class.html | 56 +- docs/lastfm.weeklychart-module.html | 14 +- docs/lastfm.weeklychart-pysrc.html | 2 +- ...fm.weeklychart.WeeklyAlbumChart-class.html | 53 +- ...m.weeklychart.WeeklyArtistChart-class.html | 53 +- .../lastfm.weeklychart.WeeklyChart-class.html | 53 +- ...stfm.weeklychart.WeeklyTagChart-class.html | 53 +- ...fm.weeklychart.WeeklyTrackChart-class.html | 53 +- docs/lastfm.wiki-module.html | 2 +- docs/lastfm.wiki-pysrc.html | 2 +- docs/lastfm.wiki.Wiki-class.html | 2 +- docs/module-tree.html | 6 +- docs/redirect.html | 2 +- docs/toc-everything.html | 12 + docs/toc-lastfm.decorators-module.html | 43 + docs/toc.html | 3 + lastfm/album.py | 13 +- lastfm/api.py | 37 +- lastfm/artist.py | 25 +- lastfm/base.py | 51 +- lastfm/decorators.py | 101 + lastfm/event.py | 4 +- lastfm/geo.py | 23 +- lastfm/group.py | 20 +- lastfm/mixins/cacheable.py | 2 +- lastfm/mixins/sharable.py | 5 +- lastfm/mixins/shoutable.py | 5 +- lastfm/mixins/taggable.py | 6 +- lastfm/playlist.py | 5 +- lastfm/shout.py | 10 +- lastfm/tag.py | 28 +- lastfm/track.py | 17 +- lastfm/user.py | 92 +- lastfm/venue.py | 8 +- 139 files changed, 7518 insertions(+), 7262 deletions(-) create mode 100644 docs/lastfm.decorators-module.html create mode 100644 docs/lastfm.decorators-pysrc.html create mode 100644 docs/toc-lastfm.decorators-module.html create mode 100644 lastfm/decorators.py diff --git a/docs/api-objects.txt b/docs/api-objects.txt index 5c252d3..10f96f9 100644 --- a/docs/api-objects.txt +++ b/docs/api-objects.txt @@ -1,15 +1,25 @@ lastfm lastfm-module.html lastfm.__package__ lastfm-module.html#__package__ lastfm.album lastfm.album-module.html +lastfm.album.cached_property lastfm.decorators-module.html#cached_property +lastfm.album.top_property lastfm.decorators-module.html#top_property lastfm.album.__package__ lastfm.album-module.html#__package__ lastfm.api lastfm.api-module.html lastfm.api.__package__ lastfm.api-module.html#__package__ +lastfm.api.cached_property lastfm.decorators-module.html#cached_property lastfm.api.md5hash lastfm.api-module.html#md5hash lastfm.artist lastfm.artist-module.html lastfm.artist.lazylist lastfm.lazylist-module.html#lazylist +lastfm.artist.top_property lastfm.decorators-module.html#top_property lastfm.artist.__package__ lastfm.artist-module.html#__package__ +lastfm.artist.cached_property lastfm.decorators-module.html#cached_property lastfm.base lastfm.base-module.html lastfm.base.__package__ lastfm.base-module.html#__package__ +lastfm.decorators lastfm.decorators-module.html +lastfm.decorators.authenticate lastfm.decorators-module.html#authenticate +lastfm.decorators.__package__ lastfm.decorators-module.html#__package__ +lastfm.decorators.top_property lastfm.decorators-module.html#top_property +lastfm.decorators.cached_property lastfm.decorators-module.html#cached_property lastfm.error lastfm.error-module.html lastfm.error.error_map lastfm.error-module.html#error_map lastfm.error.__package__ lastfm.error-module.html#__package__ @@ -20,9 +30,13 @@ lastfm.filecache.md5hash lastfm.filecache-module.html#md5hash lastfm.filecache.__package__ lastfm.filecache-module.html#__package__ lastfm.geo lastfm.geo-module.html lastfm.geo.lazylist lastfm.lazylist-module.html#lazylist +lastfm.geo.cached_property lastfm.decorators-module.html#cached_property +lastfm.geo.top_property lastfm.decorators-module.html#top_property lastfm.geo.__package__ lastfm.geo-module.html#__package__ lastfm.group lastfm.group-module.html lastfm.group.lazylist lastfm.lazylist-module.html#lazylist +lastfm.group.cached_property lastfm.decorators-module.html#cached_property +lastfm.group.top_property lastfm.decorators-module.html#top_property lastfm.group.__package__ lastfm.group-module.html#__package__ lastfm.lazylist lastfm.lazylist-module.html lastfm.lazylist.lazylist lastfm.lazylist-module.html#lazylist @@ -35,34 +49,49 @@ lastfm.mixins.searchable lastfm.mixins.searchable-module.html lastfm.mixins.searchable.lazylist lastfm.lazylist-module.html#lazylist lastfm.mixins.searchable.__package__ lastfm.mixins.searchable-module.html#__package__ lastfm.mixins.sharable lastfm.mixins.sharable-module.html +lastfm.mixins.sharable.authenticate lastfm.decorators-module.html#authenticate lastfm.mixins.sharable.__package__ lastfm.mixins.sharable-module.html#__package__ lastfm.mixins.shoutable lastfm.mixins.shoutable-module.html +lastfm.mixins.shoutable.top_property lastfm.decorators-module.html#top_property +lastfm.mixins.shoutable.cached_property lastfm.decorators-module.html#cached_property lastfm.mixins.shoutable.__package__ lastfm.mixins.shoutable-module.html#__package__ lastfm.mixins.taggable lastfm.mixins.taggable-module.html +lastfm.mixins.taggable.cached_property lastfm.decorators-module.html#cached_property +lastfm.mixins.taggable.authenticate lastfm.decorators-module.html#authenticate lastfm.mixins.taggable.__package__ lastfm.mixins.taggable-module.html#__package__ lastfm.objectcache lastfm.objectcache-module.html lastfm.objectcache.__package__ lastfm.objectcache-module.html#__package__ lastfm.playlist lastfm.playlist-module.html +lastfm.playlist.cached_property lastfm.decorators-module.html#cached_property lastfm.playlist.__package__ lastfm.playlist-module.html#__package__ lastfm.safelist lastfm.safelist-module.html lastfm.safelist.__package__ lastfm.safelist-module.html#__package__ lastfm.shout lastfm.shout-module.html +lastfm.shout.cached_property lastfm.decorators-module.html#cached_property lastfm.shout.__package__ lastfm.shout-module.html#__package__ lastfm.stats lastfm.stats-module.html lastfm.stats.__package__ lastfm.stats-module.html#__package__ lastfm.tag lastfm.tag-module.html +lastfm.tag.cached_property lastfm.decorators-module.html#cached_property lastfm.tag.lazylist lastfm.lazylist-module.html#lazylist +lastfm.tag.top_property lastfm.decorators-module.html#top_property lastfm.tag.__package__ lastfm.tag-module.html#__package__ lastfm.tasteometer lastfm.tasteometer-module.html lastfm.tasteometer.__package__ lastfm.tasteometer-module.html#__package__ lastfm.track lastfm.track-module.html lastfm.track.lazylist lastfm.lazylist-module.html#lazylist +lastfm.track.top_property lastfm.decorators-module.html#top_property lastfm.track.__package__ lastfm.track-module.html#__package__ +lastfm.track.cached_property lastfm.decorators-module.html#cached_property lastfm.user lastfm.user-module.html lastfm.user.lazylist lastfm.lazylist-module.html#lazylist +lastfm.user.authenticate lastfm.decorators-module.html#authenticate lastfm.user.__package__ lastfm.user-module.html#__package__ +lastfm.user.cached_property lastfm.decorators-module.html#cached_property +lastfm.user.top_property lastfm.decorators-module.html#top_property lastfm.venue lastfm.venue-module.html lastfm.venue.lazylist lastfm.lazylist-module.html#lazylist +lastfm.venue.cached_property lastfm.decorators-module.html#cached_property lastfm.venue.__package__ lastfm.venue-module.html#__package__ lastfm.weeklychart lastfm.weeklychart-module.html lastfm.weeklychart.__package__ lastfm.weeklychart-module.html#__package__ @@ -77,17 +106,14 @@ lastfm.album.Album.__lt__ lastfm.album.Album-class.html#__lt__ lastfm.album.Album.top_tag lastfm.album.Album-class.html#top_tag lastfm.album.Album.id lastfm.album.Album-class.html#id lastfm.album.Album.playlist lastfm.album.Album-class.html#playlist -lastfm.base.LastfmBase.top_property lastfm.base.LastfmBase-class.html#top_property lastfm.album.Album.stats lastfm.album.Album-class.html#stats lastfm.mixins.cacheable.Cacheable.__new__ lastfm.mixins.cacheable.Cacheable-class.html#__new__ -lastfm.base.LastfmBase.autheticate lastfm.base.LastfmBase-class.html#autheticate lastfm.mixins.cacheable.Cacheable._lock lastfm.mixins.cacheable.Cacheable-class.html#_lock lastfm.album.Album.top_tags lastfm.album.Album-class.html#top_tags lastfm.album.Album.init lastfm.album.Album-class.html#init lastfm.album.Album._fill_info lastfm.album.Album-class.html#_fill_info lastfm.base.LastfmBase.__ne__ lastfm.base.LastfmBase-class.html#__ne__ lastfm.album.Album._default_params lastfm.album.Album-class.html#_default_params -lastfm.base.LastfmBase.cached_property lastfm.base.LastfmBase-class.html#cached_property lastfm.album.Album._fetch_data lastfm.album.Album-class.html#_fetch_data lastfm.album.Album._search_yield_func lastfm.album.Album-class.html#_search_yield_func lastfm.mixins.taggable.Taggable.add_tags lastfm.mixins.taggable.Taggable-class.html#add_tags @@ -144,6 +170,7 @@ lastfm.api.Api.compare_taste lastfm.api.Api-class.html#compare_taste lastfm.api.Api.get_playlist lastfm.api.Api-class.html#get_playlist lastfm.api.Api.get_country lastfm.api.Api-class.html#get_country lastfm.api.Api._initialize_user_agent lastfm.api.Api-class.html#_initialize_user_agent +lastfm.api.Api.set_secret lastfm.api.Api-class.html#set_secret lastfm.api.Api.get_authenticated_user lastfm.api.Api-class.html#get_authenticated_user lastfm.api.Api._fetch_url lastfm.api.Api-class.html#_fetch_url lastfm.api.Api._encode_parameters lastfm.api.Api-class.html#_encode_parameters @@ -169,10 +196,8 @@ lastfm.artist.Artist._hash_func lastfm.artist.Artist-class.html#_hash_func lastfm.artist.Artist.__lt__ lastfm.artist.Artist-class.html#__lt__ lastfm.artist.Artist.top_tag lastfm.artist.Artist-class.html#top_tag lastfm.artist.Artist.streamable lastfm.artist.Artist-class.html#streamable -lastfm.base.LastfmBase.top_property lastfm.base.LastfmBase-class.html#top_property lastfm.artist.Artist.stats lastfm.artist.Artist-class.html#stats lastfm.mixins.cacheable.Cacheable.__new__ lastfm.mixins.cacheable.Cacheable-class.html#__new__ -lastfm.base.LastfmBase.autheticate lastfm.base.LastfmBase-class.html#autheticate lastfm.mixins.cacheable.Cacheable._lock lastfm.mixins.cacheable.Cacheable-class.html#_lock lastfm.artist.Artist.get_similar lastfm.artist.Artist-class.html#get_similar lastfm.artist.Artist.top_tags lastfm.artist.Artist-class.html#top_tags @@ -184,7 +209,6 @@ lastfm.artist.Artist.__repr__ lastfm.artist.Artist-class.html#__repr__ lastfm.artist.Artist.bio lastfm.artist.Artist-class.html#bio lastfm.mixins.taggable.Taggable.remove_tag lastfm.mixins.taggable.Taggable-class.html#remove_tag lastfm.artist.Artist._default_params lastfm.artist.Artist-class.html#_default_params -lastfm.base.LastfmBase.cached_property lastfm.base.LastfmBase-class.html#cached_property lastfm.artist.Artist._fetch_data lastfm.artist.Artist-class.html#_fetch_data lastfm.artist.Artist._search_yield_func lastfm.artist.Artist-class.html#_search_yield_func lastfm.mixins.taggable.Taggable.add_tags lastfm.mixins.taggable.Taggable-class.html#add_tags @@ -207,9 +231,6 @@ lastfm.artist.Artist.similar lastfm.artist.Artist-class.html#similar lastfm.base.LastfmBase.__ge__ lastfm.base.LastfmBase-class.html#__ge__ lastfm.base.LastfmBase lastfm.base.LastfmBase-class.html lastfm.base.LastfmBase.__ne__ lastfm.base.LastfmBase-class.html#__ne__ -lastfm.base.LastfmBase.top_property lastfm.base.LastfmBase-class.html#top_property -lastfm.base.LastfmBase.cached_property lastfm.base.LastfmBase-class.html#cached_property -lastfm.base.LastfmBase.autheticate lastfm.base.LastfmBase-class.html#autheticate lastfm.base.LastfmBase.__le__ lastfm.base.LastfmBase-class.html#__le__ lastfm.base.LastfmBase.__gt__ lastfm.base.LastfmBase-class.html#__gt__ lastfm.base.LastfmBase.__ge__ lastfm.base.LastfmBase-class.html#__ge__ @@ -299,12 +320,9 @@ lastfm.event.Event.artists lastfm.event.Event-class.html#artists lastfm.event.Event.__lt__ lastfm.event.Event-class.html#__lt__ lastfm.event.Event.headliner lastfm.event.Event-class.html#headliner lastfm.event.Event.id lastfm.event.Event-class.html#id -lastfm.base.LastfmBase.cached_property lastfm.base.LastfmBase-class.html#cached_property -lastfm.base.LastfmBase.top_property lastfm.base.LastfmBase-class.html#top_property lastfm.event.Event.stats lastfm.event.Event-class.html#stats lastfm.mixins.cacheable.Cacheable.__new__ lastfm.mixins.cacheable.Cacheable-class.html#__new__ lastfm.event.Event.title lastfm.event.Event-class.html#title -lastfm.base.LastfmBase.autheticate lastfm.base.LastfmBase-class.html#autheticate lastfm.mixins.cacheable.Cacheable._lock lastfm.mixins.cacheable.Cacheable-class.html#_lock lastfm.event.Event.init lastfm.event.Event-class.html#init lastfm.base.LastfmBase.__le__ lastfm.base.LastfmBase-class.html#__le__ @@ -345,16 +363,13 @@ lastfm.geo.Country.ISO_CODES lastfm.geo.Country-class.html#ISO_CODES lastfm.geo.Country._hash_func lastfm.geo.Country-class.html#_hash_func lastfm.geo.Country.__lt__ lastfm.geo.Country-class.html#__lt__ lastfm.geo.Country.get_top_tracks lastfm.geo.Country-class.html#get_top_tracks -lastfm.base.LastfmBase.top_property lastfm.base.LastfmBase-class.html#top_property lastfm.mixins.cacheable.Cacheable.__new__ lastfm.mixins.cacheable.Cacheable-class.html#__new__ lastfm.geo.Country.top_artists lastfm.geo.Country-class.html#top_artists -lastfm.base.LastfmBase.autheticate lastfm.base.LastfmBase-class.html#autheticate lastfm.mixins.cacheable.Cacheable._lock lastfm.mixins.cacheable.Cacheable-class.html#_lock lastfm.geo.Country.init lastfm.geo.Country-class.html#init lastfm.geo.Country.events lastfm.geo.Country-class.html#events lastfm.geo.Country.top_artist lastfm.geo.Country-class.html#top_artist lastfm.base.LastfmBase.__ne__ lastfm.base.LastfmBase-class.html#__ne__ -lastfm.base.LastfmBase.cached_property lastfm.base.LastfmBase-class.html#cached_property lastfm.geo.Country.top_track lastfm.geo.Country-class.html#top_track lastfm.mixins.cacheable.Cacheable.registry lastfm.mixins.cacheable.Cacheable-class.html#registry lastfm.base.LastfmBase.__gt__ lastfm.base.LastfmBase-class.html#__gt__ @@ -377,16 +392,13 @@ lastfm.geo.Location._hash_func lastfm.geo.Location-class.html#_hash_func lastfm.geo.Location.timezone lastfm.geo.Location-class.html#timezone lastfm.geo.Location.__lt__ lastfm.geo.Location-class.html#__lt__ lastfm.geo.Location.city lastfm.geo.Location-class.html#city -lastfm.base.LastfmBase.top_property lastfm.base.LastfmBase-class.html#top_property lastfm.mixins.cacheable.Cacheable.__new__ lastfm.mixins.cacheable.Cacheable-class.html#__new__ -lastfm.base.LastfmBase.autheticate lastfm.base.LastfmBase-class.html#autheticate lastfm.mixins.cacheable.Cacheable._lock lastfm.mixins.cacheable.Cacheable-class.html#_lock lastfm.geo.Location.init lastfm.geo.Location-class.html#init lastfm.geo.Location.latitude lastfm.geo.Location-class.html#latitude lastfm.geo.Location.events lastfm.geo.Location-class.html#events lastfm.base.LastfmBase.__ne__ lastfm.base.LastfmBase-class.html#__ne__ lastfm.geo.Location.XMLNS lastfm.geo.Location-class.html#XMLNS -lastfm.base.LastfmBase.cached_property lastfm.base.LastfmBase-class.html#cached_property lastfm.geo.Location.top_track lastfm.geo.Location-class.html#top_track lastfm.mixins.cacheable.Cacheable.registry lastfm.mixins.cacheable.Cacheable-class.html#registry lastfm.base.LastfmBase.__gt__ lastfm.base.LastfmBase-class.html#__gt__ @@ -408,14 +420,11 @@ lastfm.group.Group.recent_weekly_album_chart lastfm.group.Group-class.html#recen lastfm.group.Group.__lt__ lastfm.group.Group-class.html#__lt__ lastfm.group.Group.weekly_chart_list lastfm.group.Group-class.html#weekly_chart_list lastfm.group.Group.recent_weekly_track_chart lastfm.group.Group-class.html#recent_weekly_track_chart -lastfm.base.LastfmBase.top_property lastfm.base.LastfmBase-class.html#top_property lastfm.mixins.cacheable.Cacheable.__new__ lastfm.mixins.cacheable.Cacheable-class.html#__new__ -lastfm.base.LastfmBase.autheticate lastfm.base.LastfmBase-class.html#autheticate lastfm.mixins.cacheable.Cacheable._lock lastfm.mixins.cacheable.Cacheable-class.html#_lock lastfm.group.Group.init lastfm.group.Group-class.html#init lastfm.group.Group.get_weekly_track_chart lastfm.group.Group-class.html#get_weekly_track_chart lastfm.group.Group._default_params lastfm.group.Group-class.html#_default_params -lastfm.base.LastfmBase.cached_property lastfm.base.LastfmBase-class.html#cached_property lastfm.group.Group.recent_weekly_artist_chart lastfm.group.Group-class.html#recent_weekly_artist_chart lastfm.group.Group.weekly_album_chart_list lastfm.group.Group-class.html#weekly_album_chart_list lastfm.mixins.cacheable.Cacheable.registry lastfm.mixins.cacheable.Cacheable-class.html#registry @@ -480,14 +489,11 @@ lastfm.objectcache.ObjectCache.__repr__ lastfm.objectcache.ObjectCache-class.htm lastfm.playlist.Playlist lastfm.playlist.Playlist-class.html lastfm.playlist.Playlist._hash_func lastfm.playlist.Playlist-class.html#_hash_func lastfm.playlist.Playlist.__lt__ lastfm.playlist.Playlist-class.html#__lt__ -lastfm.base.LastfmBase.top_property lastfm.base.LastfmBase-class.html#top_property lastfm.mixins.cacheable.Cacheable.__new__ lastfm.mixins.cacheable.Cacheable-class.html#__new__ -lastfm.base.LastfmBase.autheticate lastfm.base.LastfmBase-class.html#autheticate lastfm.playlist.Playlist.data lastfm.playlist.Playlist-class.html#data lastfm.mixins.cacheable.Cacheable._lock lastfm.mixins.cacheable.Cacheable-class.html#_lock lastfm.playlist.Playlist.init lastfm.playlist.Playlist-class.html#init lastfm.base.LastfmBase.__ne__ lastfm.base.LastfmBase-class.html#__ne__ -lastfm.base.LastfmBase.cached_property lastfm.base.LastfmBase-class.html#cached_property lastfm.mixins.cacheable.Cacheable.registry lastfm.mixins.cacheable.Cacheable-class.html#registry lastfm.base.LastfmBase.__gt__ lastfm.base.LastfmBase-class.html#__gt__ lastfm.playlist.Playlist.__eq__ lastfm.playlist.Playlist-class.html#__eq__ @@ -512,15 +518,12 @@ lastfm.safelist.SafeList.__repr__ lastfm.safelist.SafeList-class.html#__repr__ lastfm.shout.Shout lastfm.shout.Shout-class.html lastfm.shout.Shout._hash_func lastfm.shout.Shout-class.html#_hash_func lastfm.shout.Shout.__lt__ lastfm.shout.Shout-class.html#__lt__ -lastfm.base.LastfmBase.top_property lastfm.base.LastfmBase-class.html#top_property lastfm.mixins.cacheable.Cacheable.__new__ lastfm.mixins.cacheable.Cacheable-class.html#__new__ lastfm.shout.Shout.author lastfm.shout.Shout-class.html#author -lastfm.base.LastfmBase.autheticate lastfm.base.LastfmBase-class.html#autheticate lastfm.mixins.cacheable.Cacheable._lock lastfm.mixins.cacheable.Cacheable-class.html#_lock lastfm.shout.Shout.init lastfm.shout.Shout-class.html#init lastfm.shout.Shout.body lastfm.shout.Shout-class.html#body lastfm.base.LastfmBase.__ne__ lastfm.base.LastfmBase-class.html#__ne__ -lastfm.base.LastfmBase.cached_property lastfm.base.LastfmBase-class.html#cached_property lastfm.mixins.cacheable.Cacheable.registry lastfm.mixins.cacheable.Cacheable-class.html#registry lastfm.base.LastfmBase.__gt__ lastfm.base.LastfmBase-class.html#__gt__ lastfm.shout.Shout.date lastfm.shout.Shout-class.html#date @@ -550,11 +553,9 @@ lastfm.tag.Tag._hash_func lastfm.tag.Tag-class.html#_hash_func lastfm.tag.Tag.__lt__ lastfm.tag.Tag-class.html#__lt__ lastfm.tag.Tag.weekly_chart_list lastfm.tag.Tag-class.html#weekly_chart_list lastfm.tag.Tag.playlist lastfm.tag.Tag-class.html#playlist -lastfm.base.LastfmBase.top_property lastfm.base.LastfmBase-class.html#top_property lastfm.tag.Tag.stats lastfm.tag.Tag-class.html#stats lastfm.mixins.cacheable.Cacheable.__new__ lastfm.mixins.cacheable.Cacheable-class.html#__new__ lastfm.tag.Tag.top_artists lastfm.tag.Tag-class.html#top_artists -lastfm.base.LastfmBase.autheticate lastfm.base.LastfmBase-class.html#autheticate lastfm.mixins.cacheable.Cacheable._lock lastfm.mixins.cacheable.Cacheable-class.html#_lock lastfm.tag.Tag.top_track lastfm.tag.Tag-class.html#top_track lastfm.tag.Tag.init lastfm.tag.Tag-class.html#init @@ -562,7 +563,6 @@ lastfm.tag.Tag.get_top_tags lastfm.tag.Tag-class.html#get_top_tags lastfm.tag.Tag.top_artist lastfm.tag.Tag-class.html#top_artist lastfm.base.LastfmBase.__ne__ lastfm.base.LastfmBase-class.html#__ne__ lastfm.tag.Tag._default_params lastfm.tag.Tag-class.html#_default_params -lastfm.base.LastfmBase.cached_property lastfm.base.LastfmBase-class.html#cached_property lastfm.tag.Tag.recent_weekly_artist_chart lastfm.tag.Tag-class.html#recent_weekly_artist_chart lastfm.tag.Tag._search_yield_func lastfm.tag.Tag-class.html#_search_yield_func lastfm.tag.Tag.streamable lastfm.tag.Tag-class.html#streamable @@ -607,10 +607,8 @@ lastfm.track.Track.top_tag lastfm.track.Track-class.html#top_tag lastfm.track.Track.id lastfm.track.Track-class.html#id lastfm.track.Track.album lastfm.track.Track-class.html#album lastfm.track.Track.streamable lastfm.track.Track-class.html#streamable -lastfm.base.LastfmBase.top_property lastfm.base.LastfmBase-class.html#top_property lastfm.track.Track.stats lastfm.track.Track-class.html#stats lastfm.track.Track.full_track lastfm.track.Track-class.html#full_track -lastfm.base.LastfmBase.autheticate lastfm.base.LastfmBase-class.html#autheticate lastfm.mixins.cacheable.Cacheable._lock lastfm.mixins.cacheable.Cacheable-class.html#_lock lastfm.track.Track.top_tags lastfm.track.Track-class.html#top_tags lastfm.track.Track.init lastfm.track.Track-class.html#init @@ -618,7 +616,6 @@ lastfm.track.Track.__repr__ lastfm.track.Track-class.html#__repr__ lastfm.base.LastfmBase.__ne__ lastfm.base.LastfmBase-class.html#__ne__ lastfm.mixins.taggable.Taggable.remove_tag lastfm.mixins.taggable.Taggable-class.html#remove_tag lastfm.track.Track._default_params lastfm.track.Track-class.html#_default_params -lastfm.base.LastfmBase.cached_property lastfm.base.LastfmBase-class.html#cached_property lastfm.track.Track._fetch_data lastfm.track.Track-class.html#_fetch_data lastfm.track.Track._search_yield_func lastfm.track.Track-class.html#_search_yield_func lastfm.mixins.taggable.Taggable.add_tags lastfm.mixins.taggable.Taggable-class.html#add_tags @@ -647,7 +644,6 @@ lastfm.mixins.shoutable.Shoutable.shouts lastfm.mixins.shoutable.Shoutable-class lastfm.user.User.__lt__ lastfm.user.User-class.html#__lt__ lastfm.user.User.most_recent_track lastfm.user.User-class.html#most_recent_track lastfm.user.User.top_artists lastfm.user.User-class.html#top_artists -lastfm.base.LastfmBase.autheticate lastfm.base.LastfmBase-class.html#autheticate lastfm.user.User.init lastfm.user.User-class.html#init lastfm.user.User.recommended_events lastfm.user.User-class.html#recommended_events lastfm.user.User.get_top_tags lastfm.user.User-class.html#get_top_tags @@ -667,18 +663,17 @@ lastfm.user.User.get_neighbours lastfm.user.User-class.html#get_neighbours lastfm.user.User.top_albums lastfm.user.User-class.html#top_albums lastfm.user.User.top_tracks lastfm.user.User-class.html#top_tracks lastfm.user.User.Playlist lastfm.user.User.Playlist-class.html -lastfm.base.LastfmBase.__ne__ lastfm.base.LastfmBase-class.html#__ne__ +lastfm.user.User.get_weekly_track_chart lastfm.user.User-class.html#get_weekly_track_chart lastfm.user.User.library lastfm.user.User-class.html#library lastfm.user.User.top_album lastfm.user.User-class.html#top_album lastfm.user.User.get_info lastfm.user.User-class.html#get_info lastfm.user.User.get_weekly_album_chart lastfm.user.User-class.html#get_weekly_album_chart lastfm.user.User.top_tag lastfm.user.User-class.html#top_tag lastfm.user.User.get_top_tracks lastfm.user.User-class.html#get_top_tracks -lastfm.base.LastfmBase.top_property lastfm.base.LastfmBase-class.html#top_property lastfm.user.User.stats lastfm.user.User-class.html#stats lastfm.user.User.top_tags lastfm.user.User-class.html#top_tags lastfm.user.User.recent_weekly_tag_chart lastfm.user.User-class.html#recent_weekly_tag_chart -lastfm.user.User.get_weekly_track_chart lastfm.user.User-class.html#get_weekly_track_chart +lastfm.base.LastfmBase.__ne__ lastfm.base.LastfmBase-class.html#__ne__ lastfm.user.User._default_params lastfm.user.User-class.html#_default_params lastfm.user.User.get_friends lastfm.user.User-class.html#get_friends lastfm.user.User.language lastfm.user.User-class.html#language @@ -691,9 +686,7 @@ lastfm.user.User.recent_weekly_album_chart lastfm.user.User-class.html#recent_we lastfm.user.User.weekly_chart_list lastfm.user.User-class.html#weekly_chart_list lastfm.user.User.neighbours lastfm.user.User-class.html#neighbours lastfm.user.User.subscriber lastfm.user.User-class.html#subscriber -lastfm.user.User.autheticated lastfm.user.User-class.html#autheticated lastfm.user.User.get_recommended_events lastfm.user.User-class.html#get_recommended_events -lastfm.base.LastfmBase.cached_property lastfm.base.LastfmBase-class.html#cached_property lastfm.user.User.top_track lastfm.user.User-class.html#top_track lastfm.user.User.__eq__ lastfm.user.User-class.html#__eq__ lastfm.user.User.past_events lastfm.user.User-class.html#past_events @@ -708,6 +701,7 @@ lastfm.user.User.compare lastfm.user.User-class.html#compare lastfm.user.User.playlists lastfm.user.User-class.html#playlists lastfm.user.User.get_weekly_tag_chart lastfm.user.User-class.html#get_weekly_tag_chart lastfm.user.User.recent_weekly_track_chart lastfm.user.User-class.html#recent_weekly_track_chart +lastfm.user.User.authenticated lastfm.user.User-class.html#authenticated lastfm.mixins.cacheable.Cacheable.__new__ lastfm.mixins.cacheable.Cacheable-class.html#__new__ lastfm.mixins.cacheable.Cacheable._lock lastfm.mixins.cacheable.Cacheable-class.html#_lock lastfm.user.User.weekly_album_chart_list lastfm.user.User-class.html#weekly_album_chart_list @@ -744,15 +738,12 @@ lastfm.playlist.Playlist.__lt__ lastfm.playlist.Playlist-class.html#__lt__ lastfm.user.User.Playlist.id lastfm.user.User.Playlist-class.html#id lastfm.user.User.Playlist.size lastfm.user.User.Playlist-class.html#size lastfm.user.User.Playlist.add_track lastfm.user.User.Playlist-class.html#add_track -lastfm.base.LastfmBase.top_property lastfm.base.LastfmBase-class.html#top_property lastfm.mixins.cacheable.Cacheable.__new__ lastfm.mixins.cacheable.Cacheable-class.html#__new__ lastfm.user.User.Playlist.title lastfm.user.User.Playlist-class.html#title -lastfm.base.LastfmBase.autheticate lastfm.base.LastfmBase-class.html#autheticate lastfm.playlist.Playlist.data lastfm.playlist.Playlist-class.html#data lastfm.mixins.cacheable.Cacheable._lock lastfm.mixins.cacheable.Cacheable-class.html#_lock lastfm.user.User.Playlist.init lastfm.user.User.Playlist-class.html#init lastfm.base.LastfmBase.__ne__ lastfm.base.LastfmBase-class.html#__ne__ -lastfm.base.LastfmBase.cached_property lastfm.base.LastfmBase-class.html#cached_property lastfm.user.User.Playlist.user lastfm.user.User.Playlist-class.html#user lastfm.base.LastfmBase.__gt__ lastfm.base.LastfmBase-class.html#__gt__ lastfm.user.User.Playlist.date lastfm.user.User.Playlist-class.html#date @@ -770,9 +761,7 @@ lastfm.mixins.cacheable.Cacheable.register lastfm.mixins.cacheable.Cacheable-cla lastfm.venue.Venue._hash_func lastfm.venue.Venue-class.html#_hash_func lastfm.venue.Venue.__lt__ lastfm.venue.Venue-class.html#__lt__ lastfm.venue.Venue.id lastfm.venue.Venue-class.html#id -lastfm.base.LastfmBase.top_property lastfm.base.LastfmBase-class.html#top_property lastfm.mixins.cacheable.Cacheable.__new__ lastfm.mixins.cacheable.Cacheable-class.html#__new__ -lastfm.base.LastfmBase.autheticate lastfm.base.LastfmBase-class.html#autheticate lastfm.mixins.cacheable.Cacheable._lock lastfm.mixins.cacheable.Cacheable-class.html#_lock lastfm.venue.Venue.init lastfm.venue.Venue-class.html#init lastfm.venue.Venue.location lastfm.venue.Venue-class.html#location @@ -780,7 +769,6 @@ lastfm.venue.Venue.events lastfm.venue.Venue-class.html#events lastfm.base.LastfmBase.__ne__ lastfm.base.LastfmBase-class.html#__ne__ lastfm.venue.Venue.get_past_events lastfm.venue.Venue-class.html#get_past_events lastfm.venue.Venue._default_params lastfm.venue.Venue-class.html#_default_params -lastfm.base.LastfmBase.cached_property lastfm.base.LastfmBase-class.html#cached_property lastfm.venue.Venue._search_yield_func lastfm.venue.Venue-class.html#_search_yield_func lastfm.mixins.cacheable.Cacheable.registry lastfm.mixins.cacheable.Cacheable-class.html#registry lastfm.base.LastfmBase.__gt__ lastfm.base.LastfmBase-class.html#__gt__ @@ -797,16 +785,13 @@ lastfm.weeklychart.WeeklyAlbumChart lastfm.weeklychart.WeeklyAlbumChart-class.ht lastfm.weeklychart.WeeklyChart._hash_func lastfm.weeklychart.WeeklyChart-class.html#_hash_func lastfm.weeklychart.WeeklyChart.__lt__ lastfm.weeklychart.WeeklyChart-class.html#__lt__ lastfm.weeklychart.WeeklyChart.subject lastfm.weeklychart.WeeklyChart-class.html#subject -lastfm.base.LastfmBase.top_property lastfm.base.LastfmBase-class.html#top_property lastfm.weeklychart.WeeklyChart.end lastfm.weeklychart.WeeklyChart-class.html#end lastfm.mixins.cacheable.Cacheable.__new__ lastfm.mixins.cacheable.Cacheable-class.html#__new__ -lastfm.base.LastfmBase.autheticate lastfm.base.LastfmBase-class.html#autheticate lastfm.mixins.cacheable.Cacheable._lock lastfm.mixins.cacheable.Cacheable-class.html#_lock lastfm.weeklychart.WeeklyChart.start lastfm.weeklychart.WeeklyChart-class.html#start lastfm.weeklychart.WeeklyAlbumChart.init lastfm.weeklychart.WeeklyAlbumChart-class.html#init lastfm.weeklychart.WeeklyChart._check_weekly_chart_params lastfm.weeklychart.WeeklyChart-class.html#_check_weekly_chart_params lastfm.base.LastfmBase.__ne__ lastfm.base.LastfmBase-class.html#__ne__ -lastfm.base.LastfmBase.cached_property lastfm.base.LastfmBase-class.html#cached_property lastfm.mixins.cacheable.Cacheable.registry lastfm.mixins.cacheable.Cacheable-class.html#registry lastfm.base.LastfmBase.__gt__ lastfm.base.LastfmBase-class.html#__gt__ lastfm.weeklychart.WeeklyChart.stats lastfm.weeklychart.WeeklyChart-class.html#stats @@ -823,16 +808,13 @@ lastfm.weeklychart.WeeklyChart._hash_func lastfm.weeklychart.WeeklyChart-class.h lastfm.weeklychart.WeeklyArtistChart.artists lastfm.weeklychart.WeeklyArtistChart-class.html#artists lastfm.weeklychart.WeeklyChart.__lt__ lastfm.weeklychart.WeeklyChart-class.html#__lt__ lastfm.weeklychart.WeeklyChart.subject lastfm.weeklychart.WeeklyChart-class.html#subject -lastfm.base.LastfmBase.top_property lastfm.base.LastfmBase-class.html#top_property lastfm.weeklychart.WeeklyChart.end lastfm.weeklychart.WeeklyChart-class.html#end lastfm.mixins.cacheable.Cacheable.__new__ lastfm.mixins.cacheable.Cacheable-class.html#__new__ -lastfm.base.LastfmBase.autheticate lastfm.base.LastfmBase-class.html#autheticate lastfm.mixins.cacheable.Cacheable._lock lastfm.mixins.cacheable.Cacheable-class.html#_lock lastfm.weeklychart.WeeklyChart.start lastfm.weeklychart.WeeklyChart-class.html#start lastfm.weeklychart.WeeklyArtistChart.init lastfm.weeklychart.WeeklyArtistChart-class.html#init lastfm.weeklychart.WeeklyChart._check_weekly_chart_params lastfm.weeklychart.WeeklyChart-class.html#_check_weekly_chart_params lastfm.base.LastfmBase.__ne__ lastfm.base.LastfmBase-class.html#__ne__ -lastfm.base.LastfmBase.cached_property lastfm.base.LastfmBase-class.html#cached_property lastfm.mixins.cacheable.Cacheable.registry lastfm.mixins.cacheable.Cacheable-class.html#registry lastfm.base.LastfmBase.__gt__ lastfm.base.LastfmBase-class.html#__gt__ lastfm.weeklychart.WeeklyChart.stats lastfm.weeklychart.WeeklyChart-class.html#stats @@ -847,16 +829,13 @@ lastfm.weeklychart.WeeklyChart lastfm.weeklychart.WeeklyChart-class.html lastfm.weeklychart.WeeklyChart._hash_func lastfm.weeklychart.WeeklyChart-class.html#_hash_func lastfm.weeklychart.WeeklyChart.__lt__ lastfm.weeklychart.WeeklyChart-class.html#__lt__ lastfm.weeklychart.WeeklyChart.subject lastfm.weeklychart.WeeklyChart-class.html#subject -lastfm.base.LastfmBase.top_property lastfm.base.LastfmBase-class.html#top_property lastfm.weeklychart.WeeklyChart.end lastfm.weeklychart.WeeklyChart-class.html#end lastfm.mixins.cacheable.Cacheable.__new__ lastfm.mixins.cacheable.Cacheable-class.html#__new__ -lastfm.base.LastfmBase.autheticate lastfm.base.LastfmBase-class.html#autheticate lastfm.mixins.cacheable.Cacheable._lock lastfm.mixins.cacheable.Cacheable-class.html#_lock lastfm.weeklychart.WeeklyChart.start lastfm.weeklychart.WeeklyChart-class.html#start lastfm.weeklychart.WeeklyChart.init lastfm.weeklychart.WeeklyChart-class.html#init lastfm.weeklychart.WeeklyChart._check_weekly_chart_params lastfm.weeklychart.WeeklyChart-class.html#_check_weekly_chart_params lastfm.base.LastfmBase.__ne__ lastfm.base.LastfmBase-class.html#__ne__ -lastfm.base.LastfmBase.cached_property lastfm.base.LastfmBase-class.html#cached_property lastfm.mixins.cacheable.Cacheable.registry lastfm.mixins.cacheable.Cacheable-class.html#registry lastfm.base.LastfmBase.__gt__ lastfm.base.LastfmBase-class.html#__gt__ lastfm.weeklychart.WeeklyChart.stats lastfm.weeklychart.WeeklyChart-class.html#stats @@ -871,16 +850,13 @@ lastfm.weeklychart.WeeklyTagChart lastfm.weeklychart.WeeklyTagChart-class.html lastfm.weeklychart.WeeklyChart._hash_func lastfm.weeklychart.WeeklyChart-class.html#_hash_func lastfm.weeklychart.WeeklyChart.__lt__ lastfm.weeklychart.WeeklyChart-class.html#__lt__ lastfm.weeklychart.WeeklyChart.subject lastfm.weeklychart.WeeklyChart-class.html#subject -lastfm.base.LastfmBase.top_property lastfm.base.LastfmBase-class.html#top_property lastfm.weeklychart.WeeklyChart.end lastfm.weeklychart.WeeklyChart-class.html#end lastfm.mixins.cacheable.Cacheable.__new__ lastfm.mixins.cacheable.Cacheable-class.html#__new__ -lastfm.base.LastfmBase.autheticate lastfm.base.LastfmBase-class.html#autheticate lastfm.mixins.cacheable.Cacheable._lock lastfm.mixins.cacheable.Cacheable-class.html#_lock lastfm.weeklychart.WeeklyChart.start lastfm.weeklychart.WeeklyChart-class.html#start lastfm.weeklychart.WeeklyTagChart.init lastfm.weeklychart.WeeklyTagChart-class.html#init lastfm.weeklychart.WeeklyChart._check_weekly_chart_params lastfm.weeklychart.WeeklyChart-class.html#_check_weekly_chart_params lastfm.base.LastfmBase.__ne__ lastfm.base.LastfmBase-class.html#__ne__ -lastfm.base.LastfmBase.cached_property lastfm.base.LastfmBase-class.html#cached_property lastfm.weeklychart.WeeklyTagChart.tags lastfm.weeklychart.WeeklyTagChart-class.html#tags lastfm.mixins.cacheable.Cacheable.registry lastfm.mixins.cacheable.Cacheable-class.html#registry lastfm.base.LastfmBase.__gt__ lastfm.base.LastfmBase-class.html#__gt__ @@ -896,16 +872,13 @@ lastfm.weeklychart.WeeklyTrackChart lastfm.weeklychart.WeeklyTrackChart-class.ht lastfm.weeklychart.WeeklyChart._hash_func lastfm.weeklychart.WeeklyChart-class.html#_hash_func lastfm.weeklychart.WeeklyChart.__lt__ lastfm.weeklychart.WeeklyChart-class.html#__lt__ lastfm.weeklychart.WeeklyChart.subject lastfm.weeklychart.WeeklyChart-class.html#subject -lastfm.base.LastfmBase.top_property lastfm.base.LastfmBase-class.html#top_property lastfm.weeklychart.WeeklyChart.end lastfm.weeklychart.WeeklyChart-class.html#end lastfm.mixins.cacheable.Cacheable.__new__ lastfm.mixins.cacheable.Cacheable-class.html#__new__ -lastfm.base.LastfmBase.autheticate lastfm.base.LastfmBase-class.html#autheticate lastfm.mixins.cacheable.Cacheable._lock lastfm.mixins.cacheable.Cacheable-class.html#_lock lastfm.weeklychart.WeeklyChart.start lastfm.weeklychart.WeeklyChart-class.html#start lastfm.weeklychart.WeeklyTrackChart.init lastfm.weeklychart.WeeklyTrackChart-class.html#init lastfm.weeklychart.WeeklyChart._check_weekly_chart_params lastfm.weeklychart.WeeklyChart-class.html#_check_weekly_chart_params lastfm.base.LastfmBase.__ne__ lastfm.base.LastfmBase-class.html#__ne__ -lastfm.base.LastfmBase.cached_property lastfm.base.LastfmBase-class.html#cached_property lastfm.weeklychart.WeeklyTrackChart.tracks lastfm.weeklychart.WeeklyTrackChart-class.html#tracks lastfm.mixins.cacheable.Cacheable.registry lastfm.mixins.cacheable.Cacheable-class.html#registry lastfm.base.LastfmBase.__gt__ lastfm.base.LastfmBase-class.html#__gt__ diff --git a/docs/class-tree.html b/docs/class-tree.html index 8438e85..967e94f 100644 --- a/docs/class-tree.html +++ b/docs/class-tree.html @@ -360,7 +360,7 @@ + + + + + - + - + - + - @@ -939,7 +948,7 @@ (in WeeklyChart) - @@ -947,7 +956,7 @@ (in Event) - @@ -955,7 +964,7 @@ (in Event) - @@ -963,7 +972,7 @@ (in Event) - @@ -971,63 +980,63 @@ (in Album) - + - + - + - + - + - + - + - @@ -1035,7 +1044,7 @@ (in User) - @@ -1050,13 +1059,6 @@ - - - - -
- Generated by Epydoc 3.0.1 on Mon Mar 09 17:56:40 2009 + Generated by Epydoc 3.0.1 on Tue Mar 10 11:14:33 2009 - + - + - + - + + + + + + - - - - - - +
- Generated by Epydoc 3.0.1 on Mon Mar 09 17:56:40 2009 + Generated by Epydoc 3.0.1 on Tue Mar 10 11:14:33 2009 (in User) artist
(in lastfm)		AuthenticationFailedError
-(in lastfm.error)		authenticate()
+(in lastfm.decorators)
album
(in lastfm)		 Artist
(in lastfm.artist)		autheticate()
-(in LastfmBase)		authenticated
+(in User)
Album
(in lastfm.album)		 artist
(in Track)		autheticated
-(in User)		AuthenticationFailedError
+(in lastfm.error)
album
@@ -220,8 +220,8 @@ (in WeeklyChart)
cached_property()
-(in LastfmBase)		cached_property()
+(in lastfm.decorators)		 count
(in Stats)		 create_from_data()
@@ -273,23 +273,24 @@
data
(in Playlist)		decorators
+(in lastfm)		description
+(in Event)
date
+(in Shout)		 DEFAULT_CACHE_TIMEOUT
(in Api)		 duration
(in Track)
date
-(in Shout)		DEPTH
-(in FileCache)		 
date
(in Playlist)		description
-(in Event)		DEPTH
+(in FileCache)		  
@@ -901,37 +902,45 @@
safelist
(in lastfm)		set_urllib()
+(in Api)		stats
+(in lastfm)
SafeList
+(in lastfm.safelist)		 set_user_agent()
(in Api)		 Stats
(in lastfm.stats)
SafeList
-(in lastfm.safelist)		score
+(in Tasteometer)		 sharable
(in lastfm.mixins)		 stats
(in Tag)
score
-(in Tasteometer)		search()
+(in Searchable)		 Sharable
(in lastfm.mixins.sharable)		 stats
(in Track)
search()
-(in Searchable)		search_album()
+(in Api)		 share()
(in Sharable)		 stats
(in User)
search_album()
+		search_artist()
(in Api)		 shout
(in lastfm)
search_artist()
+		search_tag()
(in Api)		 Shout
(in lastfm.shout)
search_tag()
+		search_track()
(in Api)		 shoutable
(in lastfm.mixins)
search_track()
+		search_venue()
(in Api)		 Shoutable
(in lastfm.mixins.shoutable)
search_venue()
+		SEARCH_XMLNS
(in Api)		 shouts
(in Shoutable)
SEARCH_XMLNS
-(in Api)		searchable
+(in lastfm.mixins)		 similar
(in Artist)		 streamable
(in Artist)
searchable
-(in lastfm.mixins)		Searchable
+(in lastfm.mixins.searchable)		 similar
(in Tag)		 streamable
(in Tag)
Searchable
-(in lastfm.mixins.searchable)		secret
+(in Api)		 similar
(in Track)		 streamable
(in Track)
secret
-(in Api)		ServiceOfflineError
+(in lastfm.error)		 size
(in Playlist)		 street
(in Location)
ServiceOfflineError
-(in lastfm.error)		session_key
+(in Api)		 sort()
(in SafeList)		 subject
(in Stats)
session_key
-(in Api)		Set()
+(in FileCache)		 start
(in WeeklyChart)		 subject
(in WeeklyChart)
Set()
-(in FileCache)		set_cache()
+(in Api)		 start_date
(in Event)		 subject
(in Wiki)
set_cache()
+		set_cache_timeout()
(in Api)		 stats
(in Album)
set_cache_timeout()
+		set_secret()
(in Api)		 stats
(in Artist)		summary
(in Wiki)
set_urllib()
-(in Api)		stats
-(in lastfm)		 

T

@@ -1169,8 +1171,8 @@ TokenExpiredError
(in lastfm.error) -top_property()
-(in LastfmBase) +top_property()
+(in lastfm.decorators) top_tracks
(in User) @@ -1340,480 +1342,481 @@ (in RecursiveLazyListFactory) __lt__()
(in User) -_check_xml()
-(in Api) +_check_weekly_chart_params()
+(in WeeklyChart) __eq__()
(in Album) __lt__()
(in Venue) -_default_params()
-(in Album) +_check_xml()
+(in Api) __eq__()
(in Artist) __lt__()
(in WeeklyChart) -_default_params()
-(in Artist) +_default_params()
+(in Album) __eq__()
(in Event) __ne__()
(in LastfmBase) -_default_params()
-(in Event) +_default_params()
+(in Artist) __eq__()
(in Country) __new__()
(in Cacheable) -_default_params()
-(in Group) +_default_params()
+(in Event) __eq__()
(in Location) __package__
(in lastfm) -_default_params()
-(in Sharable) +_default_params()
+(in Group) __eq__()
(in Group) __package__
(in lastfm.album) -_default_params()
-(in Shoutable) +_default_params()
+(in Sharable) __eq__()
(in Playlist) __package__
(in lastfm.api) -_default_params()
-(in Taggable) +_default_params()
+(in Shoutable) __eq__()
(in Shout) __package__
(in lastfm.artist) -_default_params()
-(in Tag) +_default_params()
+(in Taggable) __eq__()
(in Tag) __package__
(in lastfm.base) -_default_params()
-(in Track) +_default_params()
+(in Tag) __eq__()
(in Track) +__package__
+(in lastfm.decorators) +_default_params()
+(in Track) + + +__eq__()
+(in User) __package__
(in lastfm.error) _default_params()
(in Library) -__eq__()
-(in User) +__eq__()
+(in Venue) __package__
(in lastfm.event) _default_params()
(in User) -__eq__()
-(in Venue) +__eq__()
+(in WeeklyChart) __package__
(in lastfm.filecache) _default_params()
(in Venue) -__eq__()
-(in WeeklyChart) +__ge__()
+(in LastfmBase) __package__
(in lastfm.geo) _encode()
(in Api) -__ge__()
-(in LastfmBase) +__getitem__()
+(in LazyList) __package__
(in lastfm.group) _encode_parameters()
(in Api) -__getitem__()
-(in LazyList) +__getitem__()
+(in ObjectCache) __package__
(in lastfm.lazylist) _fetch_data()
(in Album) -__getitem__()
-(in ObjectCache) +__getitem__()
+(in SafeList) __package__
(in lastfm.mixins) _fetch_data()
(in Api) -__getitem__()
-(in SafeList) +__gt__()
+(in LastfmBase) __package__
(in lastfm.mixins.cacheable) _fetch_data()
(in Artist) -__gt__()
-(in LastfmBase) +__hash__()
+(in Album) __package__
(in lastfm.mixins.searchable) _fetch_data()
(in Track) -__hash__()
-(in Album) +__hash__()
+(in Artist) __package__
(in lastfm.mixins.sharable) _fetch_url()
(in Api) -__hash__()
-(in Artist) +__hash__()
+(in Event) __package__
(in lastfm.mixins.shoutable) _FileCacheError
(in lastfm.filecache) -__hash__()
-(in Event) +__hash__()
+(in Country) __package__
(in lastfm.mixins.taggable) _fill_info()
(in Album) -__hash__()
-(in Country) +__hash__()
+(in Location) __package__
(in lastfm.objectcache) _fill_info()
(in Artist) -__hash__()
-(in Location) +__hash__()
+(in Group) __package__
(in lastfm.playlist) _fill_info()
(in Track) -__hash__()
-(in Group) +__hash__()
+(in Playlist) __package__
(in lastfm.safelist) _get_api_sig()
(in Api) -__hash__()
-(in Playlist) +__hash__()
+(in Shout) __package__
(in lastfm.shout) _get_opener()
(in Api) -__hash__()
-(in Shout) +__hash__()
+(in Tag) __package__
(in lastfm.stats) _GetPath()
(in FileCache) -__hash__()
-(in Tag) +__hash__()
+(in Track) __package__
(in lastfm.tag) _GetPrefix()
(in FileCache) -__hash__()
-(in Track) +__hash__()
+(in Library) __package__
(in lastfm.tasteometer) _GetTmpCachePath()
(in FileCache) -__hash__()
-(in Library) +__hash__()
+(in Playlist) __package__
(in lastfm.track) _GetUsername()
(in FileCache) -__hash__()
-(in Playlist) +__hash__()
+(in User) __package__
(in lastfm.user) _hash_func()
(in Album) -__hash__()
-(in User) +__hash__()
+(in Venue) __package__
(in lastfm.venue) _hash_func()
(in Artist) -__hash__()
-(in Venue) +__hash__()
+(in WeeklyChart) __package__
(in lastfm.weeklychart) _hash_func()
(in Event) -__hash__()
-(in WeeklyChart) +__init__()
+(in Api) __package__
(in lastfm.wiki) _hash_func()
(in Country) -__init__()
-(in Api) +__init__()
+(in LastfmError) __repr__()
(in Album) _hash_func()
(in Location) -__init__()
-(in LastfmError) +__init__()
+(in FileCache) __repr__()
(in Api) _hash_func()
(in Group) -__init__()
-(in FileCache) +__init__()
+(in LazyList) __repr__()
(in Artist) _hash_func()
(in Playlist) -__init__()
-(in LazyList) +__init__()
+(in RecursiveLazyList) __repr__()
(in Event) _hash_func()
(in Shout) -__init__()
-(in RecursiveLazyList) +__init__()
+(in RecursiveLazyListFactory) __repr__()
(in Country) _hash_func()
(in Tag) -__init__()
-(in RecursiveLazyListFactory) +__init__()
+(in SafeList) __repr__()
(in Location) _hash_func()
(in Track) -__init__()
-(in SafeList) +__init__()
+(in Stats) __repr__()
(in Group) _hash_func()
(in Library) -__init__()
-(in Stats) +__init__()
+(in Tasteometer) __repr__()
(in RecursiveLazyList) _hash_func()
(in Playlist) -__init__()
-(in Tasteometer) +__init__()
+(in Library) __repr__()
(in ObjectCache) _hash_func()
(in User) -__init__()
-(in Library) +__init__()
+(in Wiki) __repr__()
(in Playlist) _hash_func()
(in Venue) -__init__()
-(in Wiki) +__iter__()
+(in LazyList) __repr__()
(in SafeList) _hash_func()
(in WeeklyChart) -__iter__()
-(in LazyList) +__iter__()
+(in SafeList) __repr__()
(in Shout) _initialize_request_headers()
(in Api) -__iter__()
-(in SafeList) +__le__()
+(in LastfmBase) __repr__()
(in Stats) _initialize_user_agent()
(in Api) -__le__()
-(in LastfmBase) +__len__()
+(in LazyList) __repr__()
(in Tag) _InitializeRootDirectory()
(in FileCache) -__len__()
-(in LazyList) +__len__()
+(in SafeList) __repr__()
(in Tasteometer) _lock
(in Cacheable) -__len__()
-(in SafeList) +__lt__()
+(in Album) __repr__()
(in Track) _post_data()
(in Api) -__lt__()
-(in Album) +__lt__()
+(in Artist) __repr__()
(in Library) _post_url()
(in Api) -__lt__()
-(in Artist) +__lt__()
+(in Event) __repr__()
(in Playlist) _read_url_data()
(in Api) -__lt__()
-(in Event) +__lt__()
+(in Country) __repr__()
(in User) _search_yield_func()
(in Album) -__lt__()
-(in Country) +__lt__()
+(in Location) __repr__()
(in Venue) _search_yield_func()
(in Artist) -__lt__()
-(in Location) +__lt__()
+(in Group) __repr__()
(in WeeklyChart) _search_yield_func()
(in Searchable) -__lt__()
-(in Group) +__lt__()
+(in Playlist) __repr__()
(in Wiki) _search_yield_func()
(in Tag) -__lt__()
-(in Playlist) +__lt__()
+(in Shout) __str__()
(in LastfmError) _search_yield_func()
(in Track) -__lt__()
-(in Shout) +__lt__()
+(in Tag) _build_url()
(in Api) _search_yield_func()
(in Venue) -__lt__()
-(in Tag) +__lt__()
+(in Track) _check_params()
(in Track) _tuple_from_slice()
(in SafeList) - -__lt__()
-(in Track) -_check_weekly_chart_params()
-(in WeeklyChart) -  - @@ -1848,7 +1851,7 @@
- Generated by Epydoc 3.0.1 on Mon Mar 09 17:56:40 2009 + Generated by Epydoc 3.0.1 on Tue Mar 10 11:14:33 2009 lastfm.album: Module for calling Album related last.fm web services API methods
  • lastfm.api: The last.fm web service API access functionalities
  • lastfm.artist: Module for calling Artist related last.fm web services API methods
    • -
  • lastfm.base
    • +
  • lastfm.base: Module containting the base class for all the classes in this + package
    • +
  • lastfm.decorators: Module containting the decorators used in the package
  • lastfm.error
  • lastfm.event
  • lastfm.filecache
    • @@ -289,6 +291,35 @@
    +

    Imports: + playlist, + Shout, + album, + api, + artist, + base, + decorators, + error, + event, + filecache, + geo, + group, + lazylist, + mixins, + objectcache, + os, + safelist, + shout, + stats, + sys, + tag, + tasteometer, + track, + user, + venue, + weeklychart, + wiki +


    @@ -320,7 +351,7 @@
    - Generated by Epydoc 3.0.1 on Mon Mar 09 17:56:40 2009 + Generated by Epydoc 3.0.1 on Tue Mar 10 11:14:34 2009
    - Generated by Epydoc 3.0.1 on Mon Mar 09 17:56:43 2009 + Generated by Epydoc 3.0.1 on Tue Mar 10 11:14:39 2009
    +

    Imports: + LastfmBase, + Cacheable, + Searchable, + Taggable, + cached_property, + top_property, + datetime, + time, + Api, + Artist, + InvalidParametersError, + Playlist, + Stats, + Tag +


    @@ -155,7 +171,7 @@
    - Generated by Epydoc 3.0.1 on Mon Mar 09 17:56:40 2009 + Generated by Epydoc 3.0.1 on Tue Mar 10 11:14:34 2009 7 8 from lastfm.base import LastfmBase 9 from lastfm.mixins import Cacheable, Searchable, Taggable -
    10 - 11 -class Album(LastfmBase, Cacheable, Searchable, Taggable): -
    12 """A class representing an album.""" -
    13 - def init(self, - 14 api, - 15 name = None, - 16 artist = None, - 17 id = None, - 18 mbid = None, - 19 url = None, - 20 release_date = None, - 21 image = None, - 22 stats = None, - 23 top_tags = None, - 24 streamable = None): -
    25 """ - 26 Create an Album object by providing all the data related to it. - 27 - 28 @param api: an instance of L{Api} - 29 @type api: L{Api} - 30 @param name: the album name - 31 @type name: L{str} - 32 @param artist: the album artist name - 33 @type artist: L{Artist} - 34 @param id: the album ID - 35 @type id: L{str} - 36 @param mbid: MBID of the album - 37 @type mbid: L{str} - 38 @param url: URL of the album on last.fm - 39 @type url: L{str} - 40 @param release_date: release date of the album - 41 @type release_date: C{datetime.datetime} - 42 @param image: the cover images of the album in various sizes - 43 @type image: L{dict} - 44 @param stats: the album statistics - 45 @type stats: L{Stats} - 46 @param top_tags: top tags for the album - 47 @type top_tags: L{list} of L{Tag} - 48 @param streamable: flag indicating if the album is streamable from last.fm - 49 @type streamable: L{bool} - 50 - 51 @raise InvalidParametersError: If an instance of L{Api} is not provided as the first - 52 parameter then an Exception is raised. - 53 """ - 54 if not isinstance(api, Api): - 55 raise InvalidParametersError("api reference must be supplied as an argument") - 56 Taggable. 10 from lastfm.decorators import cached_property, top_property +
    11 + 12 -class Album(LastfmBase, Cacheable, Searchable, Taggable): +
    13 """A class representing an album.""" +
    14 - def init(self, + 15 api, + 16 name = None, + 17 artist = None, + 18 id = None, + 19 mbid = None, + 20 url = None, + 21 release_date = None, + 22 image = None, + 23 stats = None, + 24 top_tags = None, + 25 streamable = None, + 26 subject = None): +
    27 """ + 28 Create an Album object by providing all the data related to it. + 29 + 30 @param api: an instance of L{Api} + 31 @type api: L{Api} + 32 @param name: the album name + 33 @type name: L{str} + 34 @param artist: the album artist name + 35 @type artist: L{Artist} + 36 @param id: the album ID + 37 @type id: L{str} + 38 @param mbid: MBID of the album + 39 @type mbid: L{str} + 40 @param url: URL of the album on last.fm + 41 @type url: L{str} + 42 @param release_date: release date of the album + 43 @type release_date: C{datetime.datetime} + 44 @param image: the cover images of the album in various sizes + 45 @type image: L{dict} + 46 @param stats: the album statistics + 47 @type stats: L{Stats} + 48 @param top_tags: top tags for the album + 49 @type top_tags: L{list} of L{Tag} + 50 @param streamable: flag indicating if the album is streamable from last.fm + 51 @type streamable: L{bool} + 52 @param subject: the subject to which this instance belongs to + 53 @type subject: L{User} OR L{Artist} OR L{Tag} OR L{WeeklyChart} + 54 + 55 @raise InvalidParametersError: If an instance of L{Api} is not provided as the first + 56 parameter then an Exception is raised. + 57 """ + 58 if not isinstance(api, Api): + 59 raise InvalidParametersError("api reference must be supplied as an argument") + 60 Taggable.init(self, api) - 57 self._api = api - 58 self._name = init(self, api) + 61 self._api = api + 62 self._name = name - 59 self._artist = name + 63 self._artist = artist - 60 self._id = artist + 64 self._id = id - 61 self._mbid = id + 65 self._mbid = mbid - 62 self._url = mbid + 66 self._url = url - 63 self._release_date = release_date - 64 self._image = url + 67 self._release_date = release_date + 68 self._image = image - 65 self._stats = image + 69 self._stats = stats and Stats( - 66 stats and Stats( + 70 subject = self, - 67 listeners = subject = self, + 71 listeners = stats.listeners, - 68 playcount = stats.listeners, + 72 playcount = stats.playcount, - 69 match = stats.playcount, + 73 match = stats.match, - 70 rank = stats.match, + 74 rank = stats.rank - 71 ) - 72 self._top_tags = stats.rank + 75 ) + 76 self._top_tags = top_tags - 73 self._streamable = top_tags + 77 self._streamable = streamable -
    74 - 75 @property -
    76 - def name(self): -
    77 """ - 78 name of the album - 79 @rtype: L{str} - 80 """ - 81 return self._name -
    82 - 83 @property -
    84 - def artist(self): -
    85 """ - 86 artist of the album - 87 @rtype: L{Artist} - 88 """ - 89 return self._artist -
    90 - 91 @property -
    92 - def id(self): -
    93 """ - 94 id of the album - 95 @rtype: L{int} - 96 """ - 97 if self._id is None: - 98 self.streamable + 78 self._subject = subject +
    79 + 80 @property +
    81 - def name(self): +
    82 """ + 83 name of the album + 84 @rtype: L{str} + 85 """ + 86 return self._name +
    87 + 88 @property +
    89 - def artist(self): +
    90 """ + 91 artist of the album + 92 @rtype: L{Artist} + 93 """ + 94 return self._artist +
    95 + 96 @property +
    97 - def id(self): +
    98 """ + 99 id of the album +100 @rtype: L{int} +101 """ +102 if self._id is None: +103 self._fill_info() - 99 return self._id -
    100 -101 @property -
    102 - def mbid(self): -
    103 """ -104 MBID of the album -105 @rtype: L{str} -106 """ -107 if self._mbid is None: -108 self._fill_info() +104 return self._id +
    105 +106 @property +
    107 - def mbid(self): +
    108 """ +109 MBID of the album +110 @rtype: L{str} +111 """ +112 if self._mbid is None: +113 self._fill_info() -109 return self._mbid -
    110 -111 @property -
    112 - def url(self): -
    113 """ -114 url of the album's page -115 @rtype: L{str} -116 """ -117 if self._url is None: -118 self._fill_info() +114 return self._mbid +
    115 +116 @property +
    117 - def url(self): +
    118 """ +119 url of the album's page +120 @rtype: L{str} +121 """ +122 if self._url is None: +123 self._fill_info() -119 return self._url -
    120 -121 @property -
    122 - def release_date(self): -
    123 """ -124 release date of the album -125 @rtype: C{datetime.datetime} -126 """ -127 if self._release_date is None: -128 self._fill_info() +124 return self._url +
    125 +126 @property +
    127 - def release_date(self): +
    128 """ +129 release date of the album +130 @rtype: C{datetime.datetime} +131 """ +132 if self._release_date is None: +133 self._fill_info() -129 return self._release_date -
    130 -131 @property -
    132 - def image(self): -
    133 """ -134 cover images of the album -135 @rtype: L{dict} -136 """ -137 if self._image is None: -138 self._fill_info() +134 return self._release_date +
    135 +136 @property +
    137 - def image(self): +
    138 """ +139 cover images of the album +140 @rtype: L{dict} +141 """ +142 if self._image is None: +143 self._fill_info() -139 return self._image -
    140 -141 @property -
    142 - def stats(self): -
    143 """ -144 stats related to the album -145 @rtype: L{Stats} -146 """ -147 if self._stats is None: -148 self._fill_info() +144 return self._image +
    145 +146 @property +
    147 - def stats(self): +
    148 """ +149 stats related to the album +150 @rtype: L{Stats} +151 """ +152 if self._stats is None: +153 self._fill_info() -149 return self._stats -
    150 -151 @property -
    152 - def streamable(self): -
    153 """ -154 is the album streamable on last.fm -155 @rtype: L{bool} -156 """ -157 return self._streamable -
    158 -159 @LastfmBase.cached_property -
    160 - def top_tags(self): -
    161 """ -162 top tags for the album -163 @rtype: L{list} of L{Tag} -164 """ -165 params = {'method': 'album.getInfo'} -166 if self._fill_info() +154 return self._stats +
    155 +156 @property +
    157 - def streamable(self): +
    158 """ +159 is the album streamable on last.fm +160 @rtype: L{bool} +161 """ +162 return self._streamable +
    163 +164 @cached_property +
    165 - def top_tags(self): +
    166 """ +167 top tags for the album +168 @rtype: L{list} of L{Tag} +169 """ +170 params = {'method': 'album.getInfo'} +171 if self.artist and self.artist and self.name: -167 params.update({'artist': self.name: +172 params.update({'artist': self.artist.artist.name, 'album': self.name, 'album': self.name}) -168 elif self.name}) +173 elif self.mbid: -169 params.update({'mbid': self.mbid: +174 params.update({'mbid': self.mbid}) -170 data = self._api.mbid}) +175 data = self._api._fetch_data(params).find('album') -171 return [ -172 Tag( -173 self._api, -174 _fetch_data(params).find('album') +176 return [ +177 Tag( +178 self._api, +179 subject = self, -175 subject = self, +180 name = t.findtext('name'), -176 name = t.findtext('name'), +181 url = t.findtext('url') -177 ) -178 for t in data.findall('toptags/tag') -179 ] -
    180 -181 @LastfmBase.top_property("top_tags") -
    182 - def top_tag(self): -
    183 """ -184 top tag for the album -185 @rtype: L{Tag} -186 """ -187 pass -
    188 -189 @LastfmBase.cached_property -
    190 - def playlist(self): -
    191 """ -192 playlist for the album -193 @rtype: L{Playlist} -194 """ -195 return Playlist.fetch(self._api, "lastfm://playlist/album/%s" % self.url = t.findtext('url') +182 ) +183 for t in data.findall('toptags/tag') +184 ] +
    185 +186 @top_property("top_tags") +
    187 - def top_tag(self): +
    188 """ +189 top tag for the album +190 @rtype: L{Tag} +191 """ +192 pass +
    193 +194 @cached_property +
    195 - def playlist(self): +
    196 """ +197 playlist for the album +198 @rtype: L{Playlist} +199 """ +200 return Playlist.fetch(self._api, "lastfm://playlist/album/%s" % self.id) -
    196 -197 @staticmethod -
    198 - def get_info(api, artist = None, album = None, mbid = None): -
    199 """ -200 Get the data for the album. -201 -202 @param api: an instance of L{Api} -203 @type api: L{Api} -204 @param artist: the album artist name -205 @type artist: L{str} OR L{Artist} -206 @param album: the album name -207 @type album: L{str} -208 @param mbid: MBID of the album -209 @type mbid: L{str} -210 -211 @return: an Album object corresponding the provided album name -212 @rtype: L{Album} -213 -214 @raise lastfm.InvalidParametersError: Either album and artist parameters or -215 mbid parameter has to be provided. -216 Otherwise exception is raised. -217 -218 @note: Use the L{Api.get_album} method instead of using this method directly. -219 """ -220 data = Album.id) +
    201 +202 @staticmethod +
    203 - def get_info(api, artist = None, album = None, mbid = None): +
    204 """ +205 Get the data for the album. +206 +207 @param api: an instance of L{Api} +208 @type api: L{Api} +209 @param artist: the album artist name +210 @type artist: L{str} OR L{Artist} +211 @param album: the album name +212 @type album: L{str} +213 @param mbid: MBID of the album +214 @type mbid: L{str} +215 +216 @return: an Album object corresponding the provided album name +217 @rtype: L{Album} +218 +219 @raise lastfm.InvalidParametersError: Either album and artist parameters or +220 mbid parameter has to be provided. +221 Otherwise exception is raised. +222 +223 @note: Use the L{Api.get_album} method instead of using this method directly. +224 """ +225 data = Album._fetch_data(api, _fetch_data(api, artist, album, artist, album, mbid) -221 a = Album( -222 api, -223 mbid) +226 a = Album( +227 api, +228 name = data.findtext('name'), -224 name = data.findtext('name'), +229 artist = Artist( -225 api, -226 artist = Artist( +230 api, +231 name = data.findtext('artist'), -227 ), -228 ) -229 a.name = data.findtext('artist'), +232 ), +233 ) +234 a._fill_info() -230 return a -
    231 -
    232 - def _default_params(self, extra_params = {}): -
    233 if not (self._fill_info() +235 return a +
    236 +
    237 - def _default_params(self, extra_params = {}): +
    238 if not (self.artist and self.artist and self.name): -234 raise InvalidParametersError("artist and album have to be provided.") -235 params = {'artist': self.name): +239 raise InvalidParametersError("artist and album have to be provided.") +240 params = {'artist': self.artist.artist.name, 'album': self.name, 'album': self.name} -236 params.update(extra_params) -237 return params -
    238 -239 @staticmethod -
    240 - def _fetch_data(api, -241 artist = None, -242 album = None, -243 mbid = None): -
    244 params = {'method': 'album.getInfo'} -245 if not ((name} +241 params.update(extra_params) +242 return params +
    243 +244 @staticmethod +
    245 - def _fetch_data(api, +246 artist = None, +247 album = None, +248 mbid = None): +
    249 params = {'method': 'album.getInfo'} +250 if not ((artist and album) or artist and album) or mbid): -246 raise InvalidParametersError("either (artist and album) or mbid has to be given as argument.") -247 if mbid): +251 raise InvalidParametersError("either (artist and album) or mbid has to be given as argument.") +252 if artist and album: -248 params.update({'artist': artist and album: +253 params.update({'artist': artist, 'album': album}) -249 elif artist, 'album': album}) +254 elif mbid: -250 params.update({'mbid': mbid: +255 params.update({'mbid': mbid}) -251 return api.mbid}) +256 return api._fetch_data(params).find('album') -
    252 -
    253 - def _fill_info(self): -
    254 data = Album._fetch_data(params).find('album') +
    257 +
    258 - def _fill_info(self): +
    259 data = Album._fetch_data(self._api, self._fetch_data(self._api, self.artist.artist.name, self.name, self.name) -255 self._id = int(data.findtext('id')) -256 self._mbid = data.findtext('mbid') -257 self._url = data.findtext('url') -258 self._release_date = data.findtext('releasedate') and data.findtext('releasedate').strip() and \ -259 datetime(*(time.strptime(data.findtext('releasedate').strip(), '%d %b %Y, 00:00')[0:6])) -260 self._image = dict([(i.get('size'), i.text) for i in data.findall('image')]) -261 if not self._stats: -262 self._stats = Stats( -263 name) +260 self._id = int(data.findtext('id')) +261 self._mbid = data.findtext('mbid') +262 self._url = data.findtext('url') +263 self._release_date = data.findtext('releasedate') and data.findtext('releasedate').strip() and \ +264 datetime(*(time.strptime(data.findtext('releasedate').strip(), '%d %b %Y, 00:00')[0:6])) +265 self._image = dict([(i.get('size'), i.text) for i in data.findall('image')]) +266 if not self._stats: +267 self._stats = Stats( +268 subject = self, -264 listeners = int(data.findtext('listeners')), -265 playcount = int(data.findtext('playcount')), -266 ) -267 self._top_tags = [ -268 Tag( -269 self._api, -270 subject = self, +269 listeners = int(data.findtext('listeners')), +270 playcount = int(data.findtext('playcount')), +271 ) +272 self._top_tags = [ +273 Tag( +274 self._api, +275 subject = self, -271 subject = self, +276 name = t.findtext('name'), -272 name = t.findtext('name'), +277 url = t.findtext('url') -273 ) -274 for t in data.findall('toptags/tag') -275 ] -
    276 -277 @staticmethod -
    278 - def _search_yield_func(api, album): -
    279 return Album( -280 api, -281 url = t.findtext('url') +278 ) +279 for t in data.findall('toptags/tag') +280 ] +
    281 +282 @staticmethod +
    283 - def _search_yield_func(api, album): +
    284 return Album( +285 api, +286 name = album.findtext('name'), -282 name = album.findtext('name'), +287 artist = Artist( -283 api, -284 artist = Artist( +288 api, +289 name = album.findtext('artist') -285 ), -286 name = album.findtext('artist') +290 ), +291 id = int(album.findtext('id')), -287 id = int(album.findtext('id')), +292 url = album.findtext('url'), -288 url = album.findtext('url'), +293 image = dict([(i.get('size'), i.text) for i in album.findall('image')]), -289 image = dict([(i.get('size'), i.text) for i in album.findall('image')]), +294 streamable = (album.findtext('streamable') == '1'), -290 ) -
    291 -292 @staticmethod -
    293 - def _hash_func(*args, **kwds): -
    294 try: -295 return hash("%s%s" % (kwds['name'], hash(kwds['artist']))) -296 except KeyError: -297 raise InvalidParametersError("name and artist have to be provided for hashing") -
    298 -
    299 - def __hash__(self): -
    300 return self.__class__.streamable = (album.findtext('streamable') == '1'), +295 ) +
    296 +297 @staticmethod +
    298 - def _hash_func(*args, **kwds): +
    299 try: +300 return hash("%s%s" % (kwds['name'], hash(kwds['artist']))) +301 except KeyError: +302 raise InvalidParametersError("name and artist have to be provided for hashing") +
    303 +
    304 - def __hash__(self): +
    305 return self.__class__._hash_func(_hash_func(name = self.name = self.name, name, artist = self.artist = self.artist) -
    301 -
    302 - def __eq__(self, other): -
    303 if self.artist) +
    306 +
    307 - def __eq__(self, other): +
    308 if self.id and other.id and other.id: -304 return self.id: +309 return self.id == other.id == other.id -305 if self.id +310 if self.mbid and other.mbid and other.mbid: -306 return self.mbid: +311 return self.mbid == other.mbid == other.mbid -307 if self.mbid +312 if self.url and other.url and other.url: -308 return self.url: +313 return self.url == other.url == other.url -309 if (self.url +314 if (self.name and self.name and self.artist) and (other.artist) and (other.name and other.name and other.artist): -310 return (self.artist): +315 return (self.name == other.name == other.name) and (self.name) and (self.artist == other.artist == other.artist) -311 return super(Album, self).artist) +316 return super(Album, self).__eq__(other) -
    312 -
    313 - def __lt__(self, other): -
    314 return self.__eq__(other) +
    317 +
    318 - def __lt__(self, other): +
    319 return self.name < other.name < other.name -
    315 -
    316 - def __repr__(self): -
    317 return "<lastfm.Album: '%s' by %s>" % (self.name +
    320 +
    321 - def __repr__(self): +
    322 return "<lastfm.Album: '%s' by %s>" % (self.name, self.name, self.artist.artist.name) -
    318 -319 -320 from datetime import datetime -321 import time -322 -323 from lastfm.api import Api -324 from lastfm.name) +
    323 +324 +325 from datetime import datetime +326 import time +327 +328 from lastfm.api import Api +329 from lastfm.artist import Artist -325 from lastfm.error import InvalidParametersError -326 from lastfm.artist import Artist +330 from lastfm.error import InvalidParametersError +331 from lastfm.playlist import Playlist -327 from lastfm.playlist import Playlist +332 from lastfm.stats import Stats -328 from lastfm.tag import Tag -329 + + + + + + + + + + + + + + + + + + + + + +
       Home      Trees      Indices      Help    + + +
    python-lastfm
    + + + + + +
    + + Package lastfm :: + Module decorators + + + + + + +
    [hide private]
    [frames] | no frames]
    +
    + +

    Module decorators

    source code

    +

    Module containting the decorators used in the package

    + +
    +

    Version: + 0.2 +

    +

    Author: + Abhinav Sarkar <abhinav@abhinavsarkar.net> +

    +

    License: + GNU Lesser General Public License +

    +
    + + + + + + + + + + + + + + +
    + + + + + +
    Functions[hide private]
    +
    + property + + + + + + +
    top_property(list_property_name)
    + A decorator to return a property that returns the first value of list + attribute corresponding to the provided list property name.    		 + source code + +
    + +
    + property + + + + + + +
    cached_property(func)
    + A decorator to cache the atrribute of the object.    		 + source code + +
    + +
    + function + + + + + + +
    authenticate(func)
    + A decorator to check if the current user is authenticated or not.    		 + source code + +
    + +
    + + + + + + + + + +
    + + + + + +
    Variables[hide private]
    +
    +   + + __package__ = 'lastfm' +
    +

    Imports: + copy, + LastfmError, + AuthenticationFailedError +


    + + + + + + +
    + + + + + +
    Function Details[hide private]
    +
    + +
    + +
    + + +
    +

    top_property(list_property_name) +

    +     		source code  +
    + +

    A decorator to return a property that returns the first value of list + attribute corresponding to the provided list property name.

    +

    For example, if the list property is top_albums, then the decorator + returns a property that returns the first (top most) album.

    +
    +
    Parameters:
    +
      +
    • list_property_name (str) - the name of the list property. Like 'top_albums'.
      • +
    +
    Returns: property
    +
    a property that returns the first value of list attribute + corresponding to the provided list property name
    +
    +
    +
    + +
    + +
    + + +
    +

    cached_property(func) +

    +     		source code  +
    + +

    A decorator to cache the atrribute of the object. When called for the + first time, the value of the attribute is retrived and saved in an + instance variable. Later calls return the copy of the cached value, so + that the original cached value cannot be modified.

    +
    +
    Parameters:
    +
      +
    • func (function) - the getter function of the attribute
      • +
    +
    Returns: property
    +
    a property that wraps the getter function of the attribute
    +
    +
    +
    + +
    + +
    + + +
    +

    authenticate(func) +

    +     		source code  +
    + +

    A decorator to check if the current user is authenticated or not. Used + only on the functions that need authentication. If not authenticated then + an exception is raised.

    +
    +
    Parameters:
    +
      +
    • func (function) - a function that needs to be authentication, for being called
      • +
    +
    Returns: function
    +
    a function that wraps the original function
    +
    Raises:
    +
    +
    +
    +
    +
    + + + + + + + + + + + + + + + + + + +
       Home      Trees      Indices      Help    + + +
    python-lastfm
    + + + + + +
    + Generated by Epydoc 3.0.1 on Tue Mar 10 11:14:34 2009 + + http://epydoc.sourceforge.net +
    + + + + diff --git a/docs/lastfm.decorators-pysrc.html b/docs/lastfm.decorators-pysrc.html new file mode 100644 index 0000000..1907e55 --- /dev/null +++ b/docs/lastfm.decorators-pysrc.html @@ -0,0 +1,261 @@ + + + + + lastfm.decorators + + + + + + + + + + + + + + + + + + + + + + + +
       Home      Trees      Indices      Help    + + +
    python-lastfm
    + + + + + +
    + + Package lastfm :: + Module decorators + + + + + + +
    [hide private]
    [frames] | no frames]
    +
    +

    Source Code for Module lastfm.decorators

    +
    +  1  #!/usr/bin/env python 
+  2  """Module containting the decorators used in the package""" 
+  3   
+  4  __author__ = "Abhinav Sarkar <abhinav@abhinavsarkar.net>" 
+  5  __version__ = "0.2" 
+  6  __license__ = "GNU Lesser General Public License" 
+  7   
+
      8 -def top_property(list_property_name): 
+
      9      """ 
+ 10      A decorator to return a property that returns the first value of list  
+ 11      attribute corresponding to the provided list property name. 
+ 12       
+ 13      For example, if the list property is top_albums, then the decorator returns 
+ 14      a property that returns the first (top most) album. 
+ 15       
+ 16      @param list_property_name: the name of the list property. Like 'top_albums'. 
+ 17      @type list_property_name:  L{str} 
+ 18       
+ 19      @return:                   a property that returns the first value of list attribute  
+ 20                                 corresponding to the provided list property name 
+ 21      @rtype:                    L{property} 
+ 22      """     
+ 23      def decorator(func): 
+ 24          def wrapper(ob): 
+ 25              top_list = getattr(ob, list_property_name) 
+ 26              return (len(top_list) and top_list[0] or None) 
+
     27          return property(fget = wrapper, doc = func.__doc__) 
+ 28      return decorator 
+ 29   
+
     30 -def cached_property(func): 
+
     31      """ 
+ 32      A decorator to cache the atrribute of the object. When called for the first time, 
+ 33      the value of the attribute is retrived and saved in an instance variable. Later 
+ 34      calls return the copy of the cached value, so that the original cached value 
+ 35      cannot be modified. 
+ 36       
+ 37      @param func:  the getter function of the attribute 
+ 38      @type func:   C{function} 
+ 39       
+ 40      @return:      a property that wraps the getter function of the attribute 
+ 41      @rtype:       L{property} 
+ 42      """ 
+ 43      func_name = func.func_code.co_name 
+ 44      attribute_name = "_%s" % func_name 
+ 45   
+ 46      def wrapper(ob): 
+ 47          cache_attribute = getattr(ob, attribute_name, None) 
+ 48          if cache_attribute is None: 
+ 49              cache_attribute = func(ob) 
+ 50              setattr(ob, attribute_name, cache_attribute) 
+ 51          try: 
+ 52              cp = copy.copy(cache_attribute) 
+ 53              return cp 
+ 54          except LastfmError: 
+ 55              return cache_attribute 
+
     56   
+ 57      return property(fget = wrapper, doc = func.__doc__) 
+ 58   
+
     59 -def authenticate(func): 
+
     60      """ 
+ 61      A decorator to check if the current user is authenticated or not. Used only 
+ 62      on the functions that need authentication. If not authenticated then an 
+ 63      exception is raised. 
+ 64       
+ 65      @param func:    a function that needs to be authentication, for being called 
+ 66      @type func:     C{function} 
+ 67       
+ 68      @return:        a function that wraps the original function 
+ 69      @rtype:         C{function} 
+ 70       
+ 71      @raise AuthenticationFailedError: If the user is not authenticated, then an 
+ 72                                        exception is raised. 
+ 73      """ 
+ 74      def wrapper(self, *args, **kwargs): 
+ 75          from lastfm.user import User, Api 
+ 76          username = None 
+ 77          if isinstance(self, User): 
+ 78              username = self.name 
+ 79              if self.authenticated: 
+ 80                 return func(self, *args, **kwargs) 
+ 81          elif hasattr(self, 'user'): 
+ 82              username = self.user.name 
+ 83              if self.user.authenticated: 
+ 84                 return func(self, *args, **kwargs) 
+ 85          elif hasattr(self, '_subject') and isinstance(self._subject, User): 
+ 86              username = self._subject.name 
+ 87              if self._subject.authenticated: 
+ 88                  return func(self, *args, **kwargs) 
+ 89          elif hasattr(self, '_api') and isinstance(self._api, Api): 
+ 90              try: 
+ 91                  user = self._api.get_authenticated_user() 
+ 92                  username = user.name 
+ 93                  return func(self, *args, **kwargs) 
+ 94              except AuthenticationFailedError: 
+ 95                  pass 
+ 96          raise AuthenticationFailedError( 
+ 97              "user '%s' does not have permissions to access the service" % username) 
+
     98      return wrapper 
+ 99   
+100  import copy 
+101  from lastfm.error import LastfmError, AuthenticationFailedError 
+102   
+
    +
    + + + + + + + + + + + + + + + + + + +
       Home      Trees      Indices      Help    + + +
    python-lastfm
    + + + + + +
    + Generated by Epydoc 3.0.1 on Tue Mar 10 11:14:39 2009 + + http://epydoc.sourceforge.net +
    + + + + diff --git a/docs/lastfm.error-module.html b/docs/lastfm.error-module.html index b47b25d..eabd70e 100644 --- a/docs/lastfm.error-module.html +++ b/docs/lastfm.error-module.html @@ -311,7 +311,7 @@
    - Generated by Epydoc 3.0.1 on Mon Mar 09 17:56:40 2009 + Generated by Epydoc 3.0.1 on Tue Mar 10 11:14:34 2009
    - Generated by Epydoc 3.0.1 on Mon Mar 09 17:56:43 2009 + Generated by Epydoc 3.0.1 on Tue Mar 10 11:14:36 2009
    - Generated by Epydoc 3.0.1 on Mon Mar 09 17:56:40 2009 + Generated by Epydoc 3.0.1 on Tue Mar 10 11:14:34 2009
    - Generated by Epydoc 3.0.1 on Mon Mar 09 17:56:41 2009 + Generated by Epydoc 3.0.1 on Tue Mar 10 11:14:34 2009
    - Generated by Epydoc 3.0.1 on Mon Mar 09 17:56:41 2009 + Generated by Epydoc 3.0.1 on Tue Mar 10 11:14:34 2009
    - Generated by Epydoc 3.0.1 on Mon Mar 09 17:56:41 2009 + Generated by Epydoc 3.0.1 on Tue Mar 10 11:14:34 2009
    - Generated by Epydoc 3.0.1 on Mon Mar 09 17:56:41 2009 + Generated by Epydoc 3.0.1 on Tue Mar 10 11:14:34 2009
    - Generated by Epydoc 3.0.1 on Mon Mar 09 17:56:41 2009 + Generated by Epydoc 3.0.1 on Tue Mar 10 11:14:34 2009
    - Generated by Epydoc 3.0.1 on Mon Mar 09 17:56:41 2009 + Generated by Epydoc 3.0.1 on Tue Mar 10 11:14:34 2009
    - Generated by Epydoc 3.0.1 on Mon Mar 09 17:56:41 2009 + Generated by Epydoc 3.0.1 on Tue Mar 10 11:14:34 2009
    - Generated by Epydoc 3.0.1 on Mon Mar 09 17:56:41 2009 + Generated by Epydoc 3.0.1 on Tue Mar 10 11:14:34 2009
    - Generated by Epydoc 3.0.1 on Mon Mar 09 17:56:41 2009 + Generated by Epydoc 3.0.1 on Tue Mar 10 11:14:34 2009
    - Generated by Epydoc 3.0.1 on Mon Mar 09 17:56:41 2009 + Generated by Epydoc 3.0.1 on Tue Mar 10 11:14:34 2009
    - Generated by Epydoc 3.0.1 on Mon Mar 09 17:56:41 2009 + Generated by Epydoc 3.0.1 on Tue Mar 10 11:14:34 2009
    - Generated by Epydoc 3.0.1 on Mon Mar 09 17:56:41 2009 + Generated by Epydoc 3.0.1 on Tue Mar 10 11:14:34 2009
    - Generated by Epydoc 3.0.1 on Mon Mar 09 17:56:41 2009 + Generated by Epydoc 3.0.1 on Tue Mar 10 11:14:34 2009
    - Generated by Epydoc 3.0.1 on Mon Mar 09 17:56:41 2009 + Generated by Epydoc 3.0.1 on Tue Mar 10 11:14:34 2009
    +

    Imports: + LastfmBase, + Cacheable, + Sharable, + Shoutable, + datetime, + time, + Api, + Artist, + InvalidParametersError, + Location, + Country, + Stats, + Venue +


    @@ -153,7 +168,7 @@
    - Generated by Epydoc 3.0.1 on Mon Mar 09 17:56:40 2009 + Generated by Epydoc 3.0.1 on Tue Mar 10 11:14:34 2009 25 image = None, 26 url = None, 27 stats = None, - 28 tag = None): -
    29 if not isinstance(api, Api): - 30 raise InvalidParametersError("api reference must be supplied as an argument") - 31 Sharable. 28 tag = None, + 29 subject = None): +
    30 if not isinstance(api, Api): + 31 raise InvalidParametersError("api reference must be supplied as an argument") + 32 Sharable.init(self, api) - 32 Shoutable. 33 Shoutable.init(self, api) - 33 - 34 self._api = api - 35 self._id = 34 + 35 self._api = api + 36 self._id = id - 36 self._title = 37 self._title = title - 37 self._artists = 38 self._artists = artists - 38 self._headliner = headliner - 39 self._venue = 39 self._headliner = headliner + 40 self._venue = venue - 40 self._start_date = start_date - 41 self._description = description - 42 self._image = 41 self._start_date = start_date + 42 self._description = description + 43 self._image = image - 43 self._url = 44 self._url = url - 44 self._stats = 45 self._stats = stats and Stats( - 45 46 subject = self, - 46 attendance = 47 attendance = stats.attendance, - 47 reviews = 48 reviews = stats.reviews - 48 ) - 49 self._tag = 49 ) + 50 self._tag = tag -
    50 - 51 @property -
    52 - def id(self): -
    53 """id of the event""" - 54 return self._id -
    55 - 56 @property -
    57 - def title(self): -
    58 """title of the event""" - 59 return self._title -
    60 - 61 @property -
    62 - def artists(self): -
    63 """artists performing in the event""" - 64 return self._artists -
    65 - 66 @property -
    67 - def headliner(self): -
    68 """headliner artist of the event""" - 69 return self._headliner -
    70 - 71 @property -
    72 - def venue(self): -
    73 """venue of the event""" - 74 return self._venue -
    75 - 76 @property -
    77 - def start_date(self): -
    78 """start date of the event""" - 79 return self._start_date -
    80 - 81 @property -
    82 - def description(self): -
    83 """description of the event""" - 84 return self._description -
    85 - 86 @property -
    87 - def image(self): -
    88 """poster of the event""" - 89 return self._image -
    90 - 91 @property -
    92 - def url(self): -
    93 """url of the event's page""" - 94 return self._url -
    95 - 96 @property -
    97 - def stats(self): -
    98 """stats of the event""" - 99 return self._stats -
    100 -101 @property -
    102 - def tag(self): -
    103 """tags for the event""" -104 return self._tag -
    105 -
    106 - def attend(self, status = STATUS_ATTENDING): -
    107 if status not in [Event.STATUS_ATTENDING, Event.STATUS_MAYBE, Event.STATUS_NOT]: -108 InvalidParametersError("status has to be 0, 1 or 2") -109 params = self. 51 self._subject = subject +
    52 + 53 @property +
    54 - def id(self): +
    55 """id of the event""" + 56 return self._id +
    57 + 58 @property +
    59 - def title(self): +
    60 """title of the event""" + 61 return self._title +
    62 + 63 @property +
    64 - def artists(self): +
    65 """artists performing in the event""" + 66 return self._artists +
    67 + 68 @property +
    69 - def headliner(self): +
    70 """headliner artist of the event""" + 71 return self._headliner +
    72 + 73 @property +
    74 - def venue(self): +
    75 """venue of the event""" + 76 return self._venue +
    77 + 78 @property +
    79 - def start_date(self): +
    80 """start date of the event""" + 81 return self._start_date +
    82 + 83 @property +
    84 - def description(self): +
    85 """description of the event""" + 86 return self._description +
    87 + 88 @property +
    89 - def image(self): +
    90 """poster of the event""" + 91 return self._image +
    92 + 93 @property +
    94 - def url(self): +
    95 """url of the event's page""" + 96 return self._url +
    97 + 98 @property +
    99 - def stats(self): +
    100 """stats of the event""" +101 return self._stats +
    102 +103 @property +
    104 - def tag(self): +
    105 """tags for the event""" +106 return self._tag +
    107 +
    108 - def attend(self, status = STATUS_ATTENDING): +
    109 if status not in [Event.STATUS_ATTENDING, Event.STATUS_MAYBE, Event.STATUS_NOT]: +110 InvalidParametersError("status has to be 0, 1 or 2") +111 params = self._default_params({'method': 'event.attend', 'status': status}) -110 self._api._post_data(params) -
    111 -112 @staticmethod -
    113 - def get_info(api, event): -
    114 params = {'method': 'event.getInfo', 'event': event} -115 data = api._default_params({'method': 'event.attend', 'status': status}) +112 self._api._post_data(params) +
    113 +114 @staticmethod +
    115 - def get_info(api, event): +
    116 params = {'method': 'event.getInfo', 'event': event} +117 data = api._fetch_data(params).find('event') -116 return Event._fetch_data(params).find('event') +118 return Event.create_from_data(api, data) -
    117 -118 @staticmethod -
    119 - def create_from_data(api, data): -
    120 start_date = None -121 -122 if data.findtext('startTime') is not None: -123 start_date = datetime(*( -124 time.strptime( -125 "%s %s" % ( -126 data.findtext('startDate').strip(), -127 data.findtext('startTime').strip() -128 ), -129 '%a, %d %b %Y %H:%M' -130 )[0:6]) -131 ) -132 else: -133 try: -134 start_date = datetime(*( -135 time.strptime( -136 data.findtext('startDate').strip(), -137 '%a, %d %b %Y %H:%M:%S' -138 )[0:6]) -139 ) -140 except ValueError: -141 try: -142 start_date = datetime(*( -143 time.strptime( -144 data.findtext('startDate').strip(), -145 '%a, %d %b %Y' -146 )[0:6]) -147 ) -148 except ValueError: -149 pass -150 -151 -152 return Event( -153 api, -154 create_from_data(api, data) +
    119 +120 @staticmethod +
    121 - def create_from_data(api, data): +
    122 start_date = None +123 +124 if data.findtext('startTime') is not None: +125 start_date = datetime(*( +126 time.strptime( +127 "%s %s" % ( +128 data.findtext('startDate').strip(), +129 data.findtext('startTime').strip() +130 ), +131 '%a, %d %b %Y %H:%M' +132 )[0:6]) +133 ) +134 else: +135 try: +136 start_date = datetime(*( +137 time.strptime( +138 data.findtext('startDate').strip(), +139 '%a, %d %b %Y %H:%M:%S' +140 )[0:6]) +141 ) +142 except ValueError: +143 try: +144 start_date = datetime(*( +145 time.strptime( +146 data.findtext('startDate').strip(), +147 '%a, %d %b %Y' +148 )[0:6]) +149 ) +150 except ValueError: +151 pass +152 +153 +154 return Event( +155 api, +156 id = int(data.findtext('id')), -155 title = data.findtext('title'), -156 id = int(data.findtext('id')), +157 title = data.findtext('title'), +158 artists = [Artist(api, artists = [Artist(api, name = a.text) for a in data.findall('artists/artist')], -157 headliner = Artist(api, name = a.text) for a in data.findall('artists/artist')], +159 headliner = Artist(api, name = data.findtext('artists/headliner')), -158 venue = Venue( -159 api, -160 name = data.findtext('artists/headliner')), +160 venue = Venue( +161 api, +162 name = data.findtext('venue/name'), -161 location = Location( -162 api, -163 city = data.findtext('venue/location/city'), -164 country = Country( -165 api, -166 name = data.findtext('venue/name'), +163 location = Location( +164 api, +165 city = data.findtext('venue/location/city'), +166 country = Country( +167 api, +168 name = data.findtext('venue/location/country') -167 ), -168 street = data.findtext('venue/location/street'), -169 postal_code = data.findtext('venue/location/postalcode'), -170 latitude = float(data.findtext( -171 'venue/location/{%s}point/{%s}lat' % ((Location.XMLNS,)*2) -172 )), -173 longitude = float(data.findtext( -174 'venue/location/{%s}point/{%s}long' % ((Location.XMLNS,)*2) -175 )), -176 #timezone = data.findtext('venue/location/timezone') -177 ), -178 name = data.findtext('venue/location/country') +169 ), +170 street = data.findtext('venue/location/street'), +171 postal_code = data.findtext('venue/location/postalcode'), +172 latitude = float(data.findtext( +173 'venue/location/{%s}point/{%s}lat' % ((Location.XMLNS,)*2) +174 )), +175 longitude = float(data.findtext( +176 'venue/location/{%s}point/{%s}long' % ((Location.XMLNS,)*2) +177 )), +178 #timezone = data.findtext('venue/location/timezone') +179 ), +180 url = data.findtext('venue/url') -179 ), -180 start_date = start_date, -181 description = data.findtext('description'), -182 url = data.findtext('venue/url') +181 ), +182 start_date = start_date, +183 description = data.findtext('description'), +184 image = dict([(i.get('size'), i.text) for i in data.findall('image')]), -183 image = dict([(i.get('size'), i.text) for i in data.findall('image')]), +185 url = data.findtext('url'), -184 url = data.findtext('url'), +186 stats = Stats( -185 stats = Stats( +187 subject = int(data.findtext('id')), -186 attendance = int(data.findtext('attendance')), -187 reviews = int(data.findtext('reviews')), -188 ), -189 tag = data.findtext('tag') -190 ) -
    191 -
    192 - def _default_params(self, extra_params = []): -
    193 if not self.subject = int(data.findtext('id')), +188 attendance = int(data.findtext('attendance')), +189 reviews = int(data.findtext('reviews')), +190 ), +191 tag = data.findtext('tag') +192 ) +
    193 +
    194 - def _default_params(self, extra_params = []): +
    195 if not self.id: -194 raise InvalidParametersError("id has to be provided.") -195 params = {'event': self.id: +196 raise InvalidParametersError("id has to be provided.") +197 params = {'event': self.id} -196 params.update(extra_params) -197 return params -
    198 -199 @staticmethod -
    200 - def _hash_func(*args, **kwds): -
    201 try: -202 return hash(kwds['id']) -203 except KeyError: -204 raise InvalidParametersError("id has to be provided for hashing") -
    205 -
    206 - def __hash__(self): -
    207 return Event.id} +198 params.update(extra_params) +199 return params +
    200 +201 @staticmethod +
    202 - def _hash_func(*args, **kwds): +
    203 try: +204 return hash(kwds['id']) +205 except KeyError: +206 raise InvalidParametersError("id has to be provided for hashing") +
    207 +
    208 - def __hash__(self): +
    209 return Event._hash_func(_hash_func(id = self.id = self.id) -
    208 -
    209 - def __eq__(self, other): -
    210 return self.id) +
    210 +
    211 - def __eq__(self, other): +
    212 return self.id == other.id == other.id -
    211 -
    212 - def __lt__(self, other): -
    213 return self.start_date < other.start_date -
    214 -
    215 - def __repr__(self): -
    216 return "<lastfm.Event: %s at %s on %s>" % (self.title, self.venue.id +
    213 +
    214 - def __lt__(self, other): +
    215 return self.start_date < other.start_date +
    216 +
    217 - def __repr__(self): +
    218 return "<lastfm.Event: %s at %s on %s>" % (self.title, self.venue.name, self.start_date.strftime("%x")) -
    217 -218 from datetime import datetime -219 import time -220 -221 from lastfm.api import Api -222 from lastfm.name, self.start_date.strftime("%x")) +219 +220 from datetime import datetime +221 import time +222 +223 from lastfm.api import Api +224 from lastfm.artist import Artist -223 from lastfm.error import InvalidParametersError -224 from lastfm.geo import Location, Country -225 from lastfm.artist import Artist +225 from lastfm.error import InvalidParametersError +226 from lastfm.geo import Location, Country +227 from lastfm.stats import Stats -226 from lastfm.venue import Venue -227 + + diff --git a/docs/toc.html b/docs/toc.html index 0b141c1..eb327e0 100644 --- a/docs/toc.html +++ b/docs/toc.html @@ -28,6 +28,9 @@
    lastfm.base
    +
    + lastfm.decorators
    lastfm.error
    diff --git a/lastfm/album.py b/lastfm/album.py index a7cba0b..3d8e253 100644 --- a/lastfm/album.py +++ b/lastfm/album.py @@ -7,6 +7,7 @@ __license__ = "GNU Lesser General Public License" from lastfm.base import LastfmBase from lastfm.mixins import Cacheable, Searchable, Taggable +from lastfm.decorators import cached_property, top_property class Album(LastfmBase, Cacheable, Searchable, Taggable): """A class representing an album.""" @@ -21,7 +22,8 @@ class Album(LastfmBase, Cacheable, Searchable, Taggable): image = None, stats = None, top_tags = None, - streamable = None): + streamable = None, + subject = None): """ Create an Album object by providing all the data related to it. @@ -47,6 +49,8 @@ class Album(LastfmBase, Cacheable, Searchable, Taggable): @type top_tags: L{list} of L{Tag} @param streamable: flag indicating if the album is streamable from last.fm @type streamable: L{bool} + @param subject: the subject to which this instance belongs to + @type subject: L{User} OR L{Artist} OR L{Tag} OR L{WeeklyChart} @raise InvalidParametersError: If an instance of L{Api} is not provided as the first parameter then an Exception is raised. @@ -71,6 +75,7 @@ class Album(LastfmBase, Cacheable, Searchable, Taggable): ) self._top_tags = top_tags self._streamable = streamable + self._subject = subject @property def name(self): @@ -156,7 +161,7 @@ class Album(LastfmBase, Cacheable, Searchable, Taggable): """ return self._streamable - @LastfmBase.cached_property + @cached_property def top_tags(self): """ top tags for the album @@ -178,7 +183,7 @@ class Album(LastfmBase, Cacheable, Searchable, Taggable): for t in data.findall('toptags/tag') ] - @LastfmBase.top_property("top_tags") + @top_property("top_tags") def top_tag(self): """ top tag for the album @@ -186,7 +191,7 @@ class Album(LastfmBase, Cacheable, Searchable, Taggable): """ pass - @LastfmBase.cached_property + @cached_property def playlist(self): """ playlist for the album diff --git a/lastfm/api.py b/lastfm/api.py index 7e4b8d8..c725978 100644 --- a/lastfm/api.py +++ b/lastfm/api.py @@ -6,6 +6,7 @@ __version__ = "0.2" __license__ = "GNU Lesser General Public License" from lastfm.base import LastfmBase +from lastfm.decorators import cached_property class Api(object): """The class representing the last.fm web services API.""" @@ -79,6 +80,15 @@ class Api(object): @rtype: L{str} """ return self._secret + + def set_secret(self, secret): + """ + Set the last.fm API secret. + + @param secret: the secret + @type secret: L{str} + """ + self._secret = secret @property def session_key(self): @@ -88,28 +98,37 @@ class Api(object): """ return self._session_key - def set_session_key(self): + def set_session_key(self, session_key = None): """ Set the session key for the authenticated session. - @raise lastfm.AuthenticationFailedError: API secret must be present to call this method. + + @param session_key: the session key for authentication (optional). If not provided then + a new one is fetched from last.fm + @type session_key: L{str} + + @raise lastfm.AuthenticationFailedError: Either session_key should be provided or + API secret must be present. """ - params = {'method': 'auth.getSession', 'token': self.auth_token} - self._session_key = self._fetch_data(params, sign = True).findtext('session/key') - self._auth_token = None + if session_key is not None: + self._session_key = session_key + else: + params = {'method': 'auth.getSession', 'token': self.auth_token} + self._session_key = self._fetch_data(params, sign = True).findtext('session/key') + self._auth_token = None - @LastfmBase.cached_property + @cached_property def auth_token(self): """ - The authenication token for the authenticated session. + The authentication token for the authenticated session. @rtype: L{str} """ params = {'method': 'auth.getToken'} return self._fetch_data(params, sign = True).findtext('token') - @LastfmBase.cached_property + @cached_property def auth_url(self): """ - The authenication URL for the authenticated session. + The authentication URL for the authenticated session. @rtype: L{str} """ return "http://www.last.fm/api/auth/?api_key=%s&token=%s" % (self.api_key, self.auth_token) diff --git a/lastfm/artist.py b/lastfm/artist.py index 94ebbbf..021b222 100644 --- a/lastfm/artist.py +++ b/lastfm/artist.py @@ -8,6 +8,7 @@ __license__ = "GNU Lesser General Public License" from lastfm.base import LastfmBase from lastfm.mixins import Cacheable, Searchable, Sharable, Shoutable, Taggable from lastfm.lazylist import lazylist +from lastfm.decorators import cached_property, top_property class Artist(LastfmBase, Cacheable, Sharable, Shoutable, Searchable, Taggable): """A class representing an artist.""" @@ -21,7 +22,8 @@ class Artist(LastfmBase, Cacheable, Sharable, Shoutable, Searchable, Taggable): stats = None, similar = None, top_tags = None, - bio = None): + bio = None, + subject = None): """ Create an Artist object by providing all the data related to it. @@ -45,6 +47,8 @@ class Artist(LastfmBase, Cacheable, Sharable, Shoutable, Searchable, Taggable): @type top_tags: L{list} of L{Tag} @param bio: biography of the artist @type bio: L{Wiki} + @param subject: the subject to which this instance belongs to + @type subject: L{User} OR L{Artist} OR L{Tag} OR L{Track} OR L{WeeklyChart} @raise InvalidParametersError: If an instance of L{Api} is not provided as the first parameter then an Exception is raised. @@ -77,6 +81,7 @@ class Artist(LastfmBase, Cacheable, Sharable, Shoutable, Searchable, Taggable): summary = bio.summary, content = bio.content ) + self._subject = subject @property def name(self): @@ -177,7 +182,7 @@ class Artist(LastfmBase, Cacheable, Sharable, Shoutable, Searchable, Taggable): return self.get_similar() return self._similar[:] - @LastfmBase.top_property("similar") + @top_property("similar") def most_similar(self): """ artist most similar to this artist @@ -205,7 +210,7 @@ class Artist(LastfmBase, Cacheable, Sharable, Shoutable, Searchable, Taggable): ] return self._top_tags[:] - @LastfmBase.top_property("top_tags") + @top_property("top_tags") def top_tag(self): """ top tag for the artist @@ -223,7 +228,7 @@ class Artist(LastfmBase, Cacheable, Sharable, Shoutable, Searchable, Taggable): self._fill_info() return self._bio - @LastfmBase.cached_property + @cached_property def events(self): """ events for the artist @@ -237,7 +242,7 @@ class Artist(LastfmBase, Cacheable, Sharable, Shoutable, Searchable, Taggable): for e in data.findall('event') ] - @LastfmBase.cached_property + @cached_property def top_albums(self): """ top albums of the artist @@ -264,7 +269,7 @@ class Artist(LastfmBase, Cacheable, Sharable, Shoutable, Searchable, Taggable): for a in data.findall('album') ] - @LastfmBase.top_property("top_albums") + @top_property("top_albums") def top_album(self): """ top album of the artist @@ -272,7 +277,7 @@ class Artist(LastfmBase, Cacheable, Sharable, Shoutable, Searchable, Taggable): """ pass - @LastfmBase.cached_property + @cached_property def top_fans(self): """ top fans of the artist @@ -295,14 +300,14 @@ class Artist(LastfmBase, Cacheable, Sharable, Shoutable, Searchable, Taggable): for u in data.findall('user') ] - @LastfmBase.top_property("top_fans") + @top_property("top_fans") def top_fan(self): """ top fan of the artist @rtype: L{User}""" pass - @LastfmBase.cached_property + @cached_property def top_tracks(self): """ top tracks of the artist @@ -329,7 +334,7 @@ class Artist(LastfmBase, Cacheable, Sharable, Shoutable, Searchable, Taggable): for t in data.findall('track') ] - @LastfmBase.top_property("top_tracks") + @top_property("top_tracks") def top_track(self): """ topmost track of the artist diff --git a/lastfm/base.py b/lastfm/base.py index 46af6dd..0d7c156 100644 --- a/lastfm/base.py +++ b/lastfm/base.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +"""Module containting the base class for all the classes in this package""" __author__ = "Abhinav Sarkar " __version__ = "0.2" @@ -7,51 +8,6 @@ __license__ = "GNU Lesser General Public License" class LastfmBase(object): """Base class for all the classes in this package""" - @staticmethod - def top_property(list_property_name): - def decorator(func): - def wrapper(ob): - top_list = getattr(ob, list_property_name) - return (len(top_list) and top_list[0] or None) - return property(fget = wrapper, doc = func.__doc__) - return decorator - - @staticmethod - def cached_property(func): - func_name = func.func_code.co_name - attribute_name = "_%s" % func_name - - def wrapper(ob): - cache_attribute = getattr(ob, attribute_name, None) - if cache_attribute is None: - cache_attribute = func(ob) - setattr(ob, attribute_name, cache_attribute) - try: - cp = copy.copy(cache_attribute) - return cp - except LastfmError: - return cache_attribute - - return property(fget = wrapper, doc = func.__doc__) - - @staticmethod - def autheticate(func): - def wrapper(self, *args, **kwargs): - from lastfm.user import User - user = None - if isinstance(self, User): - user = self.name - if self.autheticated: - return func(self, *args, **kwargs) - elif hasattr(self, 'user'): - user = self.user.name - if self.user.autheticated: - return func(self, *args, **kwargs) - - raise AuthenticationFailedError( - "user '%s' does not have permissions to access the service" % user) - return wrapper - def __gt__(self, other): return not (self.__lt__(other) or self.__eq(other)) @@ -62,7 +18,4 @@ class LastfmBase(object): return not self.__lt__(other) def __le__(self, other): - return not self.__gt__(other) - -import copy -from lastfm.error import LastfmError, AuthenticationFailedError \ No newline at end of file + return not self.__gt__(other) \ No newline at end of file diff --git a/lastfm/decorators.py b/lastfm/decorators.py new file mode 100644 index 0000000..dcb1377 --- /dev/null +++ b/lastfm/decorators.py @@ -0,0 +1,101 @@ +#!/usr/bin/env python +"""Module containting the decorators used in the package""" + +__author__ = "Abhinav Sarkar " +__version__ = "0.2" +__license__ = "GNU Lesser General Public License" + +def top_property(list_property_name): + """ + A decorator to return a property that returns the first value of list + attribute corresponding to the provided list property name. + + For example, if the list property is top_albums, then the decorator returns + a property that returns the first (top most) album. + + @param list_property_name: the name of the list property. Like 'top_albums'. + @type list_property_name: L{str} + + @return: a property that returns the first value of list attribute + corresponding to the provided list property name + @rtype: L{property} + """ + def decorator(func): + def wrapper(ob): + top_list = getattr(ob, list_property_name) + return (len(top_list) and top_list[0] or None) + return property(fget = wrapper, doc = func.__doc__) + return decorator + +def cached_property(func): + """ + A decorator to cache the atrribute of the object. When called for the first time, + the value of the attribute is retrived and saved in an instance variable. Later + calls return the copy of the cached value, so that the original cached value + cannot be modified. + + @param func: the getter function of the attribute + @type func: C{function} + + @return: a property that wraps the getter function of the attribute + @rtype: L{property} + """ + func_name = func.func_code.co_name + attribute_name = "_%s" % func_name + + def wrapper(ob): + cache_attribute = getattr(ob, attribute_name, None) + if cache_attribute is None: + cache_attribute = func(ob) + setattr(ob, attribute_name, cache_attribute) + try: + cp = copy.copy(cache_attribute) + return cp + except LastfmError: + return cache_attribute + + return property(fget = wrapper, doc = func.__doc__) + +def authenticate(func): + """ + A decorator to check if the current user is authenticated or not. Used only + on the functions that need authentication. If not authenticated then an + exception is raised. + + @param func: a function that needs to be authentication, for being called + @type func: C{function} + + @return: a function that wraps the original function + @rtype: C{function} + + @raise AuthenticationFailedError: If the user is not authenticated, then an + exception is raised. + """ + def wrapper(self, *args, **kwargs): + from lastfm.user import User, Api + username = None + if isinstance(self, User): + username = self.name + if self.authenticated: + return func(self, *args, **kwargs) + elif hasattr(self, 'user'): + username = self.user.name + if self.user.authenticated: + return func(self, *args, **kwargs) + elif hasattr(self, '_subject') and isinstance(self._subject, User): + username = self._subject.name + if self._subject.authenticated: + return func(self, *args, **kwargs) + elif hasattr(self, '_api') and isinstance(self._api, Api): + try: + user = self._api.get_authenticated_user() + username = user.name + return func(self, *args, **kwargs) + except AuthenticationFailedError: + pass + raise AuthenticationFailedError( + "user '%s' does not have permissions to access the service" % username) + return wrapper + +import copy +from lastfm.error import LastfmError, AuthenticationFailedError \ No newline at end of file diff --git a/lastfm/event.py b/lastfm/event.py index 49fd69f..01bfcc8 100644 --- a/lastfm/event.py +++ b/lastfm/event.py @@ -25,7 +25,8 @@ class Event(LastfmBase, Cacheable, Sharable, Shoutable): image = None, url = None, stats = None, - tag = None): + tag = None, + subject = None): if not isinstance(api, Api): raise InvalidParametersError("api reference must be supplied as an argument") Sharable.init(self, api) @@ -47,6 +48,7 @@ class Event(LastfmBase, Cacheable, Sharable, Shoutable): reviews = stats.reviews ) self._tag = tag + self._subject = subject @property def id(self): diff --git a/lastfm/geo.py b/lastfm/geo.py index fd0a451..a82df41 100644 --- a/lastfm/geo.py +++ b/lastfm/geo.py @@ -7,6 +7,7 @@ __license__ = "GNU Lesser General Public License" from lastfm.base import LastfmBase from lastfm.mixins import Cacheable from lastfm.lazylist import lazylist +from lastfm.decorators import cached_property, top_property class Geo(object): """A class representing an geographic location.""" @@ -106,7 +107,8 @@ class Location(LastfmBase, Cacheable): postal_code = None, latitude = None, longitude = None, - timezone = None): + timezone = None, + **kwargs): if not isinstance(api, Api): raise InvalidParametersError("api reference must be supplied as an argument") self._api = api @@ -153,14 +155,14 @@ class Location(LastfmBase, Cacheable): """timezone in which the location is situated""" return self._timezone - @LastfmBase.cached_property + @cached_property def top_tracks(self): """top tracks of the location""" if self.country is None or self.city is None: raise InvalidParametersError("country and city of this location are required for calling this method") return Geo.get_top_tracks(self._api, self.country.name, self.city) - @LastfmBase.top_property("top_tracks") + @top_property("top_tracks") def top_track(self): """top track of the location""" pass @@ -173,7 +175,7 @@ class Location(LastfmBase, Cacheable): self.longitude, distance) - @LastfmBase.cached_property + @cached_property def events(self): """events taking place at/around the location""" return self.get_events() @@ -462,7 +464,8 @@ class Country(LastfmBase, Cacheable): 'ZW': 'Zimbabwe'} def init(self, api, - name = None): + name = None, + **kwargs): if not isinstance(api, Api): raise InvalidParametersError("api reference must be supplied as an argument") self._api = api @@ -473,12 +476,12 @@ class Country(LastfmBase, Cacheable): """name of the country""" return self._name - @LastfmBase.cached_property + @cached_property def top_artists(self): """top artists of the country""" return Geo.get_top_artists(self._api, self.name) - @LastfmBase.top_property("top_artists") + @top_property("top_artists") def top_artist(self): """top artist of the country""" pass @@ -486,17 +489,17 @@ class Country(LastfmBase, Cacheable): def get_top_tracks(self, location = None): return Geo.get_top_tracks(self._api, self.name, location) - @LastfmBase.cached_property + @cached_property def top_tracks(self): """top tracks of the country""" return self.get_top_tracks() - @LastfmBase.top_property("top_tracks") + @top_property("top_tracks") def top_track(self): """top track of the country""" pass - @LastfmBase.cached_property + @cached_property def events(self): """events taking place at/around the location""" return Geo.get_events(self._api, self.name) diff --git a/lastfm/group.py b/lastfm/group.py index cbbf058..2e3e1ec 100644 --- a/lastfm/group.py +++ b/lastfm/group.py @@ -7,12 +7,14 @@ __license__ = "GNU Lesser General Public License" from lastfm.base import LastfmBase from lastfm.mixins import Cacheable from lastfm.lazylist import lazylist +from lastfm.decorators import cached_property, top_property class Group(LastfmBase, Cacheable): """A class representing a group on last.fm.""" def init(self, api, - name = None): + name = None, + **kwargs): if not isinstance(api, Api): raise InvalidParametersError("api reference must be supplied as an argument") self._api = api @@ -22,7 +24,7 @@ class Group(LastfmBase, Cacheable): def name(self): return self._name - @LastfmBase.cached_property + @cached_property def weekly_chart_list(self): params = self._default_params({'method': 'group.getWeeklyChartList'}) data = self._api._fetch_data(params).find('weeklychartlist') @@ -39,11 +41,11 @@ class Group(LastfmBase, Cacheable): data = self._api._fetch_data(params).find('weeklyalbumchart') return WeeklyAlbumChart.create_from_data(self._api, self, data) - @LastfmBase.cached_property + @cached_property def recent_weekly_album_chart(self): return self.get_weekly_album_chart() - @LastfmBase.cached_property + @cached_property def weekly_album_chart_list(self): wcl = list(self.weekly_chart_list) wcl.reverse() @@ -61,11 +63,11 @@ class Group(LastfmBase, Cacheable): data = self._api._fetch_data(params).find('weeklyartistchart') return WeeklyArtistChart.create_from_data(self._api, self, data) - @LastfmBase.cached_property + @cached_property def recent_weekly_artist_chart(self): return self.get_weekly_artist_chart() - @LastfmBase.cached_property + @cached_property def weekly_artist_chart_list(self): wcl = list(self.weekly_chart_list) wcl.reverse() @@ -83,11 +85,11 @@ class Group(LastfmBase, Cacheable): data = self._api._fetch_data(params).find('weeklytrackchart') return WeeklyTrackChart.create_from_data(self._api, self, data) - @LastfmBase.cached_property + @cached_property def recent_weekly_track_chart(self): return self.get_weekly_track_chart() - @LastfmBase.cached_property + @cached_property def weekly_track_chart_list(self): wcl = list(self.weekly_chart_list) wcl.reverse() @@ -97,7 +99,7 @@ class Group(LastfmBase, Cacheable): yield self.get_weekly_track_chart(wc.start, wc.end) return gen() - @LastfmBase.cached_property + @cached_property def members(self): params = self._default_params({'method': 'group.getMembers'}) diff --git a/lastfm/mixins/cacheable.py b/lastfm/mixins/cacheable.py index 2f90f27..8041621 100644 --- a/lastfm/mixins/cacheable.py +++ b/lastfm/mixins/cacheable.py @@ -17,7 +17,7 @@ class Cacheable(object): subject = None if 'subject' in kwds and not cls.__name__.startswith('Weekly'): subject = kwds['subject'] - del kwds['subject'] + #del kwds['subject'] if 'bypass_registry' in kwds: del kwds['bypass_registry'] diff --git a/lastfm/mixins/sharable.py b/lastfm/mixins/sharable.py index e5d827e..6afeab2 100644 --- a/lastfm/mixins/sharable.py +++ b/lastfm/mixins/sharable.py @@ -4,10 +4,13 @@ __author__ = "Abhinav Sarkar " __version__ = "0.2" __license__ = "GNU Lesser General Public License" +from lastfm.decorators import authenticate + class Sharable(object): def init(self, api): self._api = api - + + @authenticate def share(self, recipient, message = None): from lastfm.user import User params = self._default_params({'method': '%s.share' % self.__class__.__name__.lower()}) diff --git a/lastfm/mixins/shoutable.py b/lastfm/mixins/shoutable.py index cfa99b6..fcd96db 100644 --- a/lastfm/mixins/shoutable.py +++ b/lastfm/mixins/shoutable.py @@ -5,12 +5,13 @@ __version__ = "0.2" __license__ = "GNU Lesser General Public License" from lastfm.base import LastfmBase +from lastfm.decorators import cached_property, top_property class Shoutable(object): def init(self, api): self._api = api - @LastfmBase.cached_property + @cached_property def shouts(self): """shouts for this ssubject""" from lastfm.shout import Shout @@ -27,7 +28,7 @@ class Shoutable(object): for s in data.findall('shout') ] - @LastfmBase.top_property("shouts") + @top_property("shouts") def recent_shout(self): """recent shout for this subject""" pass diff --git a/lastfm/mixins/taggable.py b/lastfm/mixins/taggable.py index 72e26dc..d9fd6d7 100644 --- a/lastfm/mixins/taggable.py +++ b/lastfm/mixins/taggable.py @@ -6,12 +6,14 @@ __license__ = "GNU Lesser General Public License" from lastfm.base import LastfmBase from lastfm.safelist import SafeList +from lastfm.decorators import cached_property, authenticate class Taggable(object): def init(self, api): self._api = api - @LastfmBase.cached_property + @cached_property + @authenticate def tags(self): from lastfm.tag import Tag params = self._default_params({'method': '%s.getTags' % self.__class__.__name__.lower()}) @@ -26,6 +28,7 @@ class Taggable(object): ], self.add_tags, self.remove_tag) + @authenticate def add_tags(self, tags): from lastfm.tag import Tag while(len(tags) > 10): @@ -49,6 +52,7 @@ class Taggable(object): self._api._post_data(params) self._tags = None + @authenticate def remove_tag(self, tag): from lastfm.tag import Tag if isinstance(tag, Tag): diff --git a/lastfm/playlist.py b/lastfm/playlist.py index db6b472..4fc3098 100644 --- a/lastfm/playlist.py +++ b/lastfm/playlist.py @@ -6,15 +6,16 @@ __license__ = "GNU Lesser General Public License" from lastfm.base import LastfmBase from lastfm.mixins import Cacheable +from lastfm.decorators import cached_property class Playlist(LastfmBase, Cacheable): """A class representing an XPSF playlist.""" - def init(self, api, url): + def init(self, api, url, **kwargs): self._api = api self._data = None self._url = url - @LastfmBase.cached_property + @cached_property def data(self): """playlist's data""" params = {'method': 'playlist.fetch', 'playlistURL': self._url} diff --git a/lastfm/shout.py b/lastfm/shout.py index 49aa0bb..b47c80a 100644 --- a/lastfm/shout.py +++ b/lastfm/shout.py @@ -6,6 +6,7 @@ __license__ = "GNU Lesser General Public License" from lastfm.base import LastfmBase from lastfm.mixins import Cacheable +from lastfm.decorators import cached_property class Shout(LastfmBase, Cacheable): """A class representing a shout.""" @@ -13,20 +14,21 @@ class Shout(LastfmBase, Cacheable): def init(self, body = None, author = None, - date = None): + date = None, + **kwargs): self._body = body self._author = author self._date = date - @LastfmBase.cached_property + @cached_property def body(self): return self._body - @LastfmBase.cached_property + @cached_property def author(self): return self._author - @LastfmBase.cached_property + @cached_property def date(self): return self._date diff --git a/lastfm/tag.py b/lastfm/tag.py index 0bfa91e..1ca8ace 100644 --- a/lastfm/tag.py +++ b/lastfm/tag.py @@ -7,6 +7,7 @@ __license__ = "GNU Lesser General Public License" from lastfm.base import LastfmBase from lastfm.mixins import Cacheable, Searchable from lastfm.lazylist import lazylist +from lastfm.decorators import cached_property, top_property class Tag(LastfmBase, Cacheable, Searchable): """A class representing a tag.""" @@ -15,7 +16,8 @@ class Tag(LastfmBase, Cacheable, Searchable): name = None, url = None, streamable = None, - stats = None): + stats = None, + **kwargs): if not isinstance(api, Api): raise InvalidParametersError("api reference must be supplied as an argument") self._api = api @@ -47,7 +49,7 @@ class Tag(LastfmBase, Cacheable, Searchable): def stats(self): return self._stats - @LastfmBase.cached_property + @cached_property def similar(self): """tags similar to this tag""" params = self._default_params({'method': 'tag.getSimilar'}) @@ -63,12 +65,12 @@ class Tag(LastfmBase, Cacheable, Searchable): for t in data.findall('tag') ] - @LastfmBase.top_property("similar") + @top_property("similar") def most_similar(self): """most similar tag to this tag""" pass - @LastfmBase.cached_property + @cached_property def top_albums(self): """top albums for the tag""" params = self._default_params({'method': 'tag.getTopAlbums'}) @@ -97,12 +99,12 @@ class Tag(LastfmBase, Cacheable, Searchable): for a in data.findall('album') ] - @LastfmBase.top_property("top_albums") + @top_property("top_albums") def top_album(self): """top album for the tag""" pass - @LastfmBase.cached_property + @cached_property def top_artists(self): """top artists for the tag""" params = self._default_params({'method': 'tag.getTopArtists'}) @@ -125,12 +127,12 @@ class Tag(LastfmBase, Cacheable, Searchable): for a in data.findall('artist') ] - @LastfmBase.top_property("top_artists") + @top_property("top_artists") def top_artist(self): """top artist for the tag""" pass - @LastfmBase.cached_property + @cached_property def top_tracks(self): """top tracks for the tag""" params = self._default_params({'method': 'tag.getTopTracks'}) @@ -160,17 +162,17 @@ class Tag(LastfmBase, Cacheable, Searchable): for t in data.findall('track') ] - @LastfmBase.top_property("top_tracks") + @top_property("top_tracks") def top_track(self): """top track for the tag""" pass - @LastfmBase.cached_property + @cached_property def playlist(self): return Playlist.fetch(self._api, "lastfm://playlist/tag/%s/freetracks" % self.name) - @LastfmBase.cached_property + @cached_property def weekly_chart_list(self): params = self._default_params({'method': 'tag.getWeeklyChartList'}) data = self._api._fetch_data(params).find('weeklychartlist') @@ -190,11 +192,11 @@ class Tag(LastfmBase, Cacheable, Searchable): data = self._api._fetch_data(params).find('weeklyartistchart') return WeeklyArtistChart.create_from_data(self._api, self, data) - @LastfmBase.cached_property + @cached_property def recent_weekly_artist_chart(self): return self.get_weekly_artist_chart() - @LastfmBase.cached_property + @cached_property def weekly_artist_chart_list(self): wcl = list(self.weekly_chart_list) wcl.reverse() diff --git a/lastfm/track.py b/lastfm/track.py index 63e89f7..d9b2135 100644 --- a/lastfm/track.py +++ b/lastfm/track.py @@ -7,6 +7,7 @@ __license__ = "GNU Lesser General Public License" from lastfm.base import LastfmBase from lastfm.mixins import Cacheable, Searchable, Sharable, Taggable from lastfm.lazylist import lazylist +from lastfm.decorators import cached_property, top_property class Track(LastfmBase, Cacheable, Sharable, Searchable, Taggable): """A class representing a track.""" @@ -25,7 +26,8 @@ class Track(LastfmBase, Cacheable, Sharable, Searchable, Taggable): stats = None, played_on = None, loved_on = None, - wiki = None): + wiki = None, + subject = None): if not isinstance(api, Api): raise InvalidParametersError("api reference must be supplied as an argument") Taggable.init(self, api) @@ -57,6 +59,7 @@ class Track(LastfmBase, Cacheable, Sharable, Searchable, Taggable): summary = wiki.summary, content = wiki.content ) + self._subject = subject @property def id(self): @@ -145,7 +148,7 @@ class Track(LastfmBase, Cacheable, Sharable, Searchable, Taggable): self._fill_info() return self._wiki - @LastfmBase.cached_property + @cached_property def similar(self): """tracks similar to this track""" params = Track._check_params( @@ -179,12 +182,12 @@ class Track(LastfmBase, Cacheable, Sharable, Searchable, Taggable): for t in data.findall('track') ] - @LastfmBase.top_property("similar") + @top_property("similar") def most_similar(self): """track most similar to this track""" pass - @LastfmBase.cached_property + @cached_property def top_fans(self): """top fans of the track""" params = Track._check_params( @@ -209,12 +212,12 @@ class Track(LastfmBase, Cacheable, Sharable, Searchable, Taggable): for u in data.findall('user') ] - @LastfmBase.top_property("top_fans") + @top_property("top_fans") def top_fan(self): """topmost fan of the track""" pass - @LastfmBase.cached_property + @cached_property def top_tags(self): """top tags for the track""" params = Track._check_params( @@ -238,7 +241,7 @@ class Track(LastfmBase, Cacheable, Sharable, Searchable, Taggable): for t in data.findall('tag') ] - @LastfmBase.top_property("top_tags") + @top_property("top_tags") def top_tag(self): """topmost tag for the track""" pass diff --git a/lastfm/user.py b/lastfm/user.py index 9c9254b..adea0d3 100644 --- a/lastfm/user.py +++ b/lastfm/user.py @@ -8,6 +8,7 @@ from lastfm.base import LastfmBase from lastfm.mixins import Cacheable, Shoutable from lastfm.lazylist import lazylist import lastfm.playlist +from lastfm.decorators import cached_property, top_property, authenticate class User(LastfmBase, Cacheable, Shoutable): """A class representing an user.""" @@ -17,7 +18,8 @@ class User(LastfmBase, Cacheable, Shoutable): real_name = None, url = None, image = None, - stats = None): + stats = None, + **kwargs): if not isinstance(api, Api): raise InvalidParametersError("api reference must be supplied as an argument") Shoutable.init(self, api) @@ -60,45 +62,45 @@ class User(LastfmBase, Cacheable, Shoutable): return self._stats @property - @LastfmBase.autheticate + @authenticate def language(self): """lang for the user""" return self._language @property - @LastfmBase.autheticate + @authenticate def country(self): """country for the user""" return self._country @property - @LastfmBase.autheticate + @authenticate def age(self): """age for the user""" return self._age @property - @LastfmBase.autheticate + @authenticate def gender(self): """stats for the user""" return self._gender @property - @LastfmBase.autheticate + @authenticate def subscriber(self): """is the user a subscriber""" return self._subscriber @property - def autheticated(self): - """is the user autheticated""" + def authenticated(self): + """is the user authenticated""" try: auth_user = self._api.get_authenticated_user() return auth_user == self except AuthenticationFailedError: return False - @LastfmBase.cached_property + @cached_property def events(self): params = self._default_params({'method': 'user.getEvents'}) data = self._api._fetch_data(params).find('events') @@ -134,11 +136,11 @@ class User(LastfmBase, Cacheable, Shoutable): yield e return gen() - @LastfmBase.cached_property + @cached_property def past_events(self): return self.get_past_events() - @LastfmBase.autheticate + @authenticate def get_recommended_events(self, limit = None): params = {'method': 'user.getRecommendedEvents'} if limit is not None: @@ -164,7 +166,7 @@ class User(LastfmBase, Cacheable, Shoutable): yield e return gen() - @LastfmBase.cached_property + @cached_property def recommended_events(self): return self.get_recommended_events() @@ -187,7 +189,7 @@ class User(LastfmBase, Cacheable, Shoutable): ] - @LastfmBase.cached_property + @cached_property def friends(self): """friends of the user""" return self.get_friends() @@ -213,17 +215,17 @@ class User(LastfmBase, Cacheable, Shoutable): for u in data.findall('user') ] - @LastfmBase.cached_property + @cached_property def neighbours(self): """neighbours of the user""" return self.get_neighbours() - @LastfmBase.top_property("neighbours") + @top_property("neighbours") def nearest_neighbour(self): """nearest neightbour of the user""" pass - @LastfmBase.cached_property + @cached_property def playlists(self): """playlists of the user""" params = self._default_params({'method': 'user.getPlaylists'}) @@ -245,7 +247,7 @@ class User(LastfmBase, Cacheable, Shoutable): for p in data.findall('playlist') ] - @LastfmBase.autheticate + @authenticate def create_playlist(self, title, description = None): params = {'method': 'playlist.create', 'title': title} @@ -254,7 +256,7 @@ class User(LastfmBase, Cacheable, Shoutable): self._api._post_data(params) self._playlists = None - @LastfmBase.cached_property + @cached_property def loved_tracks(self): params = self._default_params({'method': 'user.getLovedTracks'}) data = self._api._fetch_data(params).find('lovedtracks') @@ -327,7 +329,7 @@ class User(LastfmBase, Cacheable, Shoutable): """recent tracks played by the user""" return self.get_recent_tracks() - @LastfmBase.top_property("recent_tracks") + @top_property("recent_tracks") def most_recent_track(self): """most recent track played by the user""" pass @@ -362,12 +364,12 @@ class User(LastfmBase, Cacheable, Shoutable): for a in data.findall('album') ] - @LastfmBase.cached_property + @cached_property def top_albums(self): """overall top albums of the user""" return self.get_top_albums() - @LastfmBase.top_property("top_albums") + @top_property("top_albums") def top_album(self): """overall top most album of the user""" pass @@ -396,18 +398,18 @@ class User(LastfmBase, Cacheable, Shoutable): for a in data.findall('artist') ] - @LastfmBase.cached_property + @cached_property def top_artists(self): """top artists of the user""" return self.get_top_artists() - @LastfmBase.top_property("top_artists") + @top_property("top_artists") def top_artist(self): """top artist of the user""" pass - @LastfmBase.cached_property - @LastfmBase.autheticate + @cached_property + @authenticate def recommended_artists(self): params = {'method': 'user.getRecommendedArtists'} @@ -468,12 +470,12 @@ class User(LastfmBase, Cacheable, Shoutable): for t in data.findall('track') ] - @LastfmBase.cached_property + @cached_property def top_tracks(self): """top tracks of the user""" return self.get_top_tracks() - @LastfmBase.top_property("top_tracks") + @top_property("top_tracks") def top_track(self): """top track of the user""" return (len(self.top_tracks) and self.top_tracks[0] or None) @@ -497,17 +499,17 @@ class User(LastfmBase, Cacheable, Shoutable): for t in data.findall('tag') ] - @LastfmBase.cached_property + @cached_property def top_tags(self): """top tags of the user""" return self.get_top_tags() - @LastfmBase.top_property("top_tags") + @top_property("top_tags") def top_tag(self): """top tag of the user""" pass - @LastfmBase.cached_property + @cached_property def weekly_chart_list(self): params = self._default_params({'method': 'user.getWeeklyChartList'}) data = self._api._fetch_data(params).find('weeklychartlist') @@ -524,11 +526,11 @@ class User(LastfmBase, Cacheable, Shoutable): data = self._api._fetch_data(params).find('weeklyalbumchart') return WeeklyAlbumChart.create_from_data(self._api, self, data) - @LastfmBase.cached_property + @cached_property def recent_weekly_album_chart(self): return self.get_weekly_album_chart() - @LastfmBase.cached_property + @cached_property def weekly_album_chart_list(self): wcl = list(self.weekly_chart_list) wcl.reverse() @@ -549,11 +551,11 @@ class User(LastfmBase, Cacheable, Shoutable): data = self._api._fetch_data(params).find('weeklyartistchart') return WeeklyArtistChart.create_from_data(self._api, self, data) - @LastfmBase.cached_property + @cached_property def recent_weekly_artist_chart(self): return self.get_weekly_artist_chart() - @LastfmBase.cached_property + @cached_property def weekly_artist_chart_list(self): wcl = list(self.weekly_chart_list) wcl.reverse() @@ -574,11 +576,11 @@ class User(LastfmBase, Cacheable, Shoutable): data = self._api._fetch_data(params).find('weeklytrackchart') return WeeklyTrackChart.create_from_data(self._api, self, data) - @LastfmBase.cached_property + @cached_property def recent_weekly_track_chart(self): return self.get_weekly_track_chart() - @LastfmBase.cached_property + @cached_property def weekly_track_chart_list(self): wcl = list(self.weekly_chart_list) wcl.reverse() @@ -597,11 +599,11 @@ class User(LastfmBase, Cacheable, Shoutable): WeeklyChart._check_weekly_chart_params({}, start, end) return WeeklyTagChart.create_from_data(self._api, self, start, end) - @LastfmBase.cached_property + @cached_property def recent_weekly_tag_chart(self): return self.get_weekly_tag_chart() - @LastfmBase.cached_property + @cached_property def weekly_tag_chart_list(self): wcl = list(self.weekly_chart_list) wcl.reverse() @@ -712,7 +714,7 @@ class User(LastfmBase, Cacheable, Shoutable): def user(self): return self._creator - @LastfmBase.autheticate + @authenticate def add_track(self, track, artist = None): params = {'method': 'playlist.addTrack', 'playlistID': self.id} if isinstance(track, Track): @@ -800,11 +802,11 @@ class User(LastfmBase, Cacheable, Shoutable): yield a return gen() - @LastfmBase.cached_property + @cached_property def albums(self): return self.get_albums() - @LastfmBase.autheticate + @authenticate def add_album(self, album, artist = None): params = {'method': 'library.addAlbum'} if isinstance(album, Album): @@ -864,11 +866,11 @@ class User(LastfmBase, Cacheable, Shoutable): yield a return gen() - @LastfmBase.cached_property + @cached_property def artists(self): return self.get_artists() - @LastfmBase.autheticate + @authenticate def add_artist(self, artist): params = {'method': 'library.addArtist'} if isinstance(artist, Artist): @@ -928,11 +930,11 @@ class User(LastfmBase, Cacheable, Shoutable): yield t return gen() - @LastfmBase.cached_property + @cached_property def tracks(self): return self.get_tracks() - @LastfmBase.autheticate + @authenticate def add_track(self, track, artist = None): params = {'method': 'library.addTrack'} if isinstance(track, Track): diff --git a/lastfm/venue.py b/lastfm/venue.py index 43b1df9..a4ea5d3 100644 --- a/lastfm/venue.py +++ b/lastfm/venue.py @@ -7,6 +7,7 @@ __license__ = "GNU Lesser General Public License" from lastfm.base import LastfmBase from lastfm.mixins import Cacheable, Searchable from lastfm.lazylist import lazylist +from lastfm.decorators import cached_property class Venue(LastfmBase, Cacheable, Searchable): """A class representing a venue of an event""" @@ -15,7 +16,8 @@ class Venue(LastfmBase, Cacheable, Searchable): id = None, name = None, location = None, - url = None): + url = None, + **kwargs): if not isinstance(api, Api): raise InvalidParametersError("api reference must be supplied as an argument") self._api = api @@ -44,7 +46,7 @@ class Venue(LastfmBase, Cacheable, Searchable): """url of the event's page""" return self._url - @LastfmBase.cached_property + @cached_property def events(self): params = self._default_params({'method': 'venue.getEvents'}) data = self._api._fetch_data(params).find('events') @@ -80,7 +82,7 @@ class Venue(LastfmBase, Cacheable, Searchable): yield e return gen() - @LastfmBase.cached_property + @cached_property def past_events(self): return self.get_past_events()