Tag AIFF (and re-tag converted files) with full metadata

Conversion runs after tagging the source file, but ffmpeg does not
reliably carry metadata into the converted container (AIFF was left
completely untagged). Add an AIFF tagging path (ID3 via mutagen) and
re-tag the converted file for formats tag_file understands.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

Author: chuckyutan

streamrip/media/track.py

@@ -93,6 +93,13 @@ async def _convert(self):
         )
         await engine.convert()
         self.download_path = engine.final_fn  # because the extension changed
+        # Re-tag the converted file: ffmpeg does not reliably carry over all
+        # metadata (and some containers, e.g. AIFF, are not tagged at all).
+        # Only formats that tag_file understands are re-tagged; others (opus,
+        # ogg, ...) keep the metadata ffmpeg copied during conversion.
+        ext = self.download_path.split(".")[-1].lower()
+        if ext in ("flac", "m4a", "mp3", "aiff", "aif"):
+            await tag_file(self.download_path, self.meta, self.cover_path)
 
     def _set_download_path(self):
         c = self.config.session.filepaths

streamrip/metadata/tagger.py

@@ -4,6 +4,7 @@
 
 import aiofiles
 from mutagen import id3
+from mutagen.aiff import AIFF
 from mutagen.flac import FLAC, Picture
 from mutagen.id3 import (
     APIC,  # type: ignore
@@ -100,12 +101,18 @@ class Container(Enum):
     FLAC = 1
     AAC = 2
     MP3 = 3
+    AIFF = 4
 
     def get_mutagen_class(self, path: str):
         if self == Container.FLAC:
             return FLAC(path)
         elif self == Container.AAC:
             return MP4(path)
+        elif self == Container.AIFF:
+            audio = AIFF(path)
+            if audio.tags is None:
+                audio.add_tags()
+            return audio.tags
         elif self == Container.MP3:
             try:
                 return ID3(path)
@@ -117,7 +124,7 @@ def get_mutagen_class(self, path: str):
     def get_tag_pairs(self, meta) -> list[tuple]:
         if self == Container.FLAC:
             return self._tag_flac(meta)
-        elif self == Container.MP3:
+        elif self == Container.MP3 or self == Container.AIFF:
             return self._tag_mp3(meta)
         elif self == Container.AAC:
             return self._tag_mp4(meta)
@@ -217,7 +224,7 @@ async def embed_cover(self, audio, cover_path):
             async with aiofiles.open(cover_path, "rb") as img:
                 cover.data = await img.read()
             audio.add_picture(cover)
-        elif self == Container.MP3:
+        elif self == Container.MP3 or self == Container.AIFF:
             cover = APIC()
             cover.type = 3
             cover.mime = "image/jpeg"
@@ -236,6 +243,10 @@ def save_audio(self, audio, path):
             audio.save()
         elif self == Container.MP3:
             audio.save(path, "v2_version=3")
+        elif self == Container.AIFF:
+            # AIFF uses an _IFFID3 tag object whose save() signature differs
+            # from MP3's ID3.save(); call it with defaults (v2_version=4).
+            audio.save(path)
 
 
 async def tag_file(path: str, meta: TrackMetadata, cover_path: str | None):
@@ -246,6 +257,8 @@ async def tag_file(path: str, meta: TrackMetadata, cover_path: str | None):
         container = Container.AAC
     elif ext == "mp3":
         container = Container.MP3
+    elif ext in ("aiff", "aif"):
+        container = Container.AIFF
     else:
         raise Exception(f"Invalid extension {ext}")