From 83fa37649bcfb8c6be8e04a1892435685b022c6c Mon Sep 17 00:00:00 2001
From: EorlBruder <eorl@bruder.space>
Date: Fri, 18 Jun 2021 09:59:48 +0200
Subject: [PATCH] Refactor the setting of year after code review

---
 funkwhale_cli/cli/tracks.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/funkwhale_cli/cli/tracks.py b/funkwhale_cli/cli/tracks.py
index 3f908d7..4cfa1a8 100644
--- a/funkwhale_cli/cli/tracks.py
+++ b/funkwhale_cli/cli/tracks.py
@@ -61,11 +61,10 @@ def extract_filename_params(track_data, format):
     filename_params["album"] = filename_params.get("album_title", None)
     filename_params["artist"] = filename_params.get("artist_name", None)
     filename_params["extension"] = format
-    filename_params["year"] = (
-        filename_params.get("album_release_date", None)[:4]
-        if filename_params.get("album_release_date", None)
-        else None
-    )
+    try:
+        filename_params["year"] = filename_params["album_release_date"][:4]
+    except (KeyError, TypeError):
+        filename_params["year"] = None
     return {
         k: utils.sanitize_recursive(v) for k, v in filename_params.items()
     }
-- 
GitLab