andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

models: Add Uri and Date field "placeholders"

Browse Source
This commit is contained in:
Thomas Adamcik 2015-04-25 00:15:03 +02:00
parent 7e59a5aecb
commit 1d5abe44a6
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mopidy/models/__init__.py
View File

@ -23,7 +23,7 @@ class Ref(ImmutableObject):
"""
#: The object URI. Read-only.
uri = fields.Identifier()
uri = fields.Uri()
#: The object name. Read-only.
name = fields.String()
@ -87,7 +87,7 @@ class Image(ImmutableObject):
"""
#: The image URI. Read-only.
uri = fields.Identifier()
uri = fields.Uri()
#: Optional width of the image or :class:`None`. Read-only.
width = fields.Integer(min=0)
@ -108,7 +108,7 @@ class Artist(ImmutableObject):
"""
#: The artist URI. Read-only.
uri = fields.Identifier()
uri = fields.Uri()
#: The artist name. Read-only.
name = fields.String()
@ -139,7 +139,7 @@ class Album(ImmutableObject):
"""
#: The album URI. Read-only.
uri = fields.Identifier()
uri = fields.Uri()
#: The album name. Read-only.
name = fields.String()
@ -154,7 +154,7 @@ class Album(ImmutableObject):
num_discs = fields.Integer(min=0)
#: The album release date. Read-only.
date = fields.String() # TODO: add date type
date = fields.Date()
#: The MusicBrainz ID of the album. Read-only.
musicbrainz_id = fields.Identifier()
@ -202,7 +202,7 @@ class Track(ImmutableObject):
"""
#: The track URI. Read-only.
uri = fields.Identifier()
uri = fields.Uri()
#: The track name. Read-only.
name = fields.String()
@ -229,7 +229,7 @@ class Track(ImmutableObject):
disc_no = fields.Integer(min=0)
#: The track release date. Read-only.
date = fields.String() # TODO: add date type
date = fields.Date()
#: The track length in milliseconds. Read-only.
length = fields.Integer(min=0)
@ -304,7 +304,7 @@ class Playlist(ImmutableObject):
"""
#: The playlist URI. Read-only.
uri = fields.Identifier()
uri = fields.Uri()
#: The playlist name. Read-only.
name = fields.String()
@ -340,7 +340,7 @@ class SearchResult(ImmutableObject):
"""
# The search result URI. Read-only.
uri = fields.Identifier()
uri = fields.Uri()
# The tracks matching the search query. Read-only.
tracks = fields.Collection(type=Track, container=tuple)

8
mopidy/models/fields.py
View File

@ -71,11 +71,19 @@ class String(Field):
super(String, self).__init__(type=basestring, default=default)
class Date(String):
pass # TODO: make this check for YYYY-MM-DD, YYYY-MM, YYYY using stftime.
class Identifier(String):
def validate(self, value):
return intern(str(super(Identifier, self).validate(value)))
class Uri(Identifier):
pass # TODO: validate URIs?
class Integer(Field):
"""