yetangitu/funkwhale
1
0
Fork 0
mirror of https://code.eliotberriot.com/funkwhale/funkwhale.git synced 2025-10-04 13:29:16 +02:00
Code Issues Releases Wiki Activity

Importer will now pick embedded images in files with OTHER type if no COVER_FRONT is present

Browse source
This commit is contained in:
Eliot Berriot 2019-01-15 17:14:11 +01:00
parent 11728bbbc4
commit 4a3c21a094
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
5 changed files with 20 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
api/funkwhale_api/music/metadata.py
View file

@ -409,8 +409,14 @@ class Metadata(object):
return data
def get_picture(self, picture_type="cover_front"):
ptype = getattr(mutagen.id3.PictureType, picture_type.upper())
def get_picture(self, *picture_types):
if not picture_types:
raise ValueError("You need to request at least one picture type")
ptypes = [
getattr(mutagen.id3.PictureType, picture_type.upper())
for picture_type in picture_types
]
try:
pictures = self.get("pictures")
except (UnsupportedTag, TagNotFound):
@ -418,6 +424,9 @@ class Metadata(object):
cleaner = self._conf.get("clean_pictures", lambda v: v)
pictures = cleaner(pictures)
for p in pictures:
if p["type"] == ptype:
return p
if not pictures:
return
for ptype in ptypes:
for p in pictures:
if p["type"] == ptype:
return p