Hirad/pylast
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

changed the output of Artist.get_similar and Track.get_similar to include the match value (API breakage) - Closes issue #22

Browse source
This commit is contained in:
Amr Hassan 2009-09-08 01:40:41 +00:00
parent 3a9dd57492
commit ae32b1bb6d
2 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.build
View file

@ -1 +1 @@
7 8

30
pylast.py
View file

@ -477,7 +477,7 @@ class Network(object):
list = [] list = []
for node in doc.getElementsByTagName("tag"): for node in doc.getElementsByTagName("tag"):
tag = Tag(_extract(node, "name"), self) tag = Tag(_extract(node, "name"), self)
weight = _extract(node, "count") weight = _number(_extract(node, "count"))
list.append(TopItem(tag, weight)) list.append(TopItem(tag, weight))
@ -996,6 +996,7 @@ def _namedtuple(name, children):
return fancydict return fancydict
TopItem = _namedtuple("TopItem", ["item", "weight"]) TopItem = _namedtuple("TopItem", ["item", "weight"])
SimilarItem = _namedtuple("SimilarItem", ["item", "match"])
LibraryItem = _namedtuple("LibraryItem", ["item", "playcount", "tagcount"]) LibraryItem = _namedtuple("LibraryItem", ["item", "playcount", "tagcount"])
PlayedTrack = _namedtuple("PlayedTrack", ["track", "playback_date", "timestamp"]) PlayedTrack = _namedtuple("PlayedTrack", ["track", "playback_date", "timestamp"])
ImageSizes = _namedtuple("ImageSizes", ["original", "large", "largesquare", "medium", "small", "extralarge"]) ImageSizes = _namedtuple("ImageSizes", ["original", "large", "largesquare", "medium", "small", "extralarge"])
@ -1444,11 +1445,12 @@ class Artist(_BaseObject, _Taggable):
doc = self._request('artist.getSimilar', True, params) doc = self._request('artist.getSimilar', True, params)
names = _extract_all(doc, 'name') names = _extract_all(doc, "name")
matches = _extract_all(doc, "match")
artists = [] artists = []
for name in names: for i in range(0, len(names)):
artists.append(Artist(name, self.network)) artists.append(SimilarItem(Artist(names[i], self.network), _number(matches[i])))
return artists return artists
@ -2250,7 +2252,7 @@ class Tag(_BaseObject):
list = [] list = []
for node in doc.getElementsByTagName("artist"): for node in doc.getElementsByTagName("artist"):
item = Artist(_extract(node, "name"), self.network) item = Artist(_extract(node, "name"), self.network)
weight = _extract(node, "weight") weight = _number(_extract(node, "weight"))
list.append(TopItem(item, weight)) list.append(TopItem(item, weight))
return list return list
@ -2432,8 +2434,9 @@ class Track(_BaseObject, _Taggable):
for node in doc.getElementsByTagName("track"): for node in doc.getElementsByTagName("track"):
title = _extract(node, 'name') title = _extract(node, 'name')
artist = _extract(node, 'name', 1) artist = _extract(node, 'name', 1)
match = _number(_extract(node, "match"))
list.append(Track(artist, title, self.network)) list.append(SimilarItem(Track(artist, title, self.network), match))
return list return list
@ -2579,7 +2582,7 @@ class Group(_BaseObject):
list = [] list = []
for node in doc.getElementsByTagName("artist"): for node in doc.getElementsByTagName("artist"):
item = Artist(_extract(node, "name"), self.network) item = Artist(_extract(node, "name"), self.network)
weight = _extract(node, "playcount") weight = _number(_extract(node, "playcount"))
list.append(TopItem(item, weight)) list.append(TopItem(item, weight))
return list return list
@ -2597,7 +2600,7 @@ class Group(_BaseObject):
list = [] list = []
for node in doc.getElementsByTagName("album"): for node in doc.getElementsByTagName("album"):
item = Album(_extract(node, "artist"), _extract(node, "name"), self.network) item = Album(_extract(node, "artist"), _extract(node, "name"), self.network)
weight = _extract(node, "playcount") weight = _number(_extract(node, "playcount"))
list.append(TopItem(item, weight)) list.append(TopItem(item, weight))
return list return list
@ -2615,7 +2618,7 @@ class Group(_BaseObject):
list = [] list = []
for node in doc.getElementsByTagName("track"): for node in doc.getElementsByTagName("track"):
item = Track(_extract(node, "artist"), _extract(node, "name"), self.network) item = Track(_extract(node, "artist"), _extract(node, "name"), self.network)
weight = _extract(node, "playcount") weight = _number(_extract(node, "playcount"))
list.append(TopItem(item, weight)) list.append(TopItem(item, weight))
return list return list
@ -2957,7 +2960,7 @@ class User(_BaseObject):
list = [] list = []
for node in doc.getElementsByTagName("artist"): for node in doc.getElementsByTagName("artist"):
item = Artist(_extract(node, "name"), self.network) item = Artist(_extract(node, "name"), self.network)
weight = _extract(node, "playcount") weight = _number(_extract(node, "playcount"))
list.append(TopItem(item, weight)) list.append(TopItem(item, weight))
return list return list
@ -2975,7 +2978,7 @@ class User(_BaseObject):
list = [] list = []
for node in doc.getElementsByTagName("album"): for node in doc.getElementsByTagName("album"):
item = Album(_extract(node, "artist"), _extract(node, "name"), self.network) item = Album(_extract(node, "artist"), _extract(node, "name"), self.network)
weight = _extract(node, "playcount") weight = _number(_extract(node, "playcount"))
list.append(TopItem(item, weight)) list.append(TopItem(item, weight))
return list return list
@ -2993,7 +2996,7 @@ class User(_BaseObject):
list = [] list = []
for node in doc.getElementsByTagName("track"): for node in doc.getElementsByTagName("track"):
item = Track(_extract(node, "artist"), _extract(node, "name"), self.network) item = Track(_extract(node, "artist"), _extract(node, "name"), self.network)
weight = _extract(node, "playcount") weight = _number(_extract(node, "playcount"))
list.append(TopItem(item, weight)) list.append(TopItem(item, weight))
return list return list
@ -3497,7 +3500,10 @@ def _number(string):
elif string == "": elif string == "":
return 0 return 0
else: else:
try:
return int(string) return int(string)
except ValueError:
return float(string)
def _unescape_htmlentity(string): def _unescape_htmlentity(string):