Merge pull request #234 from PhilipTrauner/develop

Added parameter to retrieve higher resolution user avatars
This commit is contained in:
Hugo 2017-11-02 18:41:50 +02:00 committed by GitHub
commit d58a8ee61f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -86,11 +86,12 @@ DOMAIN_RUSSIAN = 9
DOMAIN_JAPANESE = 10 DOMAIN_JAPANESE = 10
DOMAIN_CHINESE = 11 DOMAIN_CHINESE = 11
COVER_SMALL = 0 # COVER_X is deprecated since 2.1.0 and will be removed in a future version
COVER_MEDIUM = 1 SIZE_SMALL = COVER_SMALL = 0
COVER_LARGE = 2 SIZE_MEDIUM = COVER_MEDIUM = 1
COVER_EXTRA_LARGE = 3 SIZE_LARGE = COVER_LARGE = 2
COVER_MEGA = 4 SIZE_EXTRA_LARGE = COVER_EXTRA_LARGE = 3
SIZE_MEGA = COVER_MEGA = 4
IMAGES_ORDER_POPULARITY = "popularity" IMAGES_ORDER_POPULARITY = "popularity"
IMAGES_ORDER_DATE = "dateadded" IMAGES_ORDER_DATE = "dateadded"
@ -1468,14 +1469,14 @@ class Album(_Opus):
def __init__(self, artist, title, network, username=None): def __init__(self, artist, title, network, username=None):
super(Album, self).__init__(artist, title, network, "album", username) super(Album, self).__init__(artist, title, network, "album", username)
def get_cover_image(self, size=COVER_EXTRA_LARGE): def get_cover_image(self, size=SIZE_EXTRA_LARGE):
""" """
Returns a uri to the cover image Returns a uri to the cover image
size can be one of: size can be one of:
COVER_EXTRA_LARGE SIZE_EXTRA_LARGE
COVER_LARGE SIZE_LARGE
COVER_MEDIUM SIZE_MEDIUM
COVER_SMALL SIZE_SMALL
""" """
return _extract_all( return _extract_all(
@ -1575,15 +1576,15 @@ class Artist(_BaseObject, _Taggable):
return _extract( return _extract(
self._request(self.ws_prefix + ".getCorrection"), "name") self._request(self.ws_prefix + ".getCorrection"), "name")
def get_cover_image(self, size=COVER_MEGA): def get_cover_image(self, size=SIZE_EXTRA_LARGE):
""" """
Returns a uri to the cover image Returns a uri to the cover image
size can be one of: size can be one of:
COVER_MEGA SIZE_MEGA
COVER_EXTRA_LARGE SIZE_EXTRA_LARGE
COVER_LARGE SIZE_LARGE
COVER_MEDIUM SIZE_MEDIUM
COVER_SMALL SIZE_SMALL
""" """
return _extract_all( return _extract_all(
@ -2409,12 +2410,19 @@ class User(_BaseObject, _Chartable):
return self._get_things( return self._get_things(
"getTopTracks", "track", Track, params, cacheable) "getTopTracks", "track", Track, params, cacheable)
def get_image(self): def get_image(self, size=SIZE_EXTRA_LARGE):
"""Returns the user's avatar.""" """
Returns the user's avatar
size can be one of:
SIZE_EXTRA_LARGE
SIZE_LARGE
SIZE_MEDIUM
SIZE_SMALL
"""
doc = self._request(self.ws_prefix + ".getInfo", True) doc = self._request(self.ws_prefix + ".getInfo", True)
return _extract(doc, "image") return _extract_all(doc, "image")[size]
def get_url(self, domain_name=DOMAIN_ENGLISH): def get_url(self, domain_name=DOMAIN_ENGLISH):
"""Returns the url of the user page on the network. """Returns the url of the user page on the network.