tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rclaudio: if mutagen.File() fails, try with mutagen.ID3()

Browse Source 
This allows extracting the tags e.g. from adts files
mistaken for mp3 during initial identification, and for which
the full later mp3 init fails because wrong kind of frame.
This commit is contained in:
Jean-Francois Dockes 2021-03-03 12:53:59 +01:00
parent 6861fce1a9
commit a4b3aff5c4
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/filters/rclaudio
View File

@ -15,7 +15,7 @@ import rclconfig
try: try:
import mutagen import mutagen
from mutagen import File from mutagen import File
from mutagen.id3 import ID3TimeStamp from mutagen.id3 import ID3, ID3TimeStamp
except: except:
print("RECFILTERROR HELPERNOTFOUND python3:mutagen") print("RECFILTERROR HELPERNOTFOUND python3:mutagen")
sys.exit(1); sys.exit(1);
@ -227,15 +227,21 @@ class AudioTagExtractor(RclBaseHandler):
def _embeddedImageFormat(self, mutf): def _embeddedImageFormat(self, mutf):
#self.em.rclog("_embeddedImage: MIME: %s"%mutf.mime) #self.em.rclog("_embeddedImage: MIME: %s"%mutf.mime)
if 'audio/mp3' in mutf.mime: try:
# This fails if we're passed a mutagen.ID3 instead of File
mime = mutf.mime
except:
return ''
if 'audio/mp3' in mime:
for tagname in mutf.keys(): for tagname in mutf.keys():
if tagname.startswith('APIC:'): if tagname.startswith('APIC:'):
#self.em.rclog("mp3 img: %s" % mutf[tagname].mime) #self.em.rclog("mp3 img: %s" % mutf[tagname].mime)
return 'jpg' if mutf[tagname].mime == 'image/jpeg' else 'png' return 'jpg' if mutf[tagname].mime == 'image/jpeg' else 'png'
elif 'audio/x-flac' in mutf.mime: elif 'audio/x-flac' in mime:
if mutf.pictures: if mutf.pictures:
return 'jpg' if mutf.pictures[0].mime == 'image/jpeg' else 'png' return 'jpg' if mutf.pictures[0].mime == 'image/jpeg' else 'png'
elif 'audio/mp4' in mutf.mime: elif 'audio/mp4' in mime:
if 'covr' in mutf.keys(): if 'covr' in mutf.keys():
format = mutf['covr'][0].imageformat format = mutf['covr'][0].imageformat
if format == mutagen.mp4.AtomDataType.JPEG: if format == mutagen.mp4.AtomDataType.JPEG:
@ -287,6 +293,11 @@ class AudioTagExtractor(RclBaseHandler):
mutf = File(filename) mutf = File(filename)
except Exception as ex: except Exception as ex:
strex = str(ex) strex = str(ex)
try:
mutf = ID3(filename)
except Exception as ex:
strex += str(ex)
if not mutf: if not mutf:
# Note: mutagen will fail the open (and raise) for a valid # Note: mutagen will fail the open (and raise) for a valid
# file with no tags. Maybe we should just return an empty # file with no tags. Maybe we should just return an empty