Add albumcomposer key for folder/file formats

Signed-off-by: nathom <nathanthomas707@gmail.com>

rip/config.toml

@@ -120,9 +120,10 @@ new_playlist_tracknumbers = true
 # template
 add_singles_to_folder = false
 # Available keys: "albumartist", "title", "year", "bit_depth", "sampling_rate",
-# and "container"
+# "container", and "albumcomposer"
 folder_format = "{albumartist} - {title} ({year}) [{container}] [{bit_depth}B-{sampling_rate}kHz]"
-# Available keys: "tracknumber", "artist", "albumartist", "composer", and "title"
+# Available keys: "tracknumber", "artist", "albumartist", "composer", "title",
+# and "albumcomposer"
 track_format = "{tracknumber}. {artist} - {title}"
 
 # Last.fm playlists are downloaded by searching for the titles of the tracks

streamrip/constants.py

@@ -117,7 +117,14 @@ PHON_COPYRIGHT = "\u00a9"
 FLAC_MAX_BLOCKSIZE = 16777215  # 16.7 MB
 
 # TODO: give these more descriptive names
-TRACK_KEYS = ("tracknumber", "artist", "albumartist", "composer", "title")
+TRACK_KEYS = (
+    "tracknumber",
+    "artist",
+    "albumartist",
+    "composer",
+    "title",
+    "albumcomposer",
+)
 ALBUM_KEYS = (
     "albumartist",
     "title",
@@ -125,7 +132,7 @@ ALBUM_KEYS = (
     "bit_depth",
     "sampling_rate",
     "container",
-    "composer",
+    "albumcomposer",
 )
 # TODO: rename these to DEFAULT_FOLDER_FORMAT etc
 FOLDER_FORMAT = (

streamrip/metadata.py

@@ -134,7 +134,7 @@ class TrackMetadata:
             self.date = resp.get("release_date_original") or resp.get("release_date")
             self.copyright = resp.get("copyright")
             self.albumartist = safe_get(resp, "artist", "name")
-            self.composer = safe_get(resp, "composer", "name")
+            self.albumcomposer = safe_get(resp, "composer", "name")
             self.label = resp.get("label")
             self.description = resp.get("description")
             self.disctotal = (