diff options
author | jcass <john.cass77@gmail.com> | 2015-12-21 17:34:38 +0200 |
---|---|---|
committer | jcass <john.cass77@gmail.com> | 2015-12-21 17:34:38 +0200 |
commit | 4b4c7f300dfd42ac2bae27066e13cb3da6519331 (patch) | |
tree | fc6afe915719816b3ee861c6851a8e9ba6bb4773 | |
parent | f7fa852674c51ae196fa63246b7dd84d3d5842a4 (diff) | |
parent | 879e055ae207ad10dac4f8f3b9501f7e264283c7 (diff) | |
download | pydora-4b4c7f300dfd42ac2bae27066e13cb3da6519331.tar.bz2 pydora-4b4c7f300dfd42ac2bae27066e13cb3da6519331.tar.xz pydora-4b4c7f300dfd42ac2bae27066e13cb3da6519331.zip |
Merge branch 'enhance/fields' into develop
-rw-r--r-- | pandora/models/pandora.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pandora/models/pandora.py b/pandora/models/pandora.py index 1ec345f..40b368a 100644 --- a/pandora/models/pandora.py +++ b/pandora/models/pandora.py | |||
@@ -5,10 +5,11 @@ from . import Field, PandoraModel, PandoraListModel, PandoraDictListModel | |||
5 | 5 | ||
6 | class Station(PandoraModel): | 6 | class Station(PandoraModel): |
7 | 7 | ||
8 | can_add_music = Field("allowAddMusic", False) | 8 | can_add_music = Field("allowAddMusic") |
9 | can_delete = Field("allowDelete", True) | 9 | can_delete = Field("allowDelete") |
10 | can_rename = Field("allowRename", True) | 10 | can_rename = Field("allowRename") |
11 | is_shared = Field("isShared", False) | 11 | is_shared = Field("isShared") |
12 | is_quickmix = Field("isQuickMix") | ||
12 | 13 | ||
13 | art_url = Field("artUrl") | 14 | art_url = Field("artUrl") |
14 | date_created = Field("dateCreated", formatter=PandoraModel.json_to_date) | 15 | date_created = Field("dateCreated", formatter=PandoraModel.json_to_date) |
@@ -162,12 +163,12 @@ class PlaylistItem(PlaylistModel): | |||
162 | song_name = Field("songName") | 163 | song_name = Field("songName") |
163 | song_rating = Field("songRating") | 164 | song_rating = Field("songRating") |
164 | track_gain = Field("trackGain") | 165 | track_gain = Field("trackGain") |
165 | track_length = Field("trackLength", 0) | 166 | track_length = Field("trackLength") |
166 | track_token = Field("trackToken") | 167 | track_token = Field("trackToken") |
167 | audio_url = Field("audioUrl") | 168 | audio_url = Field("audioUrl") |
168 | bitrate = Field("bitrate") | 169 | bitrate = Field("bitrate") |
169 | album_art_url = Field("albumArtUrl") | 170 | album_art_url = Field("albumArtUrl") |
170 | allow_feedback = Field("allowFeedback", True) | 171 | allow_feedback = Field("allowFeedback") |
171 | station_id = Field("stationId") | 172 | station_id = Field("stationId") |
172 | 173 | ||
173 | ad_token = Field("adToken") | 174 | ad_token = Field("adToken") |