Skip to content
Snippets Groups Projects
Commit 1213a575 authored by Georg Krause's avatar Georg Krause
Browse files

Merge branch 'fix-19' into 'master'

Access keys via get, to prevent KeyErrors

Closes #19

See merge request funkwhale/cli!14
parents 30aa21d7 83fa3764
No related branches found
No related tags found
1 merge request!14Access keys via get, to prevent KeyErrors
Pipeline #14722 passed
...@@ -58,14 +58,13 @@ async def get_track_download_url(id, remote, format=None): ...@@ -58,14 +58,13 @@ async def get_track_download_url(id, remote, format=None):
def extract_filename_params(track_data, format): def extract_filename_params(track_data, format):
filename_params = utils.flatten(track_data) filename_params = utils.flatten(track_data)
filename_params["album"] = filename_params["album_title"] filename_params["album"] = filename_params.get("album_title", None)
filename_params["artist"] = filename_params["artist_name"] filename_params["artist"] = filename_params.get("artist_name", None)
filename_params["extension"] = format filename_params["extension"] = format
filename_params["year"] = ( try:
filename_params["album_release_date"][:4] filename_params["year"] = filename_params["album_release_date"][:4]
if filename_params["album_release_date"] except (KeyError, TypeError):
else None filename_params["year"] = None
)
return { return {
k: utils.sanitize_recursive(v) for k, v in filename_params.items() k: utils.sanitize_recursive(v) for k, v in filename_params.items()
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment