|
12 | 12 | search_playlists_by_albums,
|
13 | 13 | update_playlist_info,
|
14 | 14 | )
|
15 |
| -from src.dataclasses.playlist import Playlist |
16 | 15 | from src.spotify import SpotifyClient
|
17 | 16 |
|
18 | 17 |
|
@@ -78,11 +77,11 @@ def recent_playlists():
|
78 | 77 | def get_playlist(id):
|
79 | 78 | db_playlist = get_playlist_by_id_or_none(id)
|
80 | 79 | if db_playlist is not None:
|
81 |
| - return db_playlist.__data__ |
| 80 | + return make_response(jsonify(db_playlist.__data__), 200) |
82 | 81 | else:
|
83 | 82 | access_token = request.cookies.get("spotify_access_token")
|
84 | 83 | playlist = spotify.get_playlist(access_token=access_token, id=id)
|
85 |
| - return playlist.model_dump() |
| 84 | + return make_response(jsonify(playlist.to_dict()), 200) |
86 | 85 |
|
87 | 86 | @music_controller.route("playlist/<id>", methods=["POST"])
|
88 | 87 | def post_edit_playlist(id):
|
@@ -156,24 +155,26 @@ def get_playback_info():
|
156 | 155 | if playback_info is None:
|
157 | 156 | return ("", 204)
|
158 | 157 | if playback_info.playlist_id is not None:
|
159 |
| - playlist_name = get_playlist_by_id_or_none(playback_info.playlist_id).name |
160 |
| - playlist_duration = get_playlist_duration(playback_info.playlist_id) |
161 |
| - playlist_progress = ( |
162 |
| - get_playlist_duration_up_to_track( |
163 |
| - playback_info.playlist_id, playback_info.track_id |
| 158 | + playlist_info = get_playlist_by_id_or_none(playback_info.playlist_id) |
| 159 | + if playlist_info: |
| 160 | + playlist_name = playlist_info.name |
| 161 | + playlist_duration = get_playlist_duration(playback_info.playlist_id) |
| 162 | + playlist_progress = ( |
| 163 | + get_playlist_duration_up_to_track( |
| 164 | + playback_info.playlist_id, playback_info.track_id |
| 165 | + ) |
| 166 | + + playback_info.track_progress |
164 | 167 | )
|
165 |
| - + playback_info.track_progress |
166 |
| - ) |
167 | 168 |
|
168 |
| - playback_info_with_playlist = playback_info.model_dump() |
169 |
| - playback_info_with_playlist["playlist"] = { |
170 |
| - "id": playback_info.playlist_id, |
171 |
| - "title": playlist_name, |
172 |
| - "progress": playlist_progress, |
173 |
| - "duration": playlist_duration, |
174 |
| - } |
175 |
| - return playback_info_with_playlist |
| 169 | + playback_info_with_playlist = playback_info.model_dump() |
| 170 | + playback_info_with_playlist["playlist"] = { |
| 171 | + "id": playback_info.playlist_id, |
| 172 | + "title": playlist_name, |
| 173 | + "progress": playlist_progress, |
| 174 | + "duration": playlist_duration, |
| 175 | + } |
| 176 | + return playback_info_with_playlist |
176 | 177 |
|
177 |
| - return playback_info.model_dump_json() |
| 178 | + return playback_info.model_dump_json() |
178 | 179 |
|
179 | 180 | return music_controller
|
0 commit comments