better apply_tags

Author: glomatico

spotify_web_downloader/downloader.py

@@ -172,52 +172,48 @@ def get_image_bytes(url: str) -> bytes:
         return requests.get(url).content
 
     def apply_tags(self, fixed_location: Path, tags: dict, cover_url: str):
-        mp4_tags = {
-            v: [tags[k]]
-            for k, v in MP4_TAGS_MAP.items()
-            if k not in self.exclude_tags_list and tags.get(k) is not None
-        }
-        if not {"track", "track_total"} & set(self.exclude_tags_list) and tags.get(
-            "track"
-        ):
-            mp4_tags["trkn"] = [[0, 0]]
-        if not {"disc", "disc_total"} & set(self.exclude_tags_list) and tags.get(
-            "disc"
-        ):
-            mp4_tags["disk"] = [[0, 0]]
-        if (
-            "compilation" not in self.exclude_tags_list
-            and tags.get("compilation") is not None
-        ):
-            mp4_tags["cpil"] = tags["compilation"]
+        to_apply_tags = [
+            tag_name
+            for tag_name in tags.keys()
+            if tag_name not in self.exclude_tags_list
+        ]
+        mp4_tags = {}
+        for tag_name in to_apply_tags:
+            if tag_name in ("disc", "disc_total"):
+                if mp4_tags.get("disk") is None:
+                    mp4_tags["disk"] = [[0, 0]]
+                if tag_name == "disc":
+                    mp4_tags["disk"][0][0] = tags[tag_name]
+                elif tag_name == "disc_total":
+                    mp4_tags["disk"][0][1] = tags[tag_name]
+            elif tag_name in ("track", "track_total"):
+                if mp4_tags.get("trkn") is None:
+                    mp4_tags["trkn"] = [[0, 0]]
+                if tag_name == "track":
+                    mp4_tags["trkn"][0][0] = tags[tag_name]
+                elif tag_name == "track_total":
+                    mp4_tags["trkn"][0][1] = tags[tag_name]
+            elif tag_name == "compilation":
+                mp4_tags["cpil"] = tags["compilation"]
+            elif tag_name == "isrc":
+                mp4_tags["----:com.apple.iTunes:ISRC"] = [
+                    MP4FreeForm(tags["isrc"].encode("utf-8"))
+                ]
+            elif tag_name == "label":
+                mp4_tags["----:com.apple.iTunes:LABEL"] = [
+                    MP4FreeForm(tags["label"].encode("utf-8"))
+                ]
+            elif (
+                MP4_TAGS_MAP.get(tag_name) is not None
+                and tags.get(tag_name) is not None
+            ):
+                mp4_tags[MP4_TAGS_MAP[tag_name]] = [tags[tag_name]]
         if "cover" not in self.exclude_tags_list:
             mp4_tags["covr"] = [
                 MP4Cover(
                     self.get_image_bytes(cover_url), imageformat=MP4Cover.FORMAT_JPEG
                 )
             ]
-        if "isrc" not in self.exclude_tags_list and tags.get("isrc") is not None:
-            mp4_tags["----:com.apple.iTunes:ISRC"] = [
-                MP4FreeForm(tags["isrc"].encode("utf-8"))
-            ]
-        if "label" not in self.exclude_tags_list and tags.get("label") is not None:
-            mp4_tags["----:com.apple.iTunes:LABEL"] = [
-                MP4FreeForm(tags["label"].encode("utf-8"))
-            ]
-        if "track" not in self.exclude_tags_list and tags.get("track") is not None:
-            mp4_tags["trkn"][0][0] = tags["track"]
-        if (
-            "track_total" not in self.exclude_tags_list
-            and tags.get("track_total") is not None
-        ):
-            mp4_tags["trkn"][0][1] = tags["track_total"]
-        if "disc" not in self.exclude_tags_list and tags.get("disc") is not None:
-            mp4_tags["disk"][0][0] = tags["disc"]
-        if (
-            "disc_total" not in self.exclude_tags_list
-            and tags.get("disc_total") is not None
-        ):
-            mp4_tags["disk"][0][1] = tags["disc_total"]
         mp4 = MP4(fixed_location)
         mp4.clear()
         mp4.update(mp4_tags)